From 6006f1b3c6e186a9afdb4fcf7c8dcd5b9eb4b6fc Mon Sep 17 00:00:00 2001 From: devin Date: Tue, 10 Apr 2012 01:06:29 +0800 Subject: [PATCH 1/6] start editing setting page some relevant stuff updated --- app/assets/javascripts/orbitdesktop.js | 12 ++-- app/assets/stylesheets/desktopmain.css | 40 +++++++++--- app/views/desktop/app_manager.html.erb | 2 +- app/views/desktop/desktop.html.erb | 2 +- app/views/desktop/sections.html.erb | 90 +++++++++++++------------- app/views/desktop/settings.html.erb | 42 +++++++----- 6 files changed, 112 insertions(+), 76 deletions(-) diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index f6346951..c8db9a44 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -151,6 +151,8 @@ var orbitDesktop = function(dom){ }, function(){ $(this).addClass('op01'); }); + + // simple dropdown menu var $sdm = $('.sdm'); if( !$sdm.children('.sdm_o') ){ @@ -255,12 +257,13 @@ var orbitDesktop = function(dom){ } else $("#"+$(this).attr("data-category")).append(element); - },over:function(){ + }, + over:function(){ $(this).find('span.tile').removeClass('op06'); }, - out:function(){ + out:function(){ $(this).find('span.tile').addClass('op06'); - } + } }); $('#holder').tinyscrollbar({ axis: 'x'}); var $sdm = $('.sdm'); @@ -291,7 +294,8 @@ var orbitDesktop = function(dom){ var bindHandlers = function(){ $("select#change_theme").change(function(){ o.changeTheme($(this).val()); - }) + }); + $('#panel_r').tinyscrollbar({ axis: 'y'}); } if(!o.desktopData[o.currentface]){ $(o.contentHolder).empty().load("/desktop/"+target,function(){ diff --git a/app/assets/stylesheets/desktopmain.css b/app/assets/stylesheets/desktopmain.css index de18a161..09a1061d 100644 --- a/app/assets/stylesheets/desktopmain.css +++ b/app/assets/stylesheets/desktopmain.css @@ -173,6 +173,7 @@ a, a:hover { text-decoration: none; } } .appholder { position: relative; + z-index: 2; padding-bottom: 12px; } .holder_f { @@ -180,8 +181,8 @@ a, a:hover { text-decoration: none; } width: 100%; height: 100%; padding: 0; -/* left: 0; - top: 0; */ + left: 0; + top: 0; } .dtitle { font-size: 30px; @@ -213,6 +214,10 @@ a, a:hover { text-decoration: none; } top: 0; } +/* panel */ +#panel_l { background-color: #f0f0f0; float: left; } +#panel_r { margin-left: 252px; position: relative;} + /* simple dropdown menu */ .sdm {} .sdm:hover .sdm_o { display: block; } @@ -227,6 +232,22 @@ a, a:hover { text-decoration: none; } .sdm_o li:first-child { border: none; } .sdm_o .admtxt { display: block; line-height: 36px; } .sdm_o .admtxt:hover { background-color: #F0F0F0; } + +/* simple menu */ +.s_menu { font-size: 15px; line-height: 36px; } +.s_menu li { border-top: solid 1px #ddd; } +.s_menu li:first-child { border: none; } +.s_menu a { display: block; } + +/* simple tabs */ +.s_tab { font-size: 15px; line-height: 36px; } +.stb_h {} +.stb_v {} +.s_tab li { display: inline-block; } +.s_tab a { display: block; } +.st_c { display: none; } +.st_c:first-child { display: block; } + /* theme color opacity */ .op10 { opacity: 1; } .op09 { opacity: 0.9; } @@ -247,6 +268,8 @@ a, a:hover { text-decoration: none; } .wh1 { width: 30px; } .wh2 { width: 36px; } .wh3 { width: 60px; } +.w100 { width: 100%; } +.pw { width: 572px; } .h1 { height: 96px; } .h2 { height: 228px; } @@ -254,6 +277,7 @@ a, a:hover { text-decoration: none; } .hh1 { height: 30px; } .hh2 { height: 36px; } .hh3 { height: 60px; } +.ph { height: 516px; } .hp { padding-left: 12px; padding-right: 12px; } .vp { padding-top: 12px; padding-bottom: 12px; } @@ -287,12 +311,9 @@ a, a:hover { text-decoration: none; } /* tiny scrollbar */ #holder .viewport { width: auto; height: 516px; overflow: hidden; position: relative; } #holder .overview { position: absolute; left: 0; top: 0; } -#holder .scrollbar { - position: absolute; - bottom: 0; - left: 0; - height: 12px; -} +#holder .scrollbar { position: absolute; } +#holder .scrollbar.sb_h { left: 0; bottom: 0; height: 12px; } +#holder .scrollbar.sb_v { right: 0; top: 0; width: 12px; } #holder .track { height: 100%; width: 12px; position: relative; } #holder .thumb { height: 12px; width: 12px; cursor: pointer; overflow: hidden; position: absolute; top: 0; } #holder .thumb .end { overflow: hidden; height: 12px; width: 12px; } @@ -330,5 +351,4 @@ a, a:hover { text-decoration: none; } } .grp{ min-height:540px; -} - +} \ No newline at end of file diff --git a/app/views/desktop/app_manager.html.erb b/app/views/desktop/app_manager.html.erb index 057fd934..030b072f 100755 --- a/app/views/desktop/app_manager.html.erb +++ b/app/views/desktop/app_manager.html.erb @@ -13,7 +13,7 @@
-
+
diff --git a/app/views/desktop/desktop.html.erb b/app/views/desktop/desktop.html.erb index ec08ed07..691425c5 100755 --- a/app/views/desktop/desktop.html.erb +++ b/app/views/desktop/desktop.html.erb @@ -13,7 +13,7 @@
-
+
diff --git a/app/views/desktop/sections.html.erb b/app/views/desktop/sections.html.erb index b32d9e02..9762c8fa 100644 --- a/app/views/desktop/sections.html.erb +++ b/app/views/desktop/sections.html.erb @@ -5,7 +5,7 @@
-
+
@@ -19,70 +19,70 @@
  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

    • @@ -99,70 +99,70 @@
  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

  • -

    Garage Band

    +

    Garage Band

diff --git a/app/views/desktop/settings.html.erb b/app/views/desktop/settings.html.erb index 6bd37175..ce88b2b3 100644 --- a/app/views/desktop/settings.html.erb +++ b/app/views/desktop/settings.html.erb @@ -5,19 +5,34 @@
-
-
-
- + +
+
+ +
+
+
+
+ +
+
+
+
+
try
+
test
+
+
+
-<<<<<<< HEAD -=======
->>>>>>> desktop_harry -
-
\ No newline at end of file From 360e5228b74791c69654b40be35492067938a3b9 Mon Sep 17 00:00:00 2001 From: devin Date: Tue, 10 Apr 2012 17:44:36 +0800 Subject: [PATCH 2/6] custom theme settings --- app/assets/images/miniColors/circle.gif | Bin 0 -> 78 bytes app/assets/images/miniColors/gradient.png | Bin 0 -> 10355 bytes app/assets/images/miniColors/line.gif | Bin 0 -> 1104 bytes app/assets/images/miniColors/rainbow.png | Bin 0 -> 2702 bytes app/assets/images/miniColors/trigger.png | Bin 0 -> 1406 bytes app/assets/javascripts/desktop.js | 1 + .../javascripts/jquery.miniColors.min.js | 9 + app/assets/javascripts/orbitdesktop.js | 42 ++- app/assets/stylesheets/desktop.css | 2 + app/assets/stylesheets/desktopmain.css | 42 ++- app/assets/stylesheets/desktopmedia.css | 10 + app/assets/stylesheets/jquery.miniColors.css | 59 ++++ app/views/desktop/app_manager.html.erb | 332 +++++++++--------- app/views/desktop/desktop.html.erb | 160 ++++----- app/views/desktop/sections.html.erb | 318 ++++++++--------- app/views/desktop/settings.html.erb | 60 +++- public/desktop_themes/default/css/default.css | 2 +- 17 files changed, 610 insertions(+), 427 deletions(-) create mode 100755 app/assets/images/miniColors/circle.gif create mode 100755 app/assets/images/miniColors/gradient.png create mode 100755 app/assets/images/miniColors/line.gif create mode 100755 app/assets/images/miniColors/rainbow.png create mode 100755 app/assets/images/miniColors/trigger.png create mode 100755 app/assets/javascripts/jquery.miniColors.min.js create mode 100644 app/assets/stylesheets/desktopmedia.css create mode 100755 app/assets/stylesheets/jquery.miniColors.css diff --git a/app/assets/images/miniColors/circle.gif b/app/assets/images/miniColors/circle.gif new file mode 100755 index 0000000000000000000000000000000000000000..599f7f13a6854d198f501588948ffcf97bf9f365 GIT binary patch literal 78 zcmZ?wbhEHbij|08)1sO8@`> literal 0 HcmV?d00001 diff --git a/app/assets/images/miniColors/gradient.png b/app/assets/images/miniColors/gradient.png new file mode 100755 index 0000000000000000000000000000000000000000..561cdd9c59a498b499cbfd1295dc4d2037e235ff GIT binary patch literal 10355 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 RdwKu>002ovPDHLkV1myV#+d*B literal 0 HcmV?d00001 diff --git a/app/assets/images/miniColors/line.gif b/app/assets/images/miniColors/line.gif new file mode 100755 index 0000000000000000000000000000000000000000..9eb198378801682aa692f0986c9f6caec062a987 GIT binary patch literal 1104 zcmZ?wbhEHblwx3JXkcLY|NlP&1B2p!?g-xi1((Eh+i z#(Mch>H3D2mX;thjEr=FDs+o0^GXscbn}XpVJ5hw7AF^F7L;V>=P7_pOiaozEwNPs zx)kDt+yc0H{644~kf%h=vIPQxAvNJFPuMj_RQ&1Cr=zdcJ#>M zLkAD+-?w+q?p-@~Y~QwZ%jQiRH>_W`cFpQlD_1OEwsgtjMGF_qpEq~T>{&BsOrJJ& z%H&BCC-nFA_H=i3cC@#(wlp_2Hq_VE)>KzjR+N{OmJ}Bi7UbvU=45AOW~8U3rX(jN zCd9|Z#zaR&Mudljh6D!%2Kf8=`gnVJdbqo}x;Q&II@sIU+E`mzT9})eniv}avy`5$ zj<%MjhPs-nin5ZTg1nrpjI@-bgt(Zfh_H~L06!lu4>uPl2Rj=p3o{cVux$9r0xTgI b7<51csMKI!;%@0*DfO0rarBmXObpfls+oe~ literal 0 HcmV?d00001 diff --git a/app/assets/images/miniColors/rainbow.png b/app/assets/images/miniColors/rainbow.png new file mode 100755 index 0000000000000000000000000000000000000000..8d6c71bf95def6736de95f345b4424add36f9a67 GIT binary patch literal 2702 zcmaJ@dpwi-A7AKl3YAL|vPLRlH`lebFw3f$+!gY$#~QoYX6ABmNDLi0q&n`W+i7xH z*$xROjY6%Y5aN(fQ72AG(fLiMI=?@D{hrtBdA^^|_w|0iKi5AVk-OV&jg=c#LLd+g zk}JVOdFm+N{1qz7@BUo8NO|b@a>bzy%?WRCWjmB{2aS=m7%Mn8-E|3xTM@ z=w5z&Kk`0ID4S^oEMlyLOpcNbfnf1M4iFjv@}VIhjn2ZsUe!0jpmZt@=4(SnkU7ra zVY+K97xavE^9qfP2z8*s@H?ScAx0^{1o;3|$Yij17$FY!Nf)EE7q8(k=qCt20tfpi zDL=A1)S1l%p*B_s%TRvZ}KAp{iE-C^c>?l4Crp)x85}2H?vMk=`HYpnh7XlnO(h9Ly(ib3^{Qsd$=2tY2 z?*aas@Bb9$dBt!*xCh8%M{z@yg9|fR48_4Xb3uU5=6bQ&j4xeuKg{N{d575?sI#XH zlnjK@S&RNBJeiCkv3Pud6$+9FIG9qwicY6u>>QmP>`+8&w6&uP66u1lx3P965|k#w z0cGugCVb%%*r8EOkj4MPrT)vc`6hR96_^}lWCF;g3qUH7%Vt79m5iZ(I~UY9^*(c{ z-_8a7O)gxS41960|260@SIX^KG{3H`()qghAWOOJT;*EFx9k1}fh<=c5gfgQeTDx0 z+k<+TyS+HCIPe5xcZXD(I2s^7-x>Vasc`PsOrl|NuD4WHjSA!a(l2d?VMJ2v3+*csjmd zdnCSeTg6TMk__N%nbdSDSN~-JpDY<6*cH2V4qb96Vy7Nc?s`LDVH76WJo`L81 zn&w%hUA5bWEZ~VIZ?Zr<&9cJ zKfmtp0;Yd9pm{f+4Pg7SHk{OIojd{b>j>QBdSi@;?z&rNQe%H`#ZQS6;`R;%w{*R! zj}hnn9t-82&-Z*h$Y_`N)IQqGT{p5zoKd|}t2n~%`vXr5ODDagcHJ^d=#Z$eO3PTR zySIF!C&XNOVk2p?NHtbPV!7q<8tmHwQ<-0;cR-vp=mH&0Hce>5yb`UqaWgBRjdm^+ zD$+|jhtmwa83i@(8C6)9Llq%dyZH4f?5doq%S*ean*(;6>{f908pjQnHT#WfE6$7O zN>X(?`>t}YHiSQD+5qP&kciS!L9UKW|3~Jbh6fLaFLp7j+ur`fLiQiJxu^$u8x zmR{af6kB{bs(oGA3mqqh$xl+Fdz+rh{>C1C=|1nLi}MS<*6DAS4Z2r_TqE>;{QWBS z8KO9_v}@-Wx`bS52VuxJit${Dc6CDWA1Jt1|0%Ql7Q!|2Wi!4z?6)emU%6*0K(EIM zCMJBfHyU_LPfg78-4iq$^7%(qpAU^kZW_aA#*9=vAToSNG~w>K!6JgX>Y5m?^u^os z?Z@Ss^9#hx#|`iG%ZKU5o(ZOCzPG%4xo>Bj?>~A*e7-?pf3n4`a;1GZtJ0px*cUPb zFrx9xF)GV>iYb@z1FqT3j;^thR?!S;o9*&#>vDJzm{2afTXg46aQ`v4c_Y!oK-~)k zt0dl6m$a(3&7w90W)5f^Q1@tajKGhY)+Y%#( zaBcI0sx#ZKkUKBgWij&#sxc;^SBP zO8$!9Z5DR-p|*}S7)}Yn-%U!+4o)>Ub;3rru4&n+vhPW-S_3d?8Ft*oxDIlzZeqTy zVfNO!peEI_PNy61WJP5J!O8N$`wr1LQ}jNyyUv(?BWh}Yb6v%U&LNAn-6{EF@vPHP z(Xhx%MXTDD2m&lj&h%2Y7Q`nm0T%{lDUr2hQxeOrsX<*;_oRw}xW1jmb=~-1f4{$; z8ZOaKB}hQC9a6*O+16Xcg9#efzk9JICDQ-W2mhxn`&8ch)3Qv6FR34oR*0iI3Mqez z)eD~yOGKD7_G_}dK51wFgLCGO^SX|%h>vxT{i8D+J=J|J-%+jtD(;Fwp9)F=;&XY~A2BQ^l)`20>Mn;Wm7p xw_jbxV2-I%{K8$^X#33@IEI@Vo+mC@23h!^avAAwwD_M1A-T8_DxHFp{{sgmqmTdq literal 0 HcmV?d00001 diff --git a/app/assets/images/miniColors/trigger.png b/app/assets/images/miniColors/trigger.png new file mode 100755 index 0000000000000000000000000000000000000000..8c169fd6053009030232ef865a61876992b68589 GIT binary patch literal 1406 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+n3Xa^B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%s|1+P|wiV z#N6CmN5ROz&_Lh7NZ-&%*U;R`*vQJjKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8EkR}&8R-I5=oVMzl_XZ^<`pZ$OmImpPAEg{v+u2}(t{7puX=A(aKG z`a!A1`K3k4z=%sz23b{L-^Aq1JP;qO z-q+X4Gq1QLF)umQ)5TT^Xo6m5W{Q=Ysky7Esj-oY45WOi_+yd2$+aLNs$LND17Ac}(Lcr7mV#1RxkONQnsd>QEUIa?kr@s7UU|{^@ z>Eaktacj*~$E-sRB5mp?BgD7u(%yAKHs;l})P)a3cWG2{e-&!7?th>gvs+vwW{XHj z&V_A;GfVy@#?3g=p?UVeXVt^i_y7Df_FMC?;Kvz>>^EOen!6;zabwilu;g6^dl-e>WDmLJGs&^yJ4ueh&55');trigger.insertAfter(input);input.addClass('miniColors').data('original-maxlength',input.attr('maxlength')||null).data('original-autocomplete',input.attr('autocomplete')||null).data('letterCase','uppercase').data('trigger',trigger).data('hsb',hsb).data('change',o.change?o.change:null).attr('maxlength',7).attr('autocomplete','off').val('#'+convertCase(color,o.letterCase));if(o.readonly)input.prop('readonly',true);if(o.disabled)disable(input);trigger.bind('click.miniColors',function(event){event.preventDefault();if(input.val()==='')input.val('#');show(input)});input.bind('focus.miniColors',function(event){if(input.val()==='')input.val('#');show(input)});input.bind('blur.miniColors',function(event){var hex=expandHex(input.val());input.val(hex?'#'+convertCase(hex,input.data('letterCase')):'')});input.bind('keydown.miniColors',function(event){if(event.keyCode===9)hide(input)});input.bind('keyup.miniColors',function(event){setColorFromInput(input)});input.bind('paste.miniColors',function(event){setTimeout(function(){setColorFromInput(input)},5)})};var destroy=function(input){hide();input=$(input);input.data('trigger').remove();input.attr('autocomplete',input.data('original-autocomplete')).attr('maxlength',input.data('original-maxlength')).removeData().removeClass('miniColors').unbind('.miniColors');$(document).unbind('.miniColors')};var enable=function(input){input.prop('disabled',false).data('trigger').css('opacity',1)};var disable=function(input){hide(input);input.prop('disabled',true).data('trigger').css('opacity',0.5)};var show=function(input){if(input.prop('disabled'))return false;hide();var selector=$('
');selector.append('
').append('
').css({top:input.is(':visible')?input.offset().top+input.outerHeight():input.data('trigger').offset().top+input.data('trigger').outerHeight(),left:input.is(':visible')?input.offset().left:input.data('trigger').offset().left,display:'none'}).addClass(input.attr('class'));var hsb=input.data('hsb');selector.find('.miniColors-colors').css('backgroundColor','#'+hsb2hex({h:hsb.h,s:100,b:100}));var colorPosition=input.data('colorPosition');if(!colorPosition)colorPosition=getColorPositionFromHSB(hsb);selector.find('.miniColors-colorPicker').css('top',colorPosition.y+'px').css('left',colorPosition.x+'px');var huePosition=input.data('huePosition');if(!huePosition)huePosition=getHuePositionFromHSB(hsb);selector.find('.miniColors-huePicker').css('top',huePosition.y+'px');input.data('selector',selector).data('huePicker',selector.find('.miniColors-huePicker')).data('colorPicker',selector.find('.miniColors-colorPicker')).data('mousebutton',0);$('BODY').append(selector);selector.fadeIn(100);selector.bind('selectstart',function(){return false});$(document).bind('mousedown.miniColors touchstart.miniColors',function(event){input.data('mousebutton',1);if($(event.target).parents().andSelf().hasClass('miniColors-colors')){event.preventDefault();input.data('moving','colors');moveColor(input,event)}if($(event.target).parents().andSelf().hasClass('miniColors-hues')){event.preventDefault();input.data('moving','hues');moveHue(input,event)}if($(event.target).parents().andSelf().hasClass('miniColors-selector')){event.preventDefault();return}if($(event.target).parents().andSelf().hasClass('miniColors'))return;hide(input)});$(document).bind('mouseup.miniColors touchend.miniColors',function(event){event.preventDefault();input.data('mousebutton',0).removeData('moving')}).bind('mousemove.miniColors touchmove.miniColors',function(event){event.preventDefault();if(input.data('mousebutton')===1){if(input.data('moving')==='colors')moveColor(input,event);if(input.data('moving')==='hues')moveHue(input,event)}})};var hide=function(input){if(!input)input='.miniColors';$(input).each(function(){var selector=$(this).data('selector');$(this).removeData('selector');$(selector).fadeOut(100,function(){$(this).remove()})});$(document).unbind('.miniColors')};var moveColor=function(input,event){var colorPicker=input.data('colorPicker');colorPicker.hide();var position={x:event.pageX,y:event.pageY};if(event.originalEvent.changedTouches){position.x=event.originalEvent.changedTouches[0].pageX;position.y=event.originalEvent.changedTouches[0].pageY}position.x=position.x-input.data('selector').find('.miniColors-colors').offset().left-5;position.y=position.y-input.data('selector').find('.miniColors-colors').offset().top-5;if(position.x<=-5)position.x=-5;if(position.x>=144)position.x=144;if(position.y<=-5)position.y=-5;if(position.y>=144)position.y=144;input.data('colorPosition',position);colorPicker.css('left',position.x).css('top',position.y).show();var s=Math.round((position.x+5)*0.67);if(s<0)s=0;if(s>100)s=100;var b=100-Math.round((position.y+5)*0.67);if(b<0)b=0;if(b>100)b=100;var hsb=input.data('hsb');hsb.s=s;hsb.b=b;setColor(input,hsb,true)};var moveHue=function(input,event){var huePicker=input.data('huePicker');huePicker.hide();var position={y:event.pageY};if(event.originalEvent.changedTouches){position.y=event.originalEvent.changedTouches[0].pageY}position.y=position.y-input.data('selector').find('.miniColors-colors').offset().top-1;if(position.y<=-1)position.y=-1;if(position.y>=149)position.y=149;input.data('huePosition',position);huePicker.css('top',position.y).show();var h=Math.round((150-position.y-1)*2.4);if(h<0)h=0;if(h>360)h=360;var hsb=input.data('hsb');hsb.h=h;setColor(input,hsb,true)};var setColor=function(input,hsb,updateInput){input.data('hsb',hsb);var hex=hsb2hex(hsb);if(updateInput)input.val('#'+convertCase(hex,input.data('letterCase')));input.data('trigger').css('backgroundColor','#'+hex);if(input.data('selector'))input.data('selector').find('.miniColors-colors').css('backgroundColor','#'+hsb2hex({h:hsb.h,s:100,b:100}));if(input.data('change')){if(hex===input.data('lastChange'))return;input.data('change').call(input.get(0),'#'+hex,hsb2rgb(hsb));input.data('lastChange',hex)}};var setColorFromInput=function(input){input.val('#'+cleanHex(input.val()));var hex=expandHex(input.val());if(!hex)return false;var hsb=hex2hsb(hex);var currentHSB=input.data('hsb');if(hsb.h===currentHSB.h&&hsb.s===currentHSB.s&&hsb.b===currentHSB.b)return true;var colorPosition=getColorPositionFromHSB(hsb);var colorPicker=$(input.data('colorPicker'));colorPicker.css('top',colorPosition.y+'px').css('left',colorPosition.x+'px');input.data('colorPosition',colorPosition);var huePosition=getHuePositionFromHSB(hsb);var huePicker=$(input.data('huePicker'));huePicker.css('top',huePosition.y+'px');input.data('huePosition',huePosition);setColor(input,hsb);return true};var convertCase=function(string,letterCase){if(letterCase==='lowercase')return string.toLowerCase();if(letterCase==='uppercase')return string.toUpperCase();return string};var getColorPositionFromHSB=function(hsb){var x=Math.ceil(hsb.s/0.67);if(x<0)x=0;if(x>150)x=150;var y=150-Math.ceil(hsb.b/0.67);if(y<0)y=0;if(y>150)y=150;return{x:x-5,y:y-5}};var getHuePositionFromHSB=function(hsb){var y=150-(hsb.h/2.4);if(y<0)h=0;if(y>150)h=150;return{y:y-1}};var cleanHex=function(hex){return hex.replace(/[^A-F0-9]/ig,'')};var expandHex=function(hex){hex=cleanHex(hex);if(!hex)return null;if(hex.length===3)hex=hex[0]+hex[0]+hex[1]+hex[1]+hex[2]+hex[2];return hex.length===6?hex:null};var hsb2rgb=function(hsb){var rgb={};var h=Math.round(hsb.h);var s=Math.round(hsb.s*255/100);var v=Math.round(hsb.b*255/100);if(s===0){rgb.r=rgb.g=rgb.b=v}else{var t1=v;var t2=(255-s)*v/255;var t3=(t1-t2)*(h%60)/60;if(h===360)h=0;if(h<60){rgb.r=t1;rgb.b=t2;rgb.g=t2+t3}else if(h<120){rgb.g=t1;rgb.b=t2;rgb.r=t1-t3}else if(h<180){rgb.g=t1;rgb.r=t2;rgb.b=t2+t3}else if(h<240){rgb.b=t1;rgb.r=t2;rgb.g=t1-t3}else if(h<300){rgb.b=t1;rgb.g=t2;rgb.r=t2+t3}else if(h<360){rgb.r=t1;rgb.g=t2;rgb.b=t1-t3}else{rgb.r=0;rgb.g=0;rgb.b=0}}return{r:Math.round(rgb.r),g:Math.round(rgb.g),b:Math.round(rgb.b)}};var rgb2hex=function(rgb){var hex=[rgb.r.toString(16),rgb.g.toString(16),rgb.b.toString(16)];$.each(hex,function(nr,val){if(val.length===1)hex[nr]='0'+val});return hex.join('')};var hex2rgb=function(hex){hex=parseInt(((hex.indexOf('#')>-1)?hex.substring(1):hex),16);return{r:hex>>16,g:(hex&0x00FF00)>>8,b:(hex&0x0000FF)}};var rgb2hsb=function(rgb){var hsb={h:0,s:0,b:0};var min=Math.min(rgb.r,rgb.g,rgb.b);var max=Math.max(rgb.r,rgb.g,rgb.b);var delta=max-min;hsb.b=max;hsb.s=max!==0?255*delta/max:0;if(hsb.s!==0){if(rgb.r===max){hsb.h=(rgb.g-rgb.b)/delta}else if(rgb.g===max){hsb.h=2+(rgb.b-rgb.r)/delta}else{hsb.h=4+(rgb.r-rgb.g)/delta}}else{hsb.h=-1}hsb.h*=60;if(hsb.h<0){hsb.h+=360}hsb.s*=100/255;hsb.b*=100/255;return hsb};var hex2hsb=function(hex){var hsb=rgb2hsb(hex2rgb(hex));if(hsb.s===0)hsb.h=360;return hsb};var hsb2hex=function(hsb){return rgb2hex(hsb2rgb(hsb))};switch(o){case'readonly':$(this).each(function(){if(!$(this).hasClass('miniColors'))return;$(this).prop('readonly',data)});return $(this);case'disabled':$(this).each(function(){if(!$(this).hasClass('miniColors'))return;if(data){disable($(this))}else{enable($(this))}});return $(this);case'value':if(data===undefined){if(!$(this).hasClass('miniColors'))return;var input=$(this),hex=expandHex(input.val());return hex?'#'+convertCase(hex,input.data('letterCase')):null}$(this).each(function(){if(!$(this).hasClass('miniColors'))return;$(this).val(data);setColorFromInput($(this))});return $(this);case'destroy':$(this).each(function(){if(!$(this).hasClass('miniColors'))return;destroy($(this))});return $(this);default:if(!o)o={};$(this).each(function(){if($(this)[0].tagName.toLowerCase()!=='input')return;if($(this).data('trigger'))return;create($(this),o,data)});return $(this)}}})})(jQuery); \ No newline at end of file diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index c8db9a44..e68a448c 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -145,7 +145,7 @@ var orbitDesktop = function(dom){ } }); - $('#holder').tinyscrollbar({ axis: 'x'}); + $('.tinycanvas').tinyscrollbar({ axis: 'x'}); $("div.scrollbar").hover(function(){ $(this).removeClass('op01'); }, function(){ @@ -221,7 +221,7 @@ var orbitDesktop = function(dom){ $(".group_search").html(allApps); return false; }) - $('#holder').tinyscrollbar({ axis: 'x'}); + $('.tinycanvas').tinyscrollbar({ axis: 'x'}); } if(!o.desktopData[o.currentface]){ $(o.contentHolder).empty().load("/desktop/"+target,function(){ @@ -265,7 +265,7 @@ var orbitDesktop = function(dom){ $(this).find('span.tile').addClass('op06'); } }); - $('#holder').tinyscrollbar({ axis: 'x'}); + $('.tinycanvas').tinyscrollbar({ axis: 'x'}); var $sdm = $('.sdm'); if( !$sdm.children('.sdm_o') ){ @@ -295,7 +295,41 @@ var orbitDesktop = function(dom){ $("select#change_theme").change(function(){ o.changeTheme($(this).val()); }); - $('#panel_r').tinyscrollbar({ axis: 'y'}); + + $('.tinycanvas').each(function(){ + var h = $(this).parent().height(), + sh = $(this).siblings('.s_tab').height(); + $(this).css({'height': h-sh-24}).tinyscrollbar({ axis: 'y'}); + + }); + + // simple tab navgation + var $anchor = $('.s_tab a[href*=#]'), + $tabcontent = $('.st_c'); + + $anchor.each(function(){ + $(this).click(function(){ + var target = $(this).attr('href'); + + $anchor + .removeClass('thmc2 thmtxt admtxt') + .addClass('admtxt'); + $(this).toggleClass('thmc2 thmtxt admtxt'); + $tabcontent.hide(); + $(target).show(); + $('.tinycanvas').tinyscrollbar_update(); + + return false; + }); + }); + + // simple menu + + // miniColors + $('.color-picker').miniColors({ + + }); + } if(!o.desktopData[o.currentface]){ $(o.contentHolder).empty().load("/desktop/"+target,function(){ diff --git a/app/assets/stylesheets/desktop.css b/app/assets/stylesheets/desktop.css index 1864ab8e..70a9b4b0 100644 --- a/app/assets/stylesheets/desktop.css +++ b/app/assets/stylesheets/desktop.css @@ -5,5 +5,7 @@ *= require style *= require bootstrap *= require bootstrap-orbit + *= require jquery.miniColors *= require desktopmain + *= require desktopmedia */ \ No newline at end of file diff --git a/app/assets/stylesheets/desktopmain.css b/app/assets/stylesheets/desktopmain.css index 09a1061d..545d69cc 100644 --- a/app/assets/stylesheets/desktopmain.css +++ b/app/assets/stylesheets/desktopmain.css @@ -60,6 +60,7 @@ body { background-color: #000; } a, a:hover { text-decoration: none; } +a:focus { outline: none; } /* desktop layout */ #container { margin: 48px 0 0 156px; @@ -160,7 +161,7 @@ a, a:hover { text-decoration: none; } line-height: 30px; overflow: hidden; cursor: default; - z-index: 2; + z-index: 3; } .w1.h1 .appname { text-align: center; } .w2.h2 .appname { font-size: 21px; } @@ -243,11 +244,27 @@ a, a:hover { text-decoration: none; } .s_tab { font-size: 15px; line-height: 36px; } .stb_h {} .stb_v {} -.s_tab li { display: inline-block; } +.s_tab ul { overflow: hidden; } +.s_tab li { float: left; } .s_tab a { display: block; } .st_c { display: none; } .st_c:first-child { display: block; } +/* Setting Page */ +.theme_preview { width: 528px; height: 150px; line-height: 36px; font-size: 15px; } +.theme_plate { overflow: hidden; } +.theme_plate > div { float: left; margin-right: 12px; } +.theme_plate > div:first-child { margin-right: 48px;} +.s_title { font-size: 15px; line-height: 60px; text-align: left; } +.s_action { padding: 24px 0; overflow: hidden; } +#theme_submit { + display: block; + float: right; + font-size: 15px; + line-height: 36px; + text-align: center; +} + /* theme color opacity */ .op10 { opacity: 1; } .op09 { opacity: 0.9; } @@ -269,7 +286,7 @@ a, a:hover { text-decoration: none; } .wh2 { width: 36px; } .wh3 { width: 60px; } .w100 { width: 100%; } -.pw { width: 572px; } +.pw { width: 540px; } .h1 { height: 96px; } .h2 { height: 228px; } @@ -309,15 +326,16 @@ a, a:hover { text-decoration: none; } .clear { clear: both; } /* tiny scrollbar */ -#holder .viewport { width: auto; height: 516px; overflow: hidden; position: relative; } -#holder .overview { position: absolute; left: 0; top: 0; } -#holder .scrollbar { position: absolute; } -#holder .scrollbar.sb_h { left: 0; bottom: 0; height: 12px; } -#holder .scrollbar.sb_v { right: 0; top: 0; width: 12px; } -#holder .track { height: 100%; width: 12px; position: relative; } -#holder .thumb { height: 12px; width: 12px; cursor: pointer; overflow: hidden; position: absolute; top: 0; } -#holder .thumb .end { overflow: hidden; height: 12px; width: 12px; } -#holder .disable{ display: none; } +.tinycanvas { overflow: hidden; position: relative; height: 100%; } +.tinycanvas .viewport { width: auto; height: 100%; overflow: hidden; position: relative; } +.tinycanvas .overview { position: absolute; left: 0; top: 0; } +.tinycanvas .scrollbar { position: absolute; z-index: 9; } +.tinycanvas .scrollbar.sb_h { left: 0; bottom: 0; height: 12px; } +.tinycanvas .scrollbar.sb_v { right: 0; top: 0; width: 12px; } +.tinycanvas .track { height: 100%; width: 12px; position: relative; } +.tinycanvas .thumb { height: 12px; width: 12px; cursor: pointer; overflow: hidden; position: absolute; top: 0; } +.tinycanvas .thumb .end { overflow: hidden; height: 12px; width: 12px; } +.tinycanvas .disable{ display: none; } /* Orbit Notification */ #orbitnote { diff --git a/app/assets/stylesheets/desktopmedia.css b/app/assets/stylesheets/desktopmedia.css new file mode 100644 index 00000000..3102590b --- /dev/null +++ b/app/assets/stylesheets/desktopmedia.css @@ -0,0 +1,10 @@ +@media only screen and (min-width: 1200px){ + + #panel_r.pw { width: 800px; } + +} +@media only screen and (min-width: 1900px){ + + #panel_r.pw { width: 1560px; } + +} \ No newline at end of file diff --git a/app/assets/stylesheets/jquery.miniColors.css b/app/assets/stylesheets/jquery.miniColors.css new file mode 100755 index 00000000..bfc06d39 --- /dev/null +++ b/app/assets/stylesheets/jquery.miniColors.css @@ -0,0 +1,59 @@ +.miniColors-trigger { + height: 36px; + width: 36px; + border: solid 3px #e8e8e8; + vertical-align: middle; + margin: 0 6px 0 0; + display: inline-block; + outline: none; +} + +.miniColors-selector { + position: absolute; + width: 175px; + height: 150px; + background: #FFF; + border: solid 1px #BBB; + padding: 5px; + z-index: 999999; +} + +.miniColors-selector.black { + background: #000; + border-color: #000; +} + +.miniColors-colors { + position: absolute; + top: 5px; + left: 5px; + width: 150px; + height: 150px; + background: url(miniColors/gradient.png) center no-repeat; + cursor: crosshair; +} + +.miniColors-hues { + position: absolute; + top: 5px; + left: 160px; + width: 20px; + height: 150px; + background: url(miniColors/rainbow.png) center no-repeat; + cursor: crosshair; +} + +.miniColors-colorPicker { + position: absolute; + width: 11px; + height: 11px; + background: url(miniColors/circle.gif) center no-repeat; +} + +.miniColors-huePicker { + position: absolute; + left: -3px; + width: 26px; + height: 3px; + background: url(miniColors/line.gif) center no-repeat; +} \ No newline at end of file diff --git a/app/views/desktop/app_manager.html.erb b/app/views/desktop/app_manager.html.erb index 030b072f..fdbe9236 100755 --- a/app/views/desktop/app_manager.html.erb +++ b/app/views/desktop/app_manager.html.erb @@ -13,170 +13,172 @@
-
-
-
- - -
-
- - -

社團記事

-
-
- - -

每日英文

-
-
- - -

名人名言

-
-
- - -

Homework

-
-
- - -

School Events

-
-
- - -

MyCoursesTimeTable

-
-
- - -

Clock

-
-
- - -

Weather

-
-
- - -

myRefer

-
-
- - -

O-Journals

-
-
- - -

O-Doc

-
-
- - -

ToDos

-
-
- - -

Project Progress

-
-
- - -

Paper Progress

-
-
- - -

Team Stream

-
-
- - -

TED

-
-
- - -

Twitter

-
-
- - -

Facebook

-
-
- - -

News Feed

-
-
- - -

iClock

-
-
- - -

Research Networks

-
-
- - -

Gmail

-
-
- - -

Youtube

-
-
- - -

Calendar

-
-
- - -

Talk

-
-
- - -

Diary

-
-
- - -

Bookeeper

-
-
- - -

Movies

-
-
- - -

Girls Wall

-
-
- - -

Album

-
-
- - -

O-Music

-
-
-
-
-
+
+
+
+
+ + +
+
+ + +

社團記事

+
+
+ + +

每日英文

+
+
+ + +

名人名言

+
+
+ + +

Homework

+
+
+ + +

School Events

+
+
+ + +

MyCoursesTimeTable

+
+
+ + +

Clock

+
+
+ + +

Weather

+
+
+ + +

myRefer

+
+
+ + +

O-Journals

+
+
+ + +

O-Doc

+
+
+ + +

ToDos

+
+
+ + +

Project Progress

+
+
+ + +

Paper Progress

+
+
+ + +

Team Stream

+
+
+ + +

TED

+
+
+ + +

Twitter

+
+
+ + +

Facebook

+
+
+ + +

News Feed

+
+
+ + +

iClock

+
+
+ + +

Research Networks

+
+
+ + +

Gmail

+
+
+ + +

Youtube

+
+
+ + +

Calendar

+
+
+ + +

Talk

+
+
+ + +

Diary

+
+
+ + +

Bookeeper

+
+
+ + +

Movies

+
+
+ + +

Girls Wall

+
+
+ + +

Album

+
+
+ + +

O-Music

+
+
+
+
+
+
diff --git a/app/views/desktop/desktop.html.erb b/app/views/desktop/desktop.html.erb index 691425c5..53d3db45 100755 --- a/app/views/desktop/desktop.html.erb +++ b/app/views/desktop/desktop.html.erb @@ -13,87 +13,89 @@
-
-
-
-
-
    -
  • - -

    MyCourseTimeTable

    -
    test content
    -
    • -
  • - - -

    名人名言

    -
    • -
  • - -

    Weather

    -
    -
    -
    • -
  • - -

    Clock

    -
    test content
    -
    • -
  • - -

    School Events

    -
    test content
    -
    • -
  • - - -

    每日英文

    -
    • -
-
-
-
    -
  • -

    Garage Band

    -
  • -

    Aperture

    -
    • -
  • -

    Aperture

    -
    • -
  • -

    Aperture

    -
  • -

    Aperture

    -
  • -

    Aperture

    -
  • -

    Garage Band

    -
  • -

    Aperture

    -
  • -

    Aperture

    -
  • -

    Aperture

    -
  • -

    Aperture

    -
  • -

    Aperture

    -
  • -

    Garage Band

    -
  • -

    Aperture

    -
  • -

    Aperture

    -
  • -

    Aperture

    -
    • -
-
-
+
+
+
+
+
+
    +
  • + +

    MyCourseTimeTable

    +
    test content
    +
    • +
  • + + +

    名人名言

    +
    • +
  • + +

    Weather

    +
    +
    +
    • +
  • + +

    Clock

    +
    test content
    +
    • +
  • + +

    School Events

    +
    test content
    +
    • +
  • + + +

    每日英文

    +
    • +
+
+
+
    +
  • +

    Garage Band

    +
  • +

    Aperture

    +
    • +
  • +

    Aperture

    +
    • +
  • +

    Aperture

    +
  • +

    Aperture

    +
  • +

    Aperture

    +
  • +

    Garage Band

    +
  • +

    Aperture

    +
  • +

    Aperture

    +
  • +

    Aperture

    +
  • +

    Aperture

    +
  • +

    Aperture

    +
  • +

    Garage Band

    +
  • +

    Aperture

    +
  • +

    Aperture

    +
  • +

    Aperture

    +
    • +
+
+
-
+
+
diff --git a/app/views/desktop/sections.html.erb b/app/views/desktop/sections.html.erb index 9762c8fa..bcb7b3c7 100644 --- a/app/views/desktop/sections.html.erb +++ b/app/views/desktop/sections.html.erb @@ -5,169 +5,171 @@
-
-
-
-
-
-
    -
  • section 1
    • - - - +
    +
    +
    +
    +
    +
    +
      +
    • section 1
      • + + + +
    +
    +
      +
    • +

      Garage Band

      +
      • +
    • +

      Garage Band

      +
      • +
    • +

      Garage Band

      +
      • +
    • +

      Garage Band

      +
      • +
    • +

      Garage Band

      +
      • +
    • +

      Garage Band

      +
      • +
    • +

      Garage Band

      +
      • +
    • +

      Garage Band

      +
      • +
    • +

      Garage Band

      +
      • +
    • +

      Garage Band

      +
      • +
    • +

      Garage Band

      +
      • +
    • +

      Garage Band

      +
      • +
    • +

      Garage Band

      +
      • +
    • +

      Garage Band

      +
      • +
    • +

      Garage Band

      +
      • +
    • +

      Garage Band

      +
      • +
    • +

      Garage Band

      +
      • +
    • +

      Garage Band

      +
      • +
    • +

      Garage Band

      +
      • +
    • +

      Garage Band

      +
      • +
    • +

      Garage Band

      +
      • +
    • +

      Garage Band

      +
      • + +
    -
      -
    • -

      Garage Band

      -
      • -
    • -

      Garage Band

      -
      • -
    • -

      Garage Band

      -
      • -
    • -

      Garage Band

      -
      • -
    • -

      Garage Band

      -
      • -
    • -

      Garage Band

      -
      • -
    • -

      Garage Band

      -
      • -
    • -

      Garage Band

      -
      • -
    • -

      Garage Band

      -
      • -
    • -

      Garage Band

      -
      • -
    • -

      Garage Band

      -
      • -
    • -

      Garage Band

      -
      • -
    • -

      Garage Band

      -
      • -
    • -

      Garage Band

      -
      • -
    • -

      Garage Band

      -
      • -
    • -

      Garage Band

      -
      • -
    • -

      Garage Band

      -
      • -
    • -

      Garage Band

      -
      • -
    • -

      Garage Band

      -
      • -
    • -

      Garage Band

      -
      • -
    • -

      Garage Band

      -
      • -
    • -

      Garage Band

      -
      • - - -
    -
    -
    -
    -
      -
    • section 2
      • - - - +
      +
      +
        +
      • section 2
        • + + + +
      +
      +
        +
      • +

        Garage Band

        +
        • +
      • +

        Garage Band

        +
        • +
      • +

        Garage Band

        +
        • +
      • +

        Garage Band

        +
        • +
      • +

        Garage Band

        +
        • +
      • +

        Garage Band

        +
        • +
      • +

        Garage Band

        +
        • +
      • +

        Garage Band

        +
        • +
      • +

        Garage Band

        +
        • +
      • +

        Garage Band

        +
        • +
      • +

        Garage Band

        +
        • +
      • +

        Garage Band

        +
        • +
      • +

        Garage Band

        +
        • +
      • +

        Garage Band

        +
        • +
      • +

        Garage Band

        +
        • +
      • +

        Garage Band

        +
        • +
      • +

        Garage Band

        +
        • +
      • +

        Garage Band

        +
        • +
      • +

        Garage Band

        +
        • +
      • +

        Garage Band

        +
        • +
      • +

        Garage Band

        +
        • +
      • +

        Garage Band

        +
        • +
      -
        -
      • -

        Garage Band

        -
        • -
      • -

        Garage Band

        -
        • -
      • -

        Garage Band

        -
        • -
      • -

        Garage Band

        -
        • -
      • -

        Garage Band

        -
        • -
      • -

        Garage Band

        -
        • -
      • -

        Garage Band

        -
        • -
      • -

        Garage Band

        -
        • -
      • -

        Garage Band

        -
        • -
      • -

        Garage Band

        -
        • -
      • -

        Garage Band

        -
        • -
      • -

        Garage Band

        -
        • -
      • -

        Garage Band

        -
        • -
      • -

        Garage Band

        -
        • -
      • -

        Garage Band

        -
        • -
      • -

        Garage Band

        -
        • -
      • -

        Garage Band

        -
        • -
      • -

        Garage Band

        -
        • -
      • -

        Garage Band

        -
        • -
      • -

        Garage Band

        -
        • -
      • -

        Garage Band

        -
        • -
      • -

        Garage Band

        -
        • - -
      +
    -
    diff --git a/app/views/desktop/settings.html.erb b/app/views/desktop/settings.html.erb index ce88b2b3..3396d27d 100644 --- a/app/views/desktop/settings.html.erb +++ b/app/views/desktop/settings.html.erb @@ -12,23 +12,67 @@
  • Overview
  • Account
  • Sections
    • -
  • Theme
    • +
  • Theme
  • Connection
-
+
-
-
-
-
try
-
test
+
+
+
+
+
try
+
+
Preview
+
+
Theme Text1
+
+
+
Theme Text2
+
+
Theme Text
+
+
+
+ + + + + + + + + + + + + +
Theme ColorLine ColorText ColorBackground Color
+ + + + + + + + + + +
+
+ Confirm +
+
+
+
+
diff --git a/public/desktop_themes/default/css/default.css b/public/desktop_themes/default/css/default.css index b7859795..cfbd430d 100755 --- a/public/desktop_themes/default/css/default.css +++ b/public/desktop_themes/default/css/default.css @@ -30,7 +30,7 @@ apply to: /* Theme Text Color */ -.thmtxt { color: #fff; } +.thmtxt, .thmtxt:hover { color: #fff; } .thmtxth { color: #fff; } /* Group Seprate Color */ From ee85380ab26da97a100503dc8e0ef173e8353ea4 Mon Sep 17 00:00:00 2001 From: devin Date: Tue, 10 Apr 2012 18:09:29 +0800 Subject: [PATCH 3/6] little update --- app/assets/javascripts/orbitdesktop.js | 10 +++++----- app/views/desktop/settings.html.erb | 20 +++++++++---------- public/desktop_widgets/weather/index.html.erb | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index e68a448c..2c79bb90 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -331,14 +331,14 @@ var orbitDesktop = function(dom){ }); } - if(!o.desktopData[o.currentface]){ + // if(!o.desktopData[o.currentface]){ $(o.contentHolder).empty().load("/desktop/"+target,function(){ bindHandlers(); }); - }else{ - $(o.contentHolder).html(o.desktopData[o.currentface]); - bindHandlers(); - } + // }else{ + // $(o.contentHolder).html(o.desktopData[o.currentface]); + // bindHandlers(); + // } }; this.loadWallpaper = function(wallpaper){ if(!wallpaper)wallpaper = o.themesettings.background; diff --git a/app/views/desktop/settings.html.erb b/app/views/desktop/settings.html.erb index 3396d27d..293c80af 100644 --- a/app/views/desktop/settings.html.erb +++ b/app/views/desktop/settings.html.erb @@ -43,26 +43,26 @@
- + - - + +
Theme ColorTheme Color Line ColorText ColorBackground ColorText ColorBackground Color
- - - + + + - + - - + + - +
diff --git a/public/desktop_widgets/weather/index.html.erb b/public/desktop_widgets/weather/index.html.erb index 1dfa1849..58902d21 100644 --- a/public/desktop_widgets/weather/index.html.erb +++ b/public/desktop_widgets/weather/index.html.erb @@ -1,6 +1,6 @@ -
background-repeat: no-repeat; background-color: #;' >
\ No newline at end of file From 42f45aa1378e3529ff9d770b2fa4e7848e343f95 Mon Sep 17 00:00:00 2001 From: devin Date: Wed, 11 Apr 2012 13:46:32 +0800 Subject: [PATCH 4/6] theme setting update --- app/assets/images/sample_theme.jpg | Bin 0 -> 3744 bytes app/assets/javascripts/orbitdesktop.js | 29 +++++++++++++++---- app/assets/stylesheets/desktopmain.css | 15 +++++++++- app/assets/stylesheets/jquery.miniColors.css | 4 +-- app/assets/stylesheets/style.css.erb | 1 + app/views/desktop/settings.html.erb | 28 ++++++++++++++---- 6 files changed, 64 insertions(+), 13 deletions(-) create mode 100755 app/assets/images/sample_theme.jpg diff --git a/app/assets/images/sample_theme.jpg b/app/assets/images/sample_theme.jpg new file mode 100755 index 0000000000000000000000000000000000000000..03945979e18ac3ddfa3ff38c65443aeebc8ed5cc GIT binary patch literal 3744 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 Gv3~)8I*v#H literal 0 HcmV?d00001 diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index 2c79bb90..eb2ed07c 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -292,8 +292,10 @@ var orbitDesktop = function(dom){ o.currenthtml = target; o.currentface = "settings"; var bindHandlers = function(){ - $("select#change_theme").change(function(){ - o.changeTheme($(this).val()); + $(".theme_list > li").click(function(){ + o.changeTheme($(this).find('.theme_name').text()); + $(".theme_list > li").removeClass('thmc1').data('clicked',null); + $(this).addClass('thmc1').data('clicked',true); }); $('.tinycanvas').each(function(){ @@ -312,9 +314,9 @@ var orbitDesktop = function(dom){ var target = $(this).attr('href'); $anchor - .removeClass('thmc2 thmtxt admtxt') - .addClass('admtxt'); - $(this).toggleClass('thmc2 thmtxt admtxt'); + .removeClass('thmc2 thmtxt admtxt admbg') + .addClass('admtxt admbg'); + $(this).toggleClass('thmc2 thmtxt admtxt admbg'); $tabcontent.hide(); $(target).show(); $('.tinycanvas').tinyscrollbar_update(); @@ -330,6 +332,23 @@ var orbitDesktop = function(dom){ }); + $('.theme_list li').hover(function(){ + $(this) + .addClass('thmc1') + .find('.theme_name') + .addClass('thmtxt'); + }, function(){ + var c = 'thmc1', + t = 'thmtxt'; + if( $(this).data('clicked') ){ + t = '', c = ''; + } + $(this) + .removeClass(c) + .find('.theme_name') + .removeClass(t); + }); + } // if(!o.desktopData[o.currentface]){ $(o.contentHolder).empty().load("/desktop/"+target,function(){ diff --git a/app/assets/stylesheets/desktopmain.css b/app/assets/stylesheets/desktopmain.css index 545d69cc..63fb12d1 100644 --- a/app/assets/stylesheets/desktopmain.css +++ b/app/assets/stylesheets/desktopmain.css @@ -1,4 +1,3 @@ -@import url(http://fonts.googleapis.com/css?family=Cuprum); /* http://meyerweb.com/eric/tools/css/reset/ v2.0 | 20110126 License: none (public domain) @@ -247,10 +246,24 @@ a:focus { outline: none; } .s_tab ul { overflow: hidden; } .s_tab li { float: left; } .s_tab a { display: block; } +.s_tab .admbg { background-color: #f0f0f0; } .st_c { display: none; } .st_c:first-child { display: block; } /* Setting Page */ +.theme_list {} +.theme_list li { + display: inline-block; + vertical-align: top; + margin: 0 0 24px 0; + padding: 6px 0px; + width: 132px; + text-align: center; + cursor: pointer + } +.theme_thumb { border: solid 1px #fff; width: 120px; margin: 0 auto; } +.theme_thumb img { display: block; } +.theme_name { font-size: 15px; padding: 8px 6px; display: block; } .theme_preview { width: 528px; height: 150px; line-height: 36px; font-size: 15px; } .theme_plate { overflow: hidden; } .theme_plate > div { float: left; margin-right: 12px; } diff --git a/app/assets/stylesheets/jquery.miniColors.css b/app/assets/stylesheets/jquery.miniColors.css index bfc06d39..831da6f8 100755 --- a/app/assets/stylesheets/jquery.miniColors.css +++ b/app/assets/stylesheets/jquery.miniColors.css @@ -19,8 +19,8 @@ } .miniColors-selector.black { - background: #000; - border-color: #000; + background: #222; + border-color: #222; } .miniColors-colors { diff --git a/app/assets/stylesheets/style.css.erb b/app/assets/stylesheets/style.css.erb index d2e33b04..0440dcde 100644 --- a/app/assets/stylesheets/style.css.erb +++ b/app/assets/stylesheets/style.css.erb @@ -1,3 +1,4 @@ +@import url(http://fonts.googleapis.com/css?family=Cuprum); @font-face{ font-family: 'WebSymbolsRegular'; src: url(<%= asset_path 'websymbols-regular-webfont.eot' %>); diff --git a/app/views/desktop/settings.html.erb b/app/views/desktop/settings.html.erb index 293c80af..8f0fda2e 100644 --- a/app/views/desktop/settings.html.erb +++ b/app/views/desktop/settings.html.erb @@ -21,14 +21,32 @@
-
-
try
+
+
+
    +
  • default
    • +
  • snake
    • +
  • sexy
    • +
  • vintage
    • +
  • Woodstock westwood allenwood
    • +
  • chris
    • +
  • Wood
    • +
  • Wood
    • +
  • Wood
    • +
  • Wood
    • +
  • Wood
    • +
  • Wood
    • +
  • Wood
    • +
  • Wood
    • +
  • Wood
    • +
+
Preview
@@ -77,7 +95,7 @@
-