new setting page

This commit is contained in:
Harry Bomrah 2012-04-05 20:09:01 +08:00
parent f7997bbd85
commit 39e1bc8948
4 changed files with 29 additions and 2 deletions

View File

@ -10,7 +10,7 @@ var orbitDesktop = function(dom){
this.transitionTime = 500; this.transitionTime = 500;
this.currenthtml = "desktop.html"; this.currenthtml = "desktop.html";
this.currentface = "home"; this.currentface = "home";
this.desktopData = {"home":"","fun":"","work":"","favorite":"","apps_manager":"","sections":""}; this.desktopData = {"home":"","settings":"","work":"","favorite":"","apps_manager":"","sections":""};
this.tp = ""; this.tp = "";
this.initialize = function(){ this.initialize = function(){
var theme = o.theme; var theme = o.theme;
@ -60,6 +60,15 @@ var orbitDesktop = function(dom){
}); });
} }
}); });
$("a#d_settings").click(function(){
var target = $(this).attr("href");
if(o.currenthtml!=target){
o.desktopData[o.currentface] = $(o.contentHolder).html();
$("#content").hide("drop",o.transitionTime,function(){
o.initializeSectionsManager(target);
});
}
});
$("select#change_theme").change(function(){ $("select#change_theme").change(function(){
o.changeTheme($(this).val()); o.changeTheme($(this).val());
}) })
@ -188,7 +197,7 @@ var orbitDesktop = function(dom){
}; };
this.initializeSectionsManager = function(target){ this.initializeSectionsManager = function(target){
o.currenthtml = target; o.currenthtml = target;
o.currentface = "settings"; o.currentface = "sections";
var elementParent,element; var elementParent,element;
var bindHandlers = function(){ var bindHandlers = function(){
$(".group").width(530); $(".group").width(530);
@ -271,6 +280,18 @@ var orbitDesktop = function(dom){
$("#orbit_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.orbit); $("#orbit_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.orbit);
$("#connection_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.connection); $("#connection_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.connection);
$("#appstore_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.appstore); $("#appstore_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.appstore);
};
this.initializeSettings = function(target){
o.currenthtml = target;
o.currentface = "sections";
if(!o.desktopData[o.currentface]){
$(o.contentHolder).empty().load("/desktop/"+target,function(){
// bindHandlers();
});
}else{
$(o.contentHolder).html(o.desktopData[o.currentface]);
// bindHandlers();
}
} }
o.initialize(); o.initialize();
} }

View File

@ -16,4 +16,8 @@ class DesktopController< ApplicationController
def sections def sections
render :layout => false render :layout => false
end end
def settings
render :layout => false
end
end end

View File

@ -0,0 +1 @@
settings

View File

@ -98,6 +98,7 @@ Orbit::Application.routes.draw do
match '/desktop/desktop'=>'desktop#desktop' match '/desktop/desktop'=>'desktop#desktop'
match '/desktop/app_manager'=>'desktop#app_manager' match '/desktop/app_manager'=>'desktop#app_manager'
match '/desktop/sections'=>'desktop#sections' match '/desktop/sections'=>'desktop#sections'
match '/desktop/settings'=>'desktop#settings'
match '/panel/:app_name/front_end/:app_action/:id' => 'pages#show_from_link', :constraints => lambda { |request| match '/panel/:app_name/front_end/:app_action/:id' => 'pages#show_from_link', :constraints => lambda { |request|
!request.query_string.include?("inner=true") !request.query_string.include?("inner=true")
} }