From 0219c3df289bff1e7582227d7435051240db0774 Mon Sep 17 00:00:00 2001 From: devin Date: Wed, 11 Apr 2012 15:04:00 +0800 Subject: [PATCH] various update --- app/assets/javascripts/orbitdesktop.js | 16 +++++-- app/assets/stylesheets/desktopmain.css | 7 +-- app/views/desktop/desktop.html.erb | 6 +-- app/views/desktop/settings.html.erb | 4 +- public/desktop_themes/natural/css/natural.css | 45 ++++++++++++++++++ .../natural/images/background.jpg | Bin 0 -> 263847 bytes .../natural/images/d_activities.png | Bin 0 -> 535 bytes .../desktop_themes/natural/images/d_album.png | Bin 0 -> 720 bytes .../natural/images/d_app_manager.png | Bin 0 -> 415 bytes .../natural/images/d_appstore.png | Bin 0 -> 553 bytes .../desktop_themes/natural/images/d_blog.png | Bin 0 -> 436 bytes .../desktop_themes/natural/images/d_books.png | Bin 0 -> 589 bytes .../natural/images/d_calendar.png | Bin 0 -> 598 bytes .../natural/images/d_certification.png | Bin 0 -> 714 bytes .../desktop_themes/natural/images/d_clubs.png | Bin 0 -> 524 bytes .../natural/images/d_connection.png | Bin 0 -> 454 bytes .../natural/images/d_courses.png | Bin 0 -> 500 bytes .../natural/images/d_education.png | Bin 0 -> 513 bytes .../natural/images/d_experience.png | Bin 0 -> 533 bytes .../desktop_themes/natural/images/d_files.png | Bin 0 -> 379 bytes .../desktop_themes/natural/images/d_home.png | Bin 0 -> 488 bytes .../natural/images/d_homework.png | Bin 0 -> 506 bytes .../natural/images/d_honors.png | Bin 0 -> 670 bytes .../natural/images/d_journal_p.png | Bin 0 -> 517 bytes .../desktop_themes/natural/images/d_labs.png | Bin 0 -> 805 bytes .../desktop_themes/natural/images/d_landt.png | Bin 0 -> 481 bytes .../natural/images/d_mypage.png | Bin 0 -> 464 bytes .../desktop_themes/natural/images/d_orbit.png | Bin 0 -> 628 bytes .../natural/images/d_patents.png | Bin 0 -> 495 bytes .../natural/images/d_personal.png | Bin 0 -> 589 bytes .../natural/images/d_publication.png | Bin 0 -> 524 bytes .../natural/images/d_research.png | Bin 0 -> 575 bytes .../natural/images/d_research_d.png | Bin 0 -> 533 bytes .../natural/images/d_research_p.png | Bin 0 -> 557 bytes .../natural/images/d_sections.png | Bin 0 -> 243 bytes .../natural/images/d_seminar_p.png | Bin 0 -> 532 bytes .../natural/images/d_settings.png | Bin 0 -> 573 bytes .../natural/images/d_working.png | Bin 0 -> 553 bytes .../natural/settings/natural.json | 39 +++++++++++++++ public/desktop_widgets/clock/clock.css | 4 +- public/desktop_widgets/clock/index.html.erb | 19 +++++--- 41 files changed, 120 insertions(+), 20 deletions(-) create mode 100755 public/desktop_themes/natural/css/natural.css create mode 100755 public/desktop_themes/natural/images/background.jpg create mode 100755 public/desktop_themes/natural/images/d_activities.png create mode 100755 public/desktop_themes/natural/images/d_album.png create mode 100755 public/desktop_themes/natural/images/d_app_manager.png create mode 100755 public/desktop_themes/natural/images/d_appstore.png create mode 100755 public/desktop_themes/natural/images/d_blog.png create mode 100755 public/desktop_themes/natural/images/d_books.png create mode 100755 public/desktop_themes/natural/images/d_calendar.png create mode 100755 public/desktop_themes/natural/images/d_certification.png create mode 100755 public/desktop_themes/natural/images/d_clubs.png create mode 100755 public/desktop_themes/natural/images/d_connection.png create mode 100755 public/desktop_themes/natural/images/d_courses.png create mode 100755 public/desktop_themes/natural/images/d_education.png create mode 100755 public/desktop_themes/natural/images/d_experience.png create mode 100755 public/desktop_themes/natural/images/d_files.png create mode 100755 public/desktop_themes/natural/images/d_home.png create mode 100755 public/desktop_themes/natural/images/d_homework.png create mode 100755 public/desktop_themes/natural/images/d_honors.png create mode 100755 public/desktop_themes/natural/images/d_journal_p.png create mode 100755 public/desktop_themes/natural/images/d_labs.png create mode 100755 public/desktop_themes/natural/images/d_landt.png create mode 100755 public/desktop_themes/natural/images/d_mypage.png create mode 100755 public/desktop_themes/natural/images/d_orbit.png create mode 100755 public/desktop_themes/natural/images/d_patents.png create mode 100755 public/desktop_themes/natural/images/d_personal.png create mode 100755 public/desktop_themes/natural/images/d_publication.png create mode 100755 public/desktop_themes/natural/images/d_research.png create mode 100755 public/desktop_themes/natural/images/d_research_d.png create mode 100755 public/desktop_themes/natural/images/d_research_p.png create mode 100755 public/desktop_themes/natural/images/d_sections.png create mode 100755 public/desktop_themes/natural/images/d_seminar_p.png create mode 100755 public/desktop_themes/natural/images/d_settings.png create mode 100755 public/desktop_themes/natural/images/d_working.png create mode 100755 public/desktop_themes/natural/settings/natural.json diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index eb2ed07c9..1744b080f 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -178,7 +178,7 @@ var orbitDesktop = function(dom){ }; this.tempFunc = function(){ //o.notify("This is test notification!!","alert",2) - $.post("/desktop/save_desktop_settings",{"id":o.desktopId,"theme":$("#change_theme").val()},function(){ + $.post("/desktop/save_desktop_settings",{"id":o.desktopId,"theme":$('.theme_name').text()},function(){ o.notify("Settings Saved!!","success"); }) } @@ -294,8 +294,17 @@ var orbitDesktop = function(dom){ var bindHandlers = function(){ $(".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); + $(".theme_list > li") + .removeClass('thmc1') + .data('clicked',null) + .find('.theme_name') + .removeClass('thmtxt'); + $(this) + .addClass('thmc1') + .data('clicked',true) + .find('.theme_name') + .addClass('thmtxt'); + od.tempFunc(); }); $('.tinycanvas').each(function(){ @@ -332,6 +341,7 @@ 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') diff --git a/app/assets/stylesheets/desktopmain.css b/app/assets/stylesheets/desktopmain.css index 63fb12d1f..f862c7bd5 100644 --- a/app/assets/stylesheets/desktopmain.css +++ b/app/assets/stylesheets/desktopmain.css @@ -70,7 +70,7 @@ a:focus { outline: none; } } #side { width: 156px; - height: 540px; + height: 516px; position: absolute; top: 120px; left: 0; @@ -79,7 +79,7 @@ a:focus { outline: none; } #holder { /*overflow: hidden; overflow-x: auto;*/ - height: 540px; + height: 516px; width: auto; position: relative; } @@ -176,7 +176,7 @@ a:focus { outline: none; } z-index: 2; padding-bottom: 12px; } -.holder_f { +.holder_f .appholder { position: absolute; width: 100%; height: 100%; @@ -184,6 +184,7 @@ a:focus { outline: none; } left: 0; top: 0; } +.holder_f .appname { display: none; } .dtitle { font-size: 30px; line-height: 60px; diff --git a/app/views/desktop/desktop.html.erb b/app/views/desktop/desktop.html.erb index 53d3db458..9b4fccd11 100755 --- a/app/views/desktop/desktop.html.erb +++ b/app/views/desktop/desktop.html.erb @@ -32,13 +32,13 @@
  • Weather

    -
    +
  • -
  • +
  • Clock

    -
    test content
    +
    test content
  • diff --git a/app/views/desktop/settings.html.erb b/app/views/desktop/settings.html.erb index 8f0fda2eb..a973ce421 100644 --- a/app/views/desktop/settings.html.erb +++ b/app/views/desktop/settings.html.erb @@ -30,11 +30,11 @@