From 25ca29403c6122dbf64653cd99d3f7c18fd386c2 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Wed, 11 Apr 2012 17:58:52 +0800 Subject: [PATCH] section page added --- app/assets/javascripts/orbitdesktop.js | 28 +++++++++++++++++--- app/controllers/desktop_controller.rb | 4 +++ app/views/desktop/settings.html.erb | 12 ++++----- app/views/desktop/settings/sections.html.erb | 1 + config/routes.rb | 2 +- 5 files changed, 36 insertions(+), 11 deletions(-) create mode 100644 app/views/desktop/settings/sections.html.erb diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index aafd5641..fa032ffd 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -335,9 +335,28 @@ var orbitDesktop = function(dom){ o.currenthtml = target; o.currentface = "settings"; var bindHandlers = function(){ - + $("ul#setting_left_nav li a").click(function(){ + var tfunc = $(this).attr("href"); + switch(tfunc){ + case "themes": + themes(); + break; + case "sections": + sections(); + break; + } + }) } - var loadThemePage = function(){ + var sections = function(){ + var bindHandlers = function(){ + + } + $("div#panel_r").load("/desktop/settingsections",function(){ + bindHandlers(); + }) + + } + var themes = function(){ var bindHandlers = function(){ $(".theme_list > li").click(function(){ o.changeTheme($(this).find('.theme_name').text()); @@ -379,13 +398,14 @@ var orbitDesktop = function(dom){ }); } - $("div#panel_r").load("/desktop/settingthemes/",function(){ + $("div#panel_r").load("/desktop/settingthemes",function(){ bindHandlers(); }) } $(o.contentHolder).empty().load("/desktop/"+target,function(){ - loadThemePage(); + bindHandlers(); + sections(); }); }; this.loadWallpaper = function(wallpaper){ diff --git a/app/controllers/desktop_controller.rb b/app/controllers/desktop_controller.rb index 4d648467..d426b4da 100644 --- a/app/controllers/desktop_controller.rb +++ b/app/controllers/desktop_controller.rb @@ -40,6 +40,10 @@ class DesktopController< ApplicationController 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 diff --git a/app/views/desktop/settings.html.erb b/app/views/desktop/settings.html.erb index ffc9e313..4ffe2f02 100644 --- a/app/views/desktop/settings.html.erb +++ b/app/views/desktop/settings.html.erb @@ -8,12 +8,12 @@
diff --git a/app/views/desktop/settings/sections.html.erb b/app/views/desktop/settings/sections.html.erb new file mode 100644 index 00000000..15195748 --- /dev/null +++ b/app/views/desktop/settings/sections.html.erb @@ -0,0 +1 @@ +Fucking section setting page... \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 733280b2..501e40f5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -111,7 +111,7 @@ Orbit::Application.routes.draw do match '/desktop/getgroups/'=>'desktop#getgroups' match '/desktop/getsectionlist/'=>'desktop#getsectionlist' match '/desktop/settingthemes/'=>'desktop#settingthemes' - + match '/desktop/settingsections/'=>'desktop#settingsections' match '/desktop/temp_func/'=>'desktop#temp_func' match '/panel/:app_name/front_end/:app_action/:id' => 'pages#show_from_link', :constraints => lambda { |request|