diff --git a/app/assets/images/stockBackground/1.jpg b/app/assets/images/stockBackground/1.jpg new file mode 100755 index 00000000..5981dcf2 Binary files /dev/null and b/app/assets/images/stockBackground/1.jpg differ diff --git a/app/assets/images/stockBackground/10.jpg b/app/assets/images/stockBackground/10.jpg new file mode 100755 index 00000000..3b1faa7f Binary files /dev/null and b/app/assets/images/stockBackground/10.jpg differ diff --git a/app/assets/images/stockBackground/11.jpg b/app/assets/images/stockBackground/11.jpg new file mode 100755 index 00000000..88ab7bdf Binary files /dev/null and b/app/assets/images/stockBackground/11.jpg differ diff --git a/app/assets/images/stockBackground/12.jpg b/app/assets/images/stockBackground/12.jpg new file mode 100755 index 00000000..e9385131 Binary files /dev/null and b/app/assets/images/stockBackground/12.jpg differ diff --git a/app/assets/images/stockBackground/2.jpg b/app/assets/images/stockBackground/2.jpg new file mode 100755 index 00000000..9fed12fc Binary files /dev/null and b/app/assets/images/stockBackground/2.jpg differ diff --git a/app/assets/images/stockBackground/3.jpg b/app/assets/images/stockBackground/3.jpg new file mode 100755 index 00000000..7a2cf18a Binary files /dev/null and b/app/assets/images/stockBackground/3.jpg differ diff --git a/app/assets/images/stockBackground/4.jpg b/app/assets/images/stockBackground/4.jpg new file mode 100755 index 00000000..c2bfc14e Binary files /dev/null and b/app/assets/images/stockBackground/4.jpg differ diff --git a/app/assets/images/stockBackground/5.jpg b/app/assets/images/stockBackground/5.jpg new file mode 100755 index 00000000..0db9de93 Binary files /dev/null and b/app/assets/images/stockBackground/5.jpg differ diff --git a/app/assets/images/stockBackground/6.jpg b/app/assets/images/stockBackground/6.jpg new file mode 100755 index 00000000..867ad0f9 Binary files /dev/null and b/app/assets/images/stockBackground/6.jpg differ diff --git a/app/assets/images/stockBackground/7.jpg b/app/assets/images/stockBackground/7.jpg new file mode 100755 index 00000000..370313a2 Binary files /dev/null and b/app/assets/images/stockBackground/7.jpg differ diff --git a/app/assets/images/stockBackground/8.jpg b/app/assets/images/stockBackground/8.jpg new file mode 100755 index 00000000..919fabf4 Binary files /dev/null and b/app/assets/images/stockBackground/8.jpg differ diff --git a/app/assets/images/stockBackground/9.jpg b/app/assets/images/stockBackground/9.jpg new file mode 100755 index 00000000..3bba544e Binary files /dev/null and b/app/assets/images/stockBackground/9.jpg differ diff --git a/app/assets/images/stockBackground/thumb/1.jpg b/app/assets/images/stockBackground/thumb/1.jpg new file mode 100755 index 00000000..38b23586 Binary files /dev/null and b/app/assets/images/stockBackground/thumb/1.jpg differ diff --git a/app/assets/images/stockBackground/thumb/10.jpg b/app/assets/images/stockBackground/thumb/10.jpg new file mode 100755 index 00000000..481bc866 Binary files /dev/null and b/app/assets/images/stockBackground/thumb/10.jpg differ diff --git a/app/assets/images/stockBackground/thumb/11.jpg b/app/assets/images/stockBackground/thumb/11.jpg new file mode 100755 index 00000000..ca304ded Binary files /dev/null and b/app/assets/images/stockBackground/thumb/11.jpg differ diff --git a/app/assets/images/stockBackground/thumb/12.jpg b/app/assets/images/stockBackground/thumb/12.jpg new file mode 100755 index 00000000..83cd444a Binary files /dev/null and b/app/assets/images/stockBackground/thumb/12.jpg differ diff --git a/app/assets/images/stockBackground/thumb/2.jpg b/app/assets/images/stockBackground/thumb/2.jpg new file mode 100755 index 00000000..14254a1e Binary files /dev/null and b/app/assets/images/stockBackground/thumb/2.jpg differ diff --git a/app/assets/images/stockBackground/thumb/3.jpg b/app/assets/images/stockBackground/thumb/3.jpg new file mode 100755 index 00000000..cc2047e6 Binary files /dev/null and b/app/assets/images/stockBackground/thumb/3.jpg differ diff --git a/app/assets/images/stockBackground/thumb/4.jpg b/app/assets/images/stockBackground/thumb/4.jpg new file mode 100755 index 00000000..2fbe5929 Binary files /dev/null and b/app/assets/images/stockBackground/thumb/4.jpg differ diff --git a/app/assets/images/stockBackground/thumb/5.jpg b/app/assets/images/stockBackground/thumb/5.jpg new file mode 100755 index 00000000..d9395737 Binary files /dev/null and b/app/assets/images/stockBackground/thumb/5.jpg differ diff --git a/app/assets/images/stockBackground/thumb/6.jpg b/app/assets/images/stockBackground/thumb/6.jpg new file mode 100755 index 00000000..9661a8c7 Binary files /dev/null and b/app/assets/images/stockBackground/thumb/6.jpg differ diff --git a/app/assets/images/stockBackground/thumb/7.jpg b/app/assets/images/stockBackground/thumb/7.jpg new file mode 100755 index 00000000..697ae27a Binary files /dev/null and b/app/assets/images/stockBackground/thumb/7.jpg differ diff --git a/app/assets/images/stockBackground/thumb/8.jpg b/app/assets/images/stockBackground/thumb/8.jpg new file mode 100755 index 00000000..25a47979 Binary files /dev/null and b/app/assets/images/stockBackground/thumb/8.jpg differ diff --git a/app/assets/images/stockBackground/thumb/9.jpg b/app/assets/images/stockBackground/thumb/9.jpg new file mode 100755 index 00000000..e7dd60e0 Binary files /dev/null and b/app/assets/images/stockBackground/thumb/9.jpg differ diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index 889d859c..f6f09d76 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -169,12 +169,11 @@ var orbitDesktop = function(dom){ } } }); - $('div#desktop .tinycanvas').tinyscrollbar({ axis: 'x'}); - $("div#desktop div.scrollbar").hover(function(){ - $(this).removeClass('op01'); - }, function(){ - $(this).addClass('op01'); - }); + $('div#desktop .tinycanvas') + .tinyscrollbar({ axis: 'x' }) + .find('.scrollbar') + .delay(1500) + .addClass('op00', 500); // simple dropdown menu var $sdm = $('.sdm'); @@ -305,7 +304,11 @@ var orbitDesktop = function(dom){ $("div#app_manager .group_search").html(allApps); return false; }) - $('.tinycanvas').tinyscrollbar({ axis: 'x'}); + $('.tinycanvas') + .tinyscrollbar({ axis: 'x'}) + .find('.scrollbar') + .delay(1500) + .addClass('op00', 500); } var loadApps = function(){ $.getJSON("/desktop/getapplist",{desktopid:o.desktopId},function(appss){ @@ -371,7 +374,11 @@ var orbitDesktop = function(dom){ $(this).find('span.tile').addClass('op06'); } }); - $('.tinycanvas').tinyscrollbar({ axis: 'x'}); + $('.tinycanvas') + .tinyscrollbar({ axis: 'x'}) + .find('.scrollbar') + .delay(1500) + .addClass('op00', 500); var $sdm = $('.sdm'); if( !$sdm.children('.sdm_o') ){ @@ -431,34 +438,43 @@ var orbitDesktop = function(dom){ o.currenthtml = target; o.currentface = "settings"; var bindHandlers = function(){ - $("div#settings ul#setting_left_nav li a").click(function(){ - if(!$(this).data("clicked")){ - var tfunc = $(this).attr("href"); - switch(tfunc){ - case "themes": - themes(); - break; - case "sections": - sections(); - break; - } - $("div#settings ul#setting_left_nav li a").removeClass('thmc1 thmtxt').data('clicked',null); - $(this).addClass('thmc1 thmtxt').data('clicked',true); + $("div#settings ul#setting_left_nav li a").on({ + click: function(){ + if(!$(this).data("clicked")){ + var tfunc = $(this).attr("href"); + switch(tfunc){ + case "themes": + themes(); + break; + case "sections": + sections(); + break; + } + $("div#settings ul#setting_left_nav li a").removeClass('thmc1 thmtxt').data('clicked',null); + $(this).addClass('thmc1 thmtxt').data('clicked',true); + } + }, + mouseenter: function(){ + $(this).removeClass('admtxt').addClass('thmc1 thmtxt'); + }, + mouseleave: function(){ + var t = $(this).data('clicked') ? '' : 'thmc1 thmtxt'; + $(this).removeClass(t).addClass('admtxt'); } }); - $("div#settings ul#setting_left_nav li a").hover(function(){ - $(this).removeClass('admtxt').addClass('thmc1 thmtxt'); - }, function(){ - var t = $(this).data('clicked') ? '' : 'thmc1 thmtxt'; - $(this).removeClass(t).addClass('admtxt'); - }); + } var sections = function(){ var bindHandlers = function(){ $('.tinycanvas').each(function(){ var h = $(this).parent().height(), sh = $(this).siblings('.s_tab').height(); - $(this).css({'height': h-sh-24}).tinyscrollbar({ axis: 'y'}); + $(this) + .css({'height': h-sh-24}) + .tinyscrollbar({ axis: 'y'}) + .find('.scrollbar') + .delay(1500) + .addClass('op00', 500); }); $("a#name_save_btn").click(function(){ @@ -493,40 +509,51 @@ var orbitDesktop = function(dom){ } var themes = function(){ var bindHandlers = function(){ - $(".theme_list > li").click(function(){ + // live change theme + $(".theme_list > .ssl_item").click(function(){ o.changeTheme($(this).attr("id")); - // $(".theme_list > li").removeClass('thmc1').data('clicked',null).find('.theme_name').removeClass('thmtxt'); - // $(this).addClass('thmc1').data('clicked',true).find('.theme_name').addClass('thmtxt'); + // $(".theme_list > li").removeClass('thmc1').data('clicked',null).find('.theme_name').removeClass('thmtxt'); + // $(this).addClass('thmc1').data('clicked',true).find('.theme_name').addClass('thmtxt'); $.post("/desktop/save_desktop_settings",{"save":"theme","desktopid":o.desktopId,"theme":$(this).attr("id")},function(result,status){ if(status=="success"){ - if(result[0].success=="true") + if(result[0].success=="true"){ o.notify("Theme Saved!!","success",2); - else + loadthmc(); + } else { o.notify("Theme saving failed!!","imp",2); + } }else{ o.notify("Connection problem!!","alert",2); } }); }); - $('.ssl .ssl_item').each(function(){ - $(this).on({ - click: function(){ - $(this).switchClass('','thmc1 active',300); - $(this).siblings('.thmc1').switchClass('thmc1 active','',100); + // single select + $('.ssl .ssl_item').each(function(){ + $(this).on({ + click: function(){ + $(this).switchClass('','thmc1 active',300); + $(this).siblings('.thmc1').switchClass('thmc1 active','',100); - if( $(this).find('.ssl_des') ){ - $(this).parents('.ssl').find('.ssl_des').removeClass('thmtxt'); - $(this).find('.ssl_des').addClass('thmtxt'); - } + if( $(this).find('.ssl_des') ){ + $(this).parents('.ssl').find('.ssl_des').removeClass('thmtxt'); + $(this).find('.ssl_des').addClass('thmtxt'); } - }); + } }); + }); + $('.tinycanvas').each(function(){ var h = $(this).parent().height(), sh = $(this).siblings('.s_tab').height(); - $(this).css({'height': h-sh-24}).tinyscrollbar({ axis: 'y'}); + $(this) + .css({'height': h-sh-24}) + .tinyscrollbar({ axis: 'y'}) + .find('.scrollbar') + .delay(1500) + .addClass('op00', 500); }); + // tab var $anchor = $('.s_tab a[href*=#]'), $tabcontent = $('.st_c'); @@ -541,12 +568,7 @@ var orbitDesktop = function(dom){ return false; }); }); - /* $("tr#color_inputs input").each(function(){ - var what = $(this).attr("for"); - alert($("#theme_preview_area ."+what).css("background-color")) - $(this).val() - }) */ - + $('.color-picker').miniColors({ change:function(hex){ var changewhat = $(this).attr("for"); @@ -568,6 +590,8 @@ var orbitDesktop = function(dom){ } } }); + + $('.theme_list li:first-child').data('clicked',true); // this line just for demo $('.theme_list li').hover(function(){ $(this).addClass('thmc1').find('.theme_name').addClass('thmtxt'); @@ -598,32 +622,33 @@ var orbitDesktop = function(dom){ }) } - var loadthmc = function(){ - $('.color-picker').each(function(){ - var cc = $(this).attr('for'), hex, color; - switch(cc){ - case 'thmtxt': - case 'thmtxth': - hex = 'color'; - break; - case 'g_sep': - hex = 'border-left-color'; - break; - default: - hex = 'background-color'; - break; - } - if(cc=="background") - color = $("#theme_preview_area").css("background-color"); - else - color = $('#theme_preview_area .'+cc).css(hex); - $(this).miniColors("value", o.rgb2hex(color)); - }); - } + var loadthmc = function(){ + $('.color-picker').each(function(){ + var cc = $(this).attr('for'), hex, color; + switch(cc){ + case 'thmtxt': + case 'thmtxth': + hex = 'color'; + break; + case 'g_sep': + hex = 'border-left-color'; + break; + default: + hex = 'background-color'; + break; + } + if(cc=="background") + color = $("#theme_preview_area").css("background-color"); + else + color = $('#theme_preview_area .'+cc).css(hex); + $(this).miniColors("value", o.rgb2hex(color)); + }); + } $("div#settings div#panel_r").load("/desktop/settingthemes",function(){ $.getJSON("/desktop/get_desktop_settings",{"get":"theme","desktopid":o.desktopId},function(theme){ $("#st1 ul.theme_list li#"+theme).addClass("thmc1").find("span").addClass("thmtxt"); bindHandlers(); + loadthmc(); }) }) } @@ -664,7 +689,7 @@ var orbitDesktop = function(dom){ } }) - } + }; o.initialize(); } diff --git a/app/views/desktop/desktop.html.erb b/app/views/desktop/desktop.html.erb index 79ac832d..f8904136 100755 --- a/app/views/desktop/desktop.html.erb +++ b/app/views/desktop/desktop.html.erb @@ -15,7 +15,7 @@
-
+