diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index d96b30bf..9aa4b7d4 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -116,7 +116,7 @@ var orbitDesktop = function(dom){ groupWrapperHeight = $(".group").height() + 20; // groupWrapperHeight = (groupWrapperHeight > ($(window).height()-extraspace))? $(window).height()-extraspace:groupWrapperHeight; $("div#desktop #group_wrapper").css("width",groupWrapperWidth); - + var first = true; $("div#desktop .grp").sortable({ connectWith: ".grp", tolerance: 'pointer' , @@ -136,9 +136,28 @@ var orbitDesktop = function(dom){ targetParent.css("max-width",newWidth); var newParentWidth = $("div#desktop #group_wrapper").width()+currentElementWidth; $("div#desktop #group_wrapper").css("width",newParentWidth); - } + } + first = true; + }, + update:function(){ + if(first){ + first = false; + var newpostitions = new Array; + var groupids = new Array; + $.each($("div#desktop .group"),function(i,grp){ + var groupone = new Array; + groupids.push($(grp).attr("id")); + $ul = $(grp).find("ul.grp li"); + $.each($ul,function(){ + groupone.push($(this).attr("id")); + }) + newpostitions.push(groupone); + }); + $.post("/desktop/newpositions",{"sectionid":o.sectionId,"newpos":newpostitions,"groupids":groupids},function(){ + + }) + } } - }); $('div#desktop .tinycanvas').tinyscrollbar({ axis: 'x'}); $("div#desktop div.scrollbar").hover(function(){ @@ -173,10 +192,12 @@ var orbitDesktop = function(dom){ $.each(group,function(j,tile){ var tilecolor = tilecolors[Math.floor(Math.random()*tilecolors.length)]; var op = opacity[Math.floor(Math.random()*opacity.length)]; + if(j==0)$group.attr("id",tile.group_id); + if(tile.data_category == "app") - $li = $('
  • '+tile.title+'

  • '); + $li = $('
  • '+tile.title+'

  • '); else - $li = $('
  • '+tile.title+'

    Loading...
  • '); + $li = $('
  • '+tile.title+'

    Loading...
  • '); $group.find("ul").append($li); }) $("div#desktop div#group_wrapper").append($group); @@ -205,7 +226,8 @@ var orbitDesktop = function(dom){ $("div#desktop li.section_name").show(); $(this).hide(); $("div#desktop span#section_heading").text($(this).text()); - loadTiles($(this).find("a").attr("href")); + o.sectionId = $(this).find("a").attr("href"); + loadTiles(o.sectionId); }) } @@ -324,8 +346,13 @@ var orbitDesktop = function(dom){ if($("#"+$(this).attr("data-category")+" .element").length>=24){ o.notify("Section is full.","alert"); } - else + else{ $("#"+$(this).attr("data-category")).append(element); + $.post("/desktop/save_desktop_settings",{"save":"appnewsection","appid":element.attr("id"),"newsectionid":$(this).attr("data-content"),"desktopid":o.desktopId}) + if(o.sectionId == $(this).attr("data-content") || o.sectionId == elementParent.attr("id")){ + o.desktopData["home"]=""; + } + } }, over:function(){ $(this).find('span.tile').removeClass('op06'); @@ -348,14 +375,14 @@ var orbitDesktop = function(dom){ var $group,$lii,$li; var z=0; for(section in o.sectionList){ - $group = $('
    '); + $group = $('
    '); for(x=0;x<4;x++){ if(x==0){ - $li = $('
  • '+o.sectionList[z].name+'
  • '); + $li = $('
  • '+o.sectionList[z].name+'
  • '); $group.find("ul.section_grp").append($li); } if(z!=x){ - $lii = $(''); + $lii = $(''); $group.find("ul.section_grp").append($lii); } } @@ -366,7 +393,7 @@ var orbitDesktop = function(dom){ $.each(appss,function(i,apps){ $.each(apps,function(i,app){ - $li = $('
  • '+app.title+'

  • '); + $li = $('
  • '+app.title+'

  • '); $("ul#section"+yy).append($li); }) if(y==1){ diff --git a/app/controllers/desktop_controller.rb b/app/controllers/desktop_controller.rb index 4cf425a2..350b8c90 100644 --- a/app/controllers/desktop_controller.rb +++ b/app/controllers/desktop_controller.rb @@ -48,6 +48,18 @@ class DesktopController< ApplicationController section.update_attributes(:name => @desktopnewnames[x] ) x = x+1 end + when "appnewsection" + @section = Section.find(params["newsectionid"]) + @groups = @section.groups + @app = Tile.find(params["appid"]) + @groups.each do |group| + @tiles = group.tiles.where(:data_category.all => ["app"]) + if @tiles.length < 12 + @app.update_attributes(:group_id => group.id) + break + end + end + end a = Array.new a << {"success"=>"true"} @@ -119,4 +131,34 @@ class DesktopController< ApplicationController end render :json=>a.to_json end + + def newpositions + @newpositions = params["newpos"] + @section = Section.find(params["sectionid"]) + @groupids = params["groupids"] + @groups = @section.groups + z = 0 + @newpositions.each do |grp| + x = 1 + grp.each do |tileid| + if x != 1 + y = 1 + tileid.each do |id| + @tile = Tile.find(id) + @tile.update_attributes({:position => y}) + if @tile.group_id != @groupids[z] + @tile.update_attributes({:group_id => @groupids[z]}) + end + y = y + 1 + end + z = z + 1 + end + x = x + 1 + end + end + b = Array.new + b << {"success"=>"true"} + render :json=>b.to_json + end + end \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index bc51e18b..441a7ab9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -113,6 +113,7 @@ Orbit::Application.routes.draw do match '/desktop/settingthemes/'=>'desktop#settingthemes' match '/desktop/settingsections/'=>'desktop#settingsections' match '/desktop/getapplist/'=>'desktop#getapplist' + match '/desktop/newpositions/'=>'desktop#newpositions' match '/desktop/temp_func/'=>'desktop#temp_func' match '/panel/:app_name/front_end/:app_action/:id' => 'pages#show_from_link', :constraints => lambda { |request| diff --git a/public/desktop_themes/natural/css/natural.css b/public/desktop_themes/natural/css/natural.css index 84bdce6d..1a1d5766 100755 --- a/public/desktop_themes/natural/css/natural.css +++ b/public/desktop_themes/natural/css/natural.css @@ -25,6 +25,7 @@ sub1 Theme Color apply to: #rwidget +first one */ .thmc4 { background: #5CA360; }