diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index fa032ffd..d373f0f8 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -174,7 +174,7 @@ var orbitDesktop = function(dom){ if(tile.data_category == "app") $li = $('

  • '+tile.title+'

    • '); else - $li = $('

  • '+tile.title+'

    test content
    • '); + $li = $('

  • '+tile.title+'

    Loading...
    • '); $group.find("ul").append($li); }) $("div#group_wrapper").append($group); @@ -345,11 +345,23 @@ var orbitDesktop = function(dom){ sections(); break; } - }) + $("ul#setting_left_nav li a").removeClass('thmc1 thmtxt').data('clicked',null); + $(this).addClass('thmc1 thmtxt').data('clicked',true); + }); + $("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'}); + }); } $("div#panel_r").load("/desktop/settingsections",function(){ bindHandlers(); @@ -389,11 +401,8 @@ 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 = ''; - } + var c = $(this).data('clicked') ? '' : 'thmc1', + t = $(this).data('clicked') ? '' : 'thmtxt'; $(this).removeClass(c).find('.theme_name').removeClass(t); }); diff --git a/app/assets/stylesheets/desktopmedia.css b/app/assets/stylesheets/desktopmedia.css index 3102590b..2e5d6275 100644 --- a/app/assets/stylesheets/desktopmedia.css +++ b/app/assets/stylesheets/desktopmedia.css @@ -1,10 +1,10 @@ -@media only screen and (min-width: 1200px){ +@media only screen and (min-width: 1300px){ #panel_r.pw { width: 800px; } } @media only screen and (min-width: 1900px){ - #panel_r.pw { width: 1560px; } + #panel_r.pw { width: 1400px; } } \ No newline at end of file diff --git a/app/views/desktop/settings.html.erb b/app/views/desktop/settings.html.erb index 4ffe2f02..7ffc769b 100644 --- a/app/views/desktop/settings.html.erb +++ b/app/views/desktop/settings.html.erb @@ -12,7 +12,7 @@
  • Overview
  • Account
  • Sections
    • -
  • Theme
    • +
  • Theme
  • Connection
    • diff --git a/app/views/desktop/settings/sections.html.erb b/app/views/desktop/settings/sections.html.erb index 15195748..37f3cf32 100644 --- a/app/views/desktop/settings/sections.html.erb +++ b/app/views/desktop/settings/sections.html.erb @@ -1 +1,17 @@ -Fucking section setting page... \ No newline at end of file +
    +
    +
    +
    +
    Sections Name
    +
      +
      • +
      • +
      • +
      • +
    +
    + Confirm +
    +
    +
    +
    \ No newline at end of file diff --git a/public/desktop_widgets/clock/index.html.erb b/public/desktop_widgets/clock/index.html.erb index c9ce7b3c..bdf81c65 100755 --- a/public/desktop_widgets/clock/index.html.erb +++ b/public/desktop_widgets/clock/index.html.erb @@ -2,7 +2,7 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    09:00
    		Computer Science
    10:00
    		Computer Science
    11:00
    12:00
    		Lunch Time
    13:00
    		Art History
    14:00
    		Art History
    15:00
    16:00
    		Sport ( Basketball )
    17:00
    + \ No newline at end of file diff --git a/public/desktop_widgets/timetable/timetable.js b/public/desktop_widgets/timetable/timetable.js new file mode 100644 index 00000000..340275c3 --- /dev/null +++ b/public/desktop_widgets/timetable/timetable.js @@ -0,0 +1,11 @@ +function timetable(){ + var d = new Date(); + var n = d.getHours(); + + + $('#tt_timetable .tt_time div').each(function(){ + if($(this).data('tthour') == n ){ + $(this).parents('tr').addClass('timenow'); + } + }); +} \ No newline at end of file diff --git a/public/desktop_widgets/weather/img/clouds_180x150_bg.jpg b/public/desktop_widgets/weather/img/clouds_180x150_bg.jpg deleted file mode 100644 index 744cdaec..00000000 Binary files a/public/desktop_widgets/weather/img/clouds_180x150_bg.jpg and /dev/null differ diff --git a/public/desktop_widgets/weather/img/sunny.png b/public/desktop_widgets/weather/img/sunny.png new file mode 100755 index 00000000..a12bb8a6 Binary files /dev/null and b/public/desktop_widgets/weather/img/sunny.png differ diff --git a/public/desktop_widgets/weather/index.html.erb b/public/desktop_widgets/weather/index.html.erb index 58902d21..f4bec8ba 100644 --- a/public/desktop_widgets/weather/index.html.erb +++ b/public/desktop_widgets/weather/index.html.erb @@ -1,6 +1,45 @@ -
    \ No newline at end of file + +
    +
    + sunny +
    + 29°C +
    +
    Sunny
    +
    +
    + weekly report +
    +
    Hsin-Chu
    + > Weekly Report +
    + \ No newline at end of file diff --git a/public/desktop_widgets/weather/weather.js b/public/desktop_widgets/weather/weather.js index e69de29b..42419bf5 100644 --- a/public/desktop_widgets/weather/weather.js +++ b/public/desktop_widgets/weather/weather.js @@ -0,0 +1,7 @@ +function g_weather(){ + $('.gw_forecast').click(function(){ + $('.gw_recent').toggle(); + $('.gw_weekly').toggle(); + return false; + }); +} diff --git a/public/desktop_widgets/weather1/img/clouds_180x150_bg.jpg b/public/desktop_widgets/weather1/img/clouds_180x150_bg.jpg deleted file mode 100644 index 744cdaec..00000000 Binary files a/public/desktop_widgets/weather1/img/clouds_180x150_bg.jpg and /dev/null differ diff --git a/public/desktop_widgets/weather1/index.html.erb b/public/desktop_widgets/weather1/index.html.erb index 1dfa1849..168c05c9 100644 --- a/public/desktop_widgets/weather1/index.html.erb +++ b/public/desktop_widgets/weather1/index.html.erb @@ -1,5 +1,4 @@ -