diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js
index 33aab4fc..9bdacd51 100755
--- a/app/assets/javascripts/orbitdesktop.js
+++ b/app/assets/javascripts/orbitdesktop.js
@@ -247,7 +247,7 @@ var orbitDesktop = function(dom){
var tempstyle="";
if(i==0){
tempstyle = "style='display:none;'";
- $("div#desktop span#section_heading").text(section.name);
+ $("#desktop #section_heading").text(section.name);
}
$("div#desktop ul#section_list").append($('
'+section.name+''));
})
@@ -721,28 +721,30 @@ var orbitDesktop = function(dom){
o.currenthtml = target;
o.currentface = "journal_p";
var bindHandlers = function(){ // bind handler for journal paper
- $("div#settings ul#setting_left_nav li a").on({
+ $('.s_menu a').on({
click: function(){
- if(!$(this).data("clicked")){
- var tfunc = $(this).attr("href");
- switch(tfunc){
- case "list":
- list();
- break;
- case "addpaper":
- addpaper();
- break;
- }
- $("div#settings ul#setting_left_nav li a").removeClass('thmc1 thmtxt').data('clicked',null);
- $(this).addClass('thmc1 thmtxt').data('clicked',true);
+ if(!$(this).hasClass('active')){
+ var tfunc = $(this).attr('href');
+ switch(tfunc){
+ case 'list':
+ list();
+ break;
+ case 'addpaper':
+ addpaper();
+ break;
+ }
+ $('.s_menu a').removeClass('thmc1 thmtxt active');
+ $(this).addClass('thmc1 thmtxt active');
}
},
mouseenter: function(){
- $(this).removeClass('admtxt').addClass('thmc1 thmtxt');
+ if(!$(this).hasClass('active')){
+ $(this).switchClass('admtxt','thmc1 thmtxt',0);
+ }
},
mouseleave: function(){
- var t = $(this).data('clicked') ? '' : 'thmc1 thmtxt';
- $(this).removeClass(t).addClass('admtxt');
+ var t = $(this).hasClass('active') ? '' : 'thmc1 thmtxt';
+ $(this).switchClass(t,'admtxt',0);
}
});
}
diff --git a/app/assets/stylesheets/desktopmain.css b/app/assets/stylesheets/desktopmain.css
index b4d4ac63..4aead425 100644
--- a/app/assets/stylesheets/desktopmain.css
+++ b/app/assets/stylesheets/desktopmain.css
@@ -229,7 +229,8 @@ a:focus { outline: none; }
#panel_r { margin-left: 252px; position: relative;}
/* simple dropdown menu */
-.sdm {}
+.sdm { position: relative; }
+.sdm_t { cursor: default; }
.sdm:hover .sdm_o { display: block; }
.sdm_o {
display: none;
@@ -240,6 +241,7 @@ a:focus { outline: none; }
}
.sdm_o li { border-top: solid 1px #f2f2f2; }
.sdm_o li:first-child { border: none; }
+.sdm_o a { display: block; }
.sdm_o .admtxt { display: block; line-height: 36px; }
.sdm_o .admtxt:hover { background-color: #F0F0F0; }
@@ -260,6 +262,17 @@ a:focus { outline: none; }
.st_c { display: none; }
.st_c:first-child { display: block; }
+
+/* tool bar */
+.toolbar {
+ background-color: #f0f0f0;
+ font-size: 15px;
+ line-height: 36px;
+}
+.toolbar .sdm { display: inline-block; }
+.toolbar .sdm_o { top: 36px; background-color: #f0f0f0; }
+
+
/* Setting Page */
.theme_list {}
.theme_list .ssl_item, .stock_wallpaper .ssl_item {
diff --git a/app/views/desktop/desktop.html.erb b/app/views/desktop/desktop.html.erb
index f8904136..93827506 100755
--- a/app/views/desktop/desktop.html.erb
+++ b/app/views/desktop/desktop.html.erb
@@ -2,7 +2,7 @@