From 08b99011d057c1d185a0a532014a6a30c960ebb2 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Fri, 7 Dec 2012 10:10:38 +0800 Subject: [PATCH] all sections and sections megerd --- app/assets/javascripts/orbitdesktop.js | 1 + app/controllers/desktop_controller.rb | 2 +- ...sections.html.erb => allsections.html.erb} | 0 app/views/desktop/index.html.erb | 2 +- app/views/desktop/settings/sections.html.erb | 190 ++---------------- config/routes.rb | 2 +- 6 files changed, 19 insertions(+), 178 deletions(-) rename app/views/desktop/{sections.html.erb => allsections.html.erb} (100%) diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index 16591be71..e10a66045 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -637,6 +637,7 @@ var orbitDesktop = function(dom){ } } z++; + $("div#group_wrapper").append($group); } var yy=1,y=0; diff --git a/app/controllers/desktop_controller.rb b/app/controllers/desktop_controller.rb index 279694b6d..4eef26be1 100644 --- a/app/controllers/desktop_controller.rb +++ b/app/controllers/desktop_controller.rb @@ -19,7 +19,7 @@ class DesktopController< ApplicationController render :layout => false end - def sections + def allsections render :layout => false end diff --git a/app/views/desktop/sections.html.erb b/app/views/desktop/allsections.html.erb similarity index 100% rename from app/views/desktop/sections.html.erb rename to app/views/desktop/allsections.html.erb diff --git a/app/views/desktop/index.html.erb b/app/views/desktop/index.html.erb index c90f53fdd..3559dc35e 100644 --- a/app/views/desktop/index.html.erb +++ b/app/views/desktop/index.html.erb @@ -4,7 +4,7 @@
  • Home
    • diff --git a/app/views/desktop/settings/sections.html.erb b/app/views/desktop/settings/sections.html.erb index d8e8208e4..dcb922379 100644 --- a/app/views/desktop/settings/sections.html.erb +++ b/app/views/desktop/settings/sections.html.erb @@ -1,178 +1,18 @@ -
    -
    -