diff --git a/app/assets/images/miniColors/circle.gif b/app/assets/images/miniColors/circle.gif
new file mode 100755
index 00000000..599f7f13
Binary files /dev/null and b/app/assets/images/miniColors/circle.gif differ
diff --git a/app/assets/images/miniColors/gradient.png b/app/assets/images/miniColors/gradient.png
new file mode 100755
index 00000000..561cdd9c
Binary files /dev/null and b/app/assets/images/miniColors/gradient.png differ
diff --git a/app/assets/images/miniColors/line.gif b/app/assets/images/miniColors/line.gif
new file mode 100755
index 00000000..9eb19837
Binary files /dev/null and b/app/assets/images/miniColors/line.gif differ
diff --git a/app/assets/images/miniColors/rainbow.png b/app/assets/images/miniColors/rainbow.png
new file mode 100755
index 00000000..8d6c71bf
Binary files /dev/null and b/app/assets/images/miniColors/rainbow.png differ
diff --git a/app/assets/images/miniColors/trigger.png b/app/assets/images/miniColors/trigger.png
new file mode 100755
index 00000000..8c169fd6
Binary files /dev/null and b/app/assets/images/miniColors/trigger.png differ
diff --git a/app/assets/javascripts/desktop.js b/app/assets/javascripts/desktop.js
index c1abfc29..8e048175 100644
--- a/app/assets/javascripts/desktop.js
+++ b/app/assets/javascripts/desktop.js
@@ -8,6 +8,7 @@
//= require jquery_ujs
//= require jquery-ui
//= require jquery.tinyscrollbar.min
+//= require jquery.miniColors.min
//= require bootstrap
//= require orbitdesktopAPI
//= require orbitdesktop
\ No newline at end of file
diff --git a/app/assets/javascripts/jquery.miniColors.min.js b/app/assets/javascripts/jquery.miniColors.min.js
new file mode 100755
index 00000000..25dcfa0e
--- /dev/null
+++ b/app/assets/javascripts/jquery.miniColors.min.js
@@ -0,0 +1,9 @@
+/*
+ * jQuery miniColors: A small color selector
+ *
+ * Copyright 2011 Cory LaViska for A Beautiful Site, LLC. (http://abeautifulsite.net/)
+ *
+ * Dual licensed under the MIT or GPL Version 2 licenses
+ *
+*/
+if(jQuery)(function($){$.extend($.fn,{miniColors:function(o,data){var create=function(input,o,data){var color=expandHex(input.val());if(!color)color='ffffff';var hsb=hex2hsb(color);var trigger=$('');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 2
- - section 3
- - section 4
+
+
+
+
+
+
+
+ - section 1
+ - section 2
+ - section 3
+ - section 4
+
+
+
+ -
+
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 1
- - section 3
- - section 4
+
+
+
+ - section 2
+ - section 1
+ - section 3
+ - section 4
+
+
+
+ -
+
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 Color |
+ Line Color |
+ Text Color |
+ Background Color |
+
+
+
+
+
+
+ |
+
+
+ |
+
+
+
+ |
+
+
+ |
+
+
+
+
+
+
+
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 */