From 48323ac1afb8faf42a0ecfc1bf36f7f0e5721817 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Thu, 12 Apr 2012 14:44:08 +0800 Subject: [PATCH] lot of changes in fetching --- app/assets/images/icons/dailyenglish.png | Bin 0 -> 900 bytes app/assets/images/icons/quotes.png | Bin 0 -> 1122 bytes app/assets/javascripts/orbitdesktop.js | 66 +++++++++++++++---- app/controllers/desktop_controller.rb | 42 ++++++++---- app/views/desktop/app_manager.html.erb | 6 +- app/views/desktop/sections.html.erb | 12 ++-- app/views/desktop/settings/sections.html.erb | 2 +- config/routes.rb | 1 + 8 files changed, 96 insertions(+), 33 deletions(-) create mode 100644 app/assets/images/icons/dailyenglish.png create mode 100644 app/assets/images/icons/quotes.png diff --git a/app/assets/images/icons/dailyenglish.png b/app/assets/images/icons/dailyenglish.png new file mode 100644 index 0000000000000000000000000000000000000000..c820bd610cccf964eebaa25beee18ae5cb0d7a29 GIT binary patch literal 900 zcmV-~1AF|5P)V>IRB3Hx05CK!F)=SOGMHQ4%K!iZ z+DSw~RA_-7yn8dw8n2e#O~Tp=zO;{D75Z#^{33+4v4m^dq(I~?z085pjGMIP{OV4D#D10deV zEc!YNFnsDGBHl|B*r~BWUeRm7#r*aG6Cxhvn8uC9Zb=*X$60`|C8a3cOe2h18{jn- zveqVeOQ5js_)cNpIUG!B-3b)d9p5QzsWi$It8IpRECJ1BqycIQOL(#Qi>8Mi?th_* zq?V>hEls=Xqr8Ue&DnBMN)Kh-u5*Fg^j1mXc8y}Wa+LnuV_qrS61v_@5gD6Q>YrMi zA-Sl&-jv3drymz+q@5b&@53(p){(@m<=Xv=3K;$k^na)AP$vKbgeE zHBhsFrYan_-A~~PMsM>$_{Mn2`Dv2#?)KSIc&4yhYza<@2U^bCR^2#U_?^D--Lvs2 zBI9@O0;z==k_+myz_Xy0T9|P+J>87&qOE7iLtfTL5~7?uyxjeHulMQ5_+-iHSr#sX zr~i@%RfX%CN-NxMK;h5LDB6gKPu*s{>sL{N@%TSa$-2bth0*cYLR?k@bd$y!a2)Z*mBhTC;1UFL}$og@S7t^+)K6mMPvsmjecvUkitH^PY^-Wt20i54*Ckwm} z8KN^J7_6OXmFKX?+_o)8&dOJ=^$!btJT9`{B1Bt@pxb~}&n>I~1xOziSxMyO=)S}9 a<+}e_DDYEX5}V!t0000V>IRB3Hx05CK!F)=SOGMHQ4%K!ia zxJg7oRA_m-Q5?rVvtzkd=Gq_0J@pS-rGpVcMOhRbE1`@!S#&TvlyvG=LFdp8 z)do_5&;|uohonr(0uLn>s9Cg|QmEwLO)=My?J$n*&iOm68~m^DG@x1tx*28RzKylww~;<(0rG5S zD@ZjN!&WC_*y>~qTb+zytCMzyvkZNj!v&kqfpeeK?rnzF3ot#YZoX)Tl8dn6xYQo{ z0N)>h@1bE5g`k_DAx}Eg0&8|h@9Vq?Z_mb`zx6U~y%fDKFaq^X^?$fH7*o;}!?Dc* z6j#Bn8?pQ2nFYwshtq%NEH4!OhSwjJ1SO)lN-9|;qCLLZQ1;)~rY#Ek4e!3Ke(a8G z>SD2w*R~Gy8&;ED8Tn9TgOWSw_Y4=&uZ#XcbZ+>sHZV6h@Z@B%s`msY%4o9`j z2N>(tHeP{#!)=#gI-qXs=$9z5F7SHP|301HVq?~Dy;Gg(SjJwSfc`g$=c^f$0AmaX zhM~?5ZCB#2>Cvv(eNRfEsXTfW$b8dK2{ABkYZ*#mDI9zq9`kynOseJdB#7DJvAUdj zQqoF_t0H4*KD_Ue>AT{9SOINDb6d71k8 zqCN5-5reV|MjICGk>%|5Xv^-AkC8DgYd-?ligjw>k1d!RIcqD zs`zYpb!h!&Ye4@Y-uk1`PkD#*c&E0^X0MPA{^a?+%}L3uOmcQw^O(#5fYr$uwmKQZ zRwrZF>ZG6Hi7B%sq>hOxu)XgwTSn@5-vhR1?PkkJ9nadq<{QM{*kQJmqXDp2!l39Rv-JBA~ z1N1wVke`>s_D?^hg}pcnR_DSZ(Oj`}Wnv0ieQ>J2DTUwozvU^a)oK|FG%&68$4KSrp1^;NpF1d5w!0Be?0QdCIw>Rif1VPW2f om=59}7^C5HA2t2I!>{7~140V}-Ime%=l}o!07*qoM6N<$f_9h*x&QzG literal 0 HcmV?d00001 diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index fa032ffd..7179cad6 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -12,6 +12,7 @@ var orbitDesktop = function(dom){ this.currentface = "home"; this.desktopData = {"home":"","settings":"","work":"","favorite":"","apps_manager":"","sections":""}; this.tp = ""; + this.sectionList; this.initialize = function(){ var theme = o.theme; $.getJSON("/desktop/get_desktop_settings",{id:o.desktopId},function(desktopSettings){ @@ -112,7 +113,7 @@ var orbitDesktop = function(dom){ $(".group").each(function(){groupWrapperWidth+=$(this).width();}) groupWrapperWidth+=200; groupWrapperHeight = $(".group").height() + 20; - groupWrapperHeight = (groupWrapperHeight > ($(window).height()-extraspace))? $(window).height()-extraspace:groupWrapperHeight; + // groupWrapperHeight = (groupWrapperHeight > ($(window).height()-extraspace))? $(window).height()-extraspace:groupWrapperHeight; $("#group_wrapper").css("width",groupWrapperWidth); $(".grp").sortable({ @@ -172,7 +173,7 @@ var orbitDesktop = function(dom){ var tilecolor = tilecolors[Math.floor(Math.random()*tilecolors.length)]; var op = opacity[Math.floor(Math.random()*opacity.length)]; if(tile.data_category == "app") - $li = $('

  • '+tile.title+'

    • '); + $li = $('

  • '+tile.title+'

    • '); else $li = $('

  • '+tile.title+'

    test content
    • '); $group.find("ul").append($li); @@ -185,6 +186,7 @@ var orbitDesktop = function(dom){ } var loadSectionList = function(){ $.getJSON("/desktop/getsectionlist",{desktopid:o.desktopId},function(sectionlist){ + o.sectionList = eval(sectionlist); $.each(sectionlist,function(i,section){ var tempstyle=""; if(i==0){ @@ -266,9 +268,22 @@ var orbitDesktop = function(dom){ }) $('.tinycanvas').tinyscrollbar({ axis: 'x'}); } + var loadApps = function(){ + $.getJSON("/desktop/getapplist",{desktopid:o.desktopId},function(appss){ + $.each(appss,function(i,apps){ + $.each(apps,function(i,app){ + var $div; + $div = $('

    '+app.title+'

    '); + $("#app_list").append($div); + }) + }) + + bindHandlers(); + }) + } if(!o.desktopData[o.currentface]){ $(o.contentHolder).empty().load("/desktop/"+target,function(){ - bindHandlers(); + loadApps(); }); }else{ $(o.contentHolder).html(o.desktopData[o.currentface]); @@ -313,17 +328,45 @@ var orbitDesktop = function(dom){ if( !$sdm.children('.sdm_o') ){ return; } else { - $sdm.hover(function(){ - $(this).addClass('thmc2'); - }, function(){ - $(this).removeClass('thmc2'); - }); + $sdm.hover(function(){$(this).addClass('thmc2');}, function(){$(this).removeClass('thmc2');}); } }; - + var loadApps = function(){ + $.getJSON("/desktop/getapplist",{desktopid:o.desktopId},function(appss){ + var $group,$lii,$li; + var z=0; + for(section in o.sectionList){ + $group = $('
        '); + for(x=0;x<4;x++){ + if(x==0){ + $li = $('
      • '+o.sectionList[z].name+'
        • '); + $group.find("ul.section_grp").append($li); + } + if(z!=x){ + $lii = $(''); + $group.find("ul.section_grp").append($lii); + } + } + z++; + $("div#group_wrapper").append($group); + } + $.each(appss,function(i,apps){ + var y=0; + $.each(apps,function(i,app){ + var $div; + $div = $('

        '+app.title+'

        '); + $("#app_list").append($div); + }) + y++; + }) + + + bindHandlers(); + }) + } if(!o.desktopData[o.currentface]){ $(o.contentHolder).empty().load("/desktop/"+target,function(){ - bindHandlers(); + loadApps(); }); }else{ $(o.contentHolder).html(o.desktopData[o.currentface]); @@ -405,7 +448,7 @@ var orbitDesktop = function(dom){ $(o.contentHolder).empty().load("/desktop/"+target,function(){ bindHandlers(); - sections(); + themes(); }); }; this.loadWallpaper = function(wallpaper){ @@ -447,6 +490,7 @@ orbitDesktop.prototype.themefolder = "themes"; orbitDesktop.prototype.widgetfolder = "desktop_widgets"; orbitDesktop.prototype.desktopId = "1"; orbitDesktop.prototype.notifyImgPath = "temp"; +orbitDesktop.prototype.iconPath = "/assets/icons/"; var uselessfunction = function(){ $.post("/desktop/temp_func",{sectionid:"4f83e7bbbd98eb041600001d"}); diff --git a/app/controllers/desktop_controller.rb b/app/controllers/desktop_controller.rb index d426b4da..ca776043 100644 --- a/app/controllers/desktop_controller.rb +++ b/app/controllers/desktop_controller.rb @@ -1,6 +1,9 @@ class DesktopController< ApplicationController layout 'desktop' before_filter :authenticate_user! + + #to load pages... + def index @desktop = current_user.desktop @section = @desktop.sections.first @@ -18,6 +21,19 @@ class DesktopController< ApplicationController def sections render :layout => false end + def settings + render :layout => false + end + + def settingthemes + render "desktop/settings/themes", :layout => false + end + + def settingsections + render "desktop/settings/sections", :layout => false + end + + #ajax data load.... def save_desktop_settings @desktop = Desktop.find(params["id"]) @@ -32,18 +48,6 @@ class DesktopController< ApplicationController render :json => @desktop.to_json end - def settings - render :layout => false - end - - def settingthemes - render "desktop/settings/themes", :layout => false - end - - def settingsections - render "desktop/settings/sections", :layout => false - end - def getgroups @section = Section.find(params["sectionid"]) @groups = @section.groups @@ -76,4 +80,18 @@ class DesktopController< ApplicationController b << {"success"=>"true"} render :json=>b.to_json end + + def getapplist + @desktop = Desktop.find(params["desktopid"]) + @sections = @desktop.sections + a = Array.new + @sections.each do |section| + @groups = section.groups + @groups.each do |group| + @tiles = group.tiles.where(:data_category.all => ["app"]) + a << @tiles + end + end + render :json=>a.to_json + end end \ No newline at end of file diff --git a/app/views/desktop/app_manager.html.erb b/app/views/desktop/app_manager.html.erb index fdbe9236..682ef540 100755 --- a/app/views/desktop/app_manager.html.erb +++ b/app/views/desktop/app_manager.html.erb @@ -19,8 +19,8 @@
        -
        -
        +
        diff --git a/app/views/desktop/sections.html.erb b/app/views/desktop/sections.html.erb index bcb7b3c7..2a1306d9 100644 --- a/app/views/desktop/sections.html.erb +++ b/app/views/desktop/sections.html.erb @@ -9,7 +9,7 @@
        -
        +
        diff --git a/app/views/desktop/settings/sections.html.erb b/app/views/desktop/settings/sections.html.erb index 15195748..d9d5e58e 100644 --- a/app/views/desktop/settings/sections.html.erb +++ b/app/views/desktop/settings/sections.html.erb @@ -1 +1 @@ -Fucking section setting page... \ No newline at end of file +section setting page... \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 501e40f5..bc51e18b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -112,6 +112,7 @@ Orbit::Application.routes.draw do match '/desktop/getsectionlist/'=>'desktop#getsectionlist' match '/desktop/settingthemes/'=>'desktop#settingthemes' match '/desktop/settingsections/'=>'desktop#settingsections' + match '/desktop/getapplist/'=>'desktop#getapplist' match '/desktop/temp_func/'=>'desktop#temp_func' match '/panel/:app_name/front_end/:app_action/:id' => 'pages#show_from_link', :constraints => lambda { |request|