From 20bfd0d984edf0be119f6aa859d9c3392fd8e4b3 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Thu, 5 Apr 2012 20:32:56 +0800 Subject: [PATCH] Dock change and getting values from db --- app/assets/images/note_success.png | Bin 0 -> 5116 bytes app/assets/javascripts/desktop.js | 3 +- app/assets/javascripts/desktopload.js.erb | 1 + app/assets/javascripts/orbitdesktop.js | 92 +++++------------- app/assets/javascripts/orbitdesktopAPI.js | 6 +- app/controllers/desktop_controller.rb | 15 ++- app/models/desktop.rb | 5 +- app/models/group.rb | 3 +- app/models/section.rb | 5 +- app/views/desktop/index.html.erb | 10 +- config/routes.rb | 2 + .../chris/images/d_activities.png | Bin 0 -> 535 bytes .../desktop_themes/chris/images/d_album.png | Bin 0 -> 720 bytes .../chris/images/d_app_manager.png | Bin 0 -> 415 bytes .../chris/images/d_appstore.png | Bin 0 -> 553 bytes public/desktop_themes/chris/images/d_blog.png | Bin 0 -> 436 bytes .../desktop_themes/chris/images/d_books.png | Bin 0 -> 589 bytes .../chris/images/d_calendar.png | Bin 0 -> 598 bytes .../chris/images/d_certification.png | Bin 0 -> 714 bytes .../desktop_themes/chris/images/d_clubs.png | Bin 0 -> 524 bytes .../chris/images/d_connection.png | Bin 0 -> 454 bytes .../desktop_themes/chris/images/d_courses.png | Bin 0 -> 500 bytes .../chris/images/d_education.png | Bin 0 -> 513 bytes .../chris/images/d_experience.png | Bin 0 -> 533 bytes .../desktop_themes/chris/images/d_files.png | Bin 0 -> 379 bytes public/desktop_themes/chris/images/d_home.png | Bin 0 -> 488 bytes .../chris/images/d_homework.png | Bin 0 -> 506 bytes .../desktop_themes/chris/images/d_honors.png | Bin 0 -> 670 bytes .../chris/images/d_journal_p.png | Bin 0 -> 517 bytes public/desktop_themes/chris/images/d_labs.png | Bin 0 -> 805 bytes .../desktop_themes/chris/images/d_landt.png | Bin 0 -> 481 bytes .../desktop_themes/chris/images/d_mypage.png | Bin 0 -> 464 bytes .../desktop_themes/chris/images/d_orbit.png | Bin 0 -> 628 bytes .../desktop_themes/chris/images/d_patents.png | Bin 0 -> 495 bytes .../chris/images/d_personal.png | Bin 0 -> 589 bytes .../chris/images/d_publication.png | Bin 0 -> 524 bytes .../chris/images/d_research.png | Bin 0 -> 575 bytes .../chris/images/d_research_d.png | Bin 0 -> 533 bytes .../chris/images/d_research_p.png | Bin 0 -> 557 bytes .../chris/images/d_sections.png | Bin 0 -> 243 bytes .../chris/images/d_seminar_p.png | Bin 0 -> 532 bytes .../chris/images/d_settings.png | Bin 0 -> 573 bytes .../desktop_themes/chris/images/d_working.png | Bin 0 -> 553 bytes .../desktop_themes/chris/settings/chris.json | 40 +++++++- .../sexy/css/{sexy.css => default.css} | 0 .../sexy/images/d_activities.png | Bin 0 -> 535 bytes public/desktop_themes/sexy/images/d_album.png | Bin 0 -> 720 bytes .../sexy/images/d_app_manager.png | Bin 0 -> 415 bytes .../desktop_themes/sexy/images/d_appstore.png | Bin 0 -> 553 bytes public/desktop_themes/sexy/images/d_blog.png | Bin 0 -> 436 bytes public/desktop_themes/sexy/images/d_books.png | Bin 0 -> 589 bytes .../desktop_themes/sexy/images/d_calendar.png | Bin 0 -> 598 bytes .../sexy/images/d_certification.png | Bin 0 -> 714 bytes public/desktop_themes/sexy/images/d_clubs.png | Bin 0 -> 524 bytes .../sexy/images/d_connection.png | Bin 0 -> 454 bytes .../desktop_themes/sexy/images/d_courses.png | Bin 0 -> 500 bytes .../sexy/images/d_education.png | Bin 0 -> 513 bytes .../sexy/images/d_experience.png | Bin 0 -> 533 bytes public/desktop_themes/sexy/images/d_files.png | Bin 0 -> 379 bytes public/desktop_themes/sexy/images/d_home.png | Bin 0 -> 488 bytes .../desktop_themes/sexy/images/d_homework.png | Bin 0 -> 506 bytes .../desktop_themes/sexy/images/d_honors.png | Bin 0 -> 670 bytes .../sexy/images/d_journal_p.png | Bin 0 -> 517 bytes public/desktop_themes/sexy/images/d_labs.png | Bin 0 -> 805 bytes public/desktop_themes/sexy/images/d_landt.png | Bin 0 -> 481 bytes .../desktop_themes/sexy/images/d_mypage.png | Bin 0 -> 464 bytes public/desktop_themes/sexy/images/d_orbit.png | Bin 0 -> 628 bytes .../desktop_themes/sexy/images/d_patents.png | Bin 0 -> 495 bytes .../desktop_themes/sexy/images/d_personal.png | Bin 0 -> 589 bytes .../sexy/images/d_publication.png | Bin 0 -> 524 bytes .../desktop_themes/sexy/images/d_research.png | Bin 0 -> 575 bytes .../sexy/images/d_research_d.png | Bin 0 -> 533 bytes .../sexy/images/d_research_p.png | Bin 0 -> 557 bytes .../desktop_themes/sexy/images/d_sections.png | Bin 0 -> 243 bytes .../sexy/images/d_seminar_p.png | Bin 0 -> 532 bytes .../desktop_themes/sexy/images/d_settings.png | Bin 0 -> 573 bytes .../desktop_themes/sexy/images/d_working.png | Bin 0 -> 553 bytes public/desktop_themes/sexy/settings/sexy.json | 40 +++++++- .../snake/css/{snake.css => default.css} | 0 .../snake/images/d_activities.png | Bin 0 -> 535 bytes .../desktop_themes/snake/images/d_album.png | Bin 0 -> 720 bytes .../snake/images/d_app_manager.png | Bin 0 -> 415 bytes .../snake/images/d_appstore.png | Bin 0 -> 553 bytes public/desktop_themes/snake/images/d_blog.png | Bin 0 -> 436 bytes .../desktop_themes/snake/images/d_books.png | Bin 0 -> 589 bytes .../snake/images/d_calendar.png | Bin 0 -> 598 bytes .../snake/images/d_certification.png | Bin 0 -> 714 bytes .../desktop_themes/snake/images/d_clubs.png | Bin 0 -> 524 bytes .../snake/images/d_connection.png | Bin 0 -> 454 bytes .../desktop_themes/snake/images/d_courses.png | Bin 0 -> 500 bytes .../snake/images/d_education.png | Bin 0 -> 513 bytes .../snake/images/d_experience.png | Bin 0 -> 533 bytes .../desktop_themes/snake/images/d_files.png | Bin 0 -> 379 bytes public/desktop_themes/snake/images/d_home.png | Bin 0 -> 488 bytes .../snake/images/d_homework.png | Bin 0 -> 506 bytes .../desktop_themes/snake/images/d_honors.png | Bin 0 -> 670 bytes .../snake/images/d_journal_p.png | Bin 0 -> 517 bytes public/desktop_themes/snake/images/d_labs.png | Bin 0 -> 805 bytes .../desktop_themes/snake/images/d_landt.png | Bin 0 -> 481 bytes .../desktop_themes/snake/images/d_mypage.png | Bin 0 -> 464 bytes .../desktop_themes/snake/images/d_orbit.png | Bin 0 -> 628 bytes .../desktop_themes/snake/images/d_patents.png | Bin 0 -> 495 bytes .../snake/images/d_personal.png | Bin 0 -> 589 bytes .../snake/images/d_publication.png | Bin 0 -> 524 bytes .../snake/images/d_research.png | Bin 0 -> 575 bytes .../snake/images/d_research_d.png | Bin 0 -> 533 bytes .../snake/images/d_research_p.png | Bin 0 -> 557 bytes .../snake/images/d_sections.png | Bin 0 -> 243 bytes .../snake/images/d_seminar_p.png | Bin 0 -> 532 bytes .../snake/images/d_settings.png | Bin 0 -> 573 bytes .../desktop_themes/snake/images/d_working.png | Bin 0 -> 553 bytes .../desktop_themes/snake/settings/snake.json | 40 +++++++- .../vintage/images/d_activities.png | Bin 0 -> 535 bytes .../desktop_themes/vintage/images/d_album.png | Bin 0 -> 720 bytes .../vintage/images/d_app_manager.png | Bin 0 -> 415 bytes .../vintage/images/d_appstore.png | Bin 0 -> 553 bytes .../desktop_themes/vintage/images/d_blog.png | Bin 0 -> 436 bytes .../desktop_themes/vintage/images/d_books.png | Bin 0 -> 589 bytes .../vintage/images/d_calendar.png | Bin 0 -> 598 bytes .../vintage/images/d_certification.png | Bin 0 -> 714 bytes .../desktop_themes/vintage/images/d_clubs.png | Bin 0 -> 524 bytes .../vintage/images/d_connection.png | Bin 0 -> 454 bytes .../vintage/images/d_courses.png | Bin 0 -> 500 bytes .../vintage/images/d_education.png | Bin 0 -> 513 bytes .../vintage/images/d_experience.png | Bin 0 -> 533 bytes .../desktop_themes/vintage/images/d_files.png | Bin 0 -> 379 bytes .../desktop_themes/vintage/images/d_home.png | Bin 0 -> 488 bytes .../vintage/images/d_homework.png | Bin 0 -> 506 bytes .../vintage/images/d_honors.png | Bin 0 -> 670 bytes .../vintage/images/d_journal_p.png | Bin 0 -> 517 bytes .../desktop_themes/vintage/images/d_labs.png | Bin 0 -> 805 bytes .../desktop_themes/vintage/images/d_landt.png | Bin 0 -> 481 bytes .../vintage/images/d_mypage.png | Bin 0 -> 464 bytes .../desktop_themes/vintage/images/d_orbit.png | Bin 0 -> 628 bytes .../vintage/images/d_patents.png | Bin 0 -> 495 bytes .../vintage/images/d_personal.png | Bin 0 -> 589 bytes .../vintage/images/d_publication.png | Bin 0 -> 524 bytes .../vintage/images/d_research.png | Bin 0 -> 575 bytes .../vintage/images/d_research_d.png | Bin 0 -> 533 bytes .../vintage/images/d_research_p.png | Bin 0 -> 557 bytes .../vintage/images/d_sections.png | Bin 0 -> 243 bytes .../vintage/images/d_seminar_p.png | Bin 0 -> 532 bytes .../vintage/images/d_settings.png | Bin 0 -> 573 bytes .../vintage/images/d_working.png | Bin 0 -> 553 bytes .../vintage/settings/vintage.json | 40 +++++++- 145 files changed, 217 insertions(+), 85 deletions(-) create mode 100644 app/assets/images/note_success.png create mode 100644 public/desktop_themes/chris/images/d_activities.png create mode 100644 public/desktop_themes/chris/images/d_album.png create mode 100644 public/desktop_themes/chris/images/d_app_manager.png create mode 100644 public/desktop_themes/chris/images/d_appstore.png create mode 100644 public/desktop_themes/chris/images/d_blog.png create mode 100644 public/desktop_themes/chris/images/d_books.png create mode 100644 public/desktop_themes/chris/images/d_calendar.png create mode 100644 public/desktop_themes/chris/images/d_certification.png create mode 100644 public/desktop_themes/chris/images/d_clubs.png create mode 100644 public/desktop_themes/chris/images/d_connection.png create mode 100644 public/desktop_themes/chris/images/d_courses.png create mode 100755 public/desktop_themes/chris/images/d_education.png create mode 100644 public/desktop_themes/chris/images/d_experience.png create mode 100644 public/desktop_themes/chris/images/d_files.png create mode 100644 public/desktop_themes/chris/images/d_home.png create mode 100644 public/desktop_themes/chris/images/d_homework.png create mode 100755 public/desktop_themes/chris/images/d_honors.png create mode 100644 public/desktop_themes/chris/images/d_journal_p.png create mode 100644 public/desktop_themes/chris/images/d_labs.png create mode 100644 public/desktop_themes/chris/images/d_landt.png create mode 100644 public/desktop_themes/chris/images/d_mypage.png create mode 100755 public/desktop_themes/chris/images/d_orbit.png create mode 100644 public/desktop_themes/chris/images/d_patents.png create mode 100644 public/desktop_themes/chris/images/d_personal.png create mode 100644 public/desktop_themes/chris/images/d_publication.png create mode 100644 public/desktop_themes/chris/images/d_research.png create mode 100644 public/desktop_themes/chris/images/d_research_d.png create mode 100644 public/desktop_themes/chris/images/d_research_p.png create mode 100644 public/desktop_themes/chris/images/d_sections.png create mode 100644 public/desktop_themes/chris/images/d_seminar_p.png create mode 100644 public/desktop_themes/chris/images/d_settings.png create mode 100644 public/desktop_themes/chris/images/d_working.png rename public/desktop_themes/sexy/css/{sexy.css => default.css} (100%) create mode 100644 public/desktop_themes/sexy/images/d_activities.png create mode 100644 public/desktop_themes/sexy/images/d_album.png create mode 100644 public/desktop_themes/sexy/images/d_app_manager.png create mode 100644 public/desktop_themes/sexy/images/d_appstore.png create mode 100644 public/desktop_themes/sexy/images/d_blog.png create mode 100644 public/desktop_themes/sexy/images/d_books.png create mode 100644 public/desktop_themes/sexy/images/d_calendar.png create mode 100644 public/desktop_themes/sexy/images/d_certification.png create mode 100644 public/desktop_themes/sexy/images/d_clubs.png create mode 100644 public/desktop_themes/sexy/images/d_connection.png create mode 100644 public/desktop_themes/sexy/images/d_courses.png create mode 100755 public/desktop_themes/sexy/images/d_education.png create mode 100644 public/desktop_themes/sexy/images/d_experience.png create mode 100644 public/desktop_themes/sexy/images/d_files.png create mode 100644 public/desktop_themes/sexy/images/d_home.png create mode 100644 public/desktop_themes/sexy/images/d_homework.png create mode 100755 public/desktop_themes/sexy/images/d_honors.png create mode 100644 public/desktop_themes/sexy/images/d_journal_p.png create mode 100644 public/desktop_themes/sexy/images/d_labs.png create mode 100644 public/desktop_themes/sexy/images/d_landt.png create mode 100644 public/desktop_themes/sexy/images/d_mypage.png create mode 100755 public/desktop_themes/sexy/images/d_orbit.png create mode 100644 public/desktop_themes/sexy/images/d_patents.png create mode 100644 public/desktop_themes/sexy/images/d_personal.png create mode 100644 public/desktop_themes/sexy/images/d_publication.png create mode 100644 public/desktop_themes/sexy/images/d_research.png create mode 100644 public/desktop_themes/sexy/images/d_research_d.png create mode 100644 public/desktop_themes/sexy/images/d_research_p.png create mode 100644 public/desktop_themes/sexy/images/d_sections.png create mode 100644 public/desktop_themes/sexy/images/d_seminar_p.png create mode 100644 public/desktop_themes/sexy/images/d_settings.png create mode 100644 public/desktop_themes/sexy/images/d_working.png rename public/desktop_themes/snake/css/{snake.css => default.css} (100%) create mode 100644 public/desktop_themes/snake/images/d_activities.png create mode 100644 public/desktop_themes/snake/images/d_album.png create mode 100644 public/desktop_themes/snake/images/d_app_manager.png create mode 100644 public/desktop_themes/snake/images/d_appstore.png create mode 100644 public/desktop_themes/snake/images/d_blog.png create mode 100644 public/desktop_themes/snake/images/d_books.png create mode 100644 public/desktop_themes/snake/images/d_calendar.png create mode 100644 public/desktop_themes/snake/images/d_certification.png create mode 100644 public/desktop_themes/snake/images/d_clubs.png create mode 100644 public/desktop_themes/snake/images/d_connection.png create mode 100644 public/desktop_themes/snake/images/d_courses.png create mode 100755 public/desktop_themes/snake/images/d_education.png create mode 100644 public/desktop_themes/snake/images/d_experience.png create mode 100644 public/desktop_themes/snake/images/d_files.png create mode 100644 public/desktop_themes/snake/images/d_home.png create mode 100644 public/desktop_themes/snake/images/d_homework.png create mode 100755 public/desktop_themes/snake/images/d_honors.png create mode 100644 public/desktop_themes/snake/images/d_journal_p.png create mode 100644 public/desktop_themes/snake/images/d_labs.png create mode 100644 public/desktop_themes/snake/images/d_landt.png create mode 100644 public/desktop_themes/snake/images/d_mypage.png create mode 100755 public/desktop_themes/snake/images/d_orbit.png create mode 100644 public/desktop_themes/snake/images/d_patents.png create mode 100644 public/desktop_themes/snake/images/d_personal.png create mode 100644 public/desktop_themes/snake/images/d_publication.png create mode 100644 public/desktop_themes/snake/images/d_research.png create mode 100644 public/desktop_themes/snake/images/d_research_d.png create mode 100644 public/desktop_themes/snake/images/d_research_p.png create mode 100644 public/desktop_themes/snake/images/d_sections.png create mode 100644 public/desktop_themes/snake/images/d_seminar_p.png create mode 100644 public/desktop_themes/snake/images/d_settings.png create mode 100644 public/desktop_themes/snake/images/d_working.png create mode 100644 public/desktop_themes/vintage/images/d_activities.png create mode 100644 public/desktop_themes/vintage/images/d_album.png create mode 100644 public/desktop_themes/vintage/images/d_app_manager.png create mode 100644 public/desktop_themes/vintage/images/d_appstore.png create mode 100644 public/desktop_themes/vintage/images/d_blog.png create mode 100644 public/desktop_themes/vintage/images/d_books.png create mode 100644 public/desktop_themes/vintage/images/d_calendar.png create mode 100644 public/desktop_themes/vintage/images/d_certification.png create mode 100644 public/desktop_themes/vintage/images/d_clubs.png create mode 100644 public/desktop_themes/vintage/images/d_connection.png create mode 100644 public/desktop_themes/vintage/images/d_courses.png create mode 100755 public/desktop_themes/vintage/images/d_education.png create mode 100644 public/desktop_themes/vintage/images/d_experience.png create mode 100644 public/desktop_themes/vintage/images/d_files.png create mode 100644 public/desktop_themes/vintage/images/d_home.png create mode 100644 public/desktop_themes/vintage/images/d_homework.png create mode 100755 public/desktop_themes/vintage/images/d_honors.png create mode 100644 public/desktop_themes/vintage/images/d_journal_p.png create mode 100644 public/desktop_themes/vintage/images/d_labs.png create mode 100644 public/desktop_themes/vintage/images/d_landt.png create mode 100644 public/desktop_themes/vintage/images/d_mypage.png create mode 100755 public/desktop_themes/vintage/images/d_orbit.png create mode 100644 public/desktop_themes/vintage/images/d_patents.png create mode 100644 public/desktop_themes/vintage/images/d_personal.png create mode 100644 public/desktop_themes/vintage/images/d_publication.png create mode 100644 public/desktop_themes/vintage/images/d_research.png create mode 100644 public/desktop_themes/vintage/images/d_research_d.png create mode 100644 public/desktop_themes/vintage/images/d_research_p.png create mode 100644 public/desktop_themes/vintage/images/d_sections.png create mode 100644 public/desktop_themes/vintage/images/d_seminar_p.png create mode 100644 public/desktop_themes/vintage/images/d_settings.png create mode 100644 public/desktop_themes/vintage/images/d_working.png mode change 100644 => 100755 public/desktop_themes/vintage/settings/vintage.json diff --git a/app/assets/images/note_success.png b/app/assets/images/note_success.png new file mode 100644 index 0000000000000000000000000000000000000000..5d5ae2ad1f9c954d2157f64ce4da16412daca461 GIT binary patch literal 5116 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 emzgW_-vIzb`UHnwPLxRi0000") var od = new orbitDesktop("#ajax_container"); diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index 898a7b6b..5d5fd81a 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -13,7 +13,13 @@ var orbitDesktop = function(dom){ this.desktopData = {"home":"","fun":"","work":"","favorite":"","apps_manager":"","sections":""}; this.tp = ""; this.initialize = function(){ - var theme = o.theme; + var theme = o.theme; + $.getJSON("/desktop/get_desktop_settings",{id:o.desktopId},function(desktopSettings){ + if(desktopSettings){ + theme = desktopSettings.theme + } + }) + $.getJSON("/"+o.themefolder+"/"+theme+"/settings/"+theme+".json",function(ts){ o.themesettings = eval(ts); $('head').append( $('').attr('href', "/"+o.themefolder+"/"+theme+"/css/"+ts.css)); @@ -75,6 +81,15 @@ var orbitDesktop = function(dom){ $("#holder").animate({scrollLeft:0},1000); }*/ }); + var $widget_fn = $('.widget_fn'),$fn_des = $('.fn_des'); + $widget_fn.hover(function(){ + var fn_name = $(this).find('img').attr('alt'),nth = $(this).parents('.d_cate').index(),des_left = $('.dock_child').eq(nth).width(); + $(this).addClass('thmc1'); + $fn_des.text(fn_name).css({'top':nth * 60,'left': des_left + 60}).stop(true, true).fadeIn(); + },function(){ + $(this).removeClass('thmc1'); + $fn_des.stop(true, true).fadeOut(); + }); }; this.initializeDesktop = function(target){ if(!target)target = "desktop"; @@ -134,7 +149,10 @@ var orbitDesktop = function(dom){ } }; this.tempFunc = function(){ - o.notify("This is test notification!!","alert",2) + //o.notify("This is test notification!!","alert",2) + $.post("/desktop/save_desktop_settings",{"theme":$("#change_theme").val()},function(){ + o.notify("Settings Saved!!","success"); + }) } this.initializeAppSearch = function(target){ o.currenthtml = target; @@ -239,72 +257,16 @@ var orbitDesktop = function(dom){ $("div#bgover").css({"position":"fixed","top":"0px","left":"0px","z-index":"-1","width":ww,"height":wh}); }; this.loadIconCache = function(){ - $("#home_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.home); - $("#app_manager_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.app_manager); - $("#sections_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.sections); - $("#settings_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.settings); - $("#publication_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.publication); - $("#journal_p_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.journal_p); - $("#seminar_p_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.seminar_p); - $("#books_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.books); - $("#research_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.research); - $("#research_d_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.research_d); - $("#research_p_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.research_p); - $("#patents_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.patents); - $("#labs_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.labs); - $("#experience_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.experience); - $("#working_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.working); - $("#education_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.education); - $("#honors_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.honors); - $("#activities_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.activities); - $("#clubs_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.clubs); - $("#landt_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.landt); - $("#courses_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.courses); - $("#homework_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.homework); - $("#certification_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.certification); - $("#personal_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.personal); - $("#mypage_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.mypage); - $("#blog_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.blog); - $("#album_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.album); - $("#calendar_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.calendar); - $("#files_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.files); - $("#orbit_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.orbit); - $("#connection_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.connection); - $("#appstore_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.appstore); + var imgs = $("ul.docklist img"); + $.each(imgs,function(){ + var setting_name = $(this).attr("id").replace("_icon",""); + $(this).attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons[setting_name]) + }) } o.initialize(); } orbitDesktop.prototype.themefolder = "themes"; +orbitDesktop.prototype.desktopId = "1"; +orbitDesktop.prototype.notifyImgPath = "temp"; -// devin -(function(){ - $(document).ready(function(){ - var $widget_fn = $('.widget_fn'), - $fn_des = $('.fn_des'); - - $widget_fn.hover(function(){ - var fn_name = $(this).find('img').attr('alt'), - nth = $(this).parents('.d_cate').index(), - des_left = $('.dock_child').eq(nth).width(); - - - $(this).addClass('thmc1'); - $fn_des - .text(fn_name) - .css({ - 'top':nth * 60, - 'left': des_left + 60 - }) - .stop(true, true) - .fadeIn(); - }, function(){ - $(this).removeClass('thmc1'); - $fn_des.stop(true, true).fadeOut(); - }); - - - }); - - -}()); diff --git a/app/assets/javascripts/orbitdesktopAPI.js b/app/assets/javascripts/orbitdesktopAPI.js index 282f9dc8..b9594e3b 100644 --- a/app/assets/javascripts/orbitdesktopAPI.js +++ b/app/assets/javascripts/orbitdesktopAPI.js @@ -33,11 +33,9 @@ var orbitDesktopAPI = function(){ img = "note_alert.png"; break; } - $notify.find("img#note_img").attr("src","/assets/"+img); + $notify.find("img#note_img").attr("src",o.notifyImgPath+img); $notify.find(".note_message").text(msg); if(!time)time=5000; else time=time*1000; $notify.slideDown().delay(time).slideUp(); }; -}; - -orbitDesktopAPI.prototype.notifyImgPath = ""; \ No newline at end of file +}; \ No newline at end of file diff --git a/app/controllers/desktop_controller.rb b/app/controllers/desktop_controller.rb index 56b4b58b..a7ff8545 100644 --- a/app/controllers/desktop_controller.rb +++ b/app/controllers/desktop_controller.rb @@ -2,10 +2,11 @@ class DesktopController< ApplicationController layout 'desktop' before_filter :authenticate_user! def index - + @desktop = current_user.desktop end def desktop + render :layout => false end @@ -17,11 +18,15 @@ class DesktopController< ApplicationController render :layout => false end - def save_desktop_theme - + def save_desktop_settings + Desktop.update_attributes(:theme => params["theme"]) + a = Array.new + a << {"success"=>"true"} + render :json=>a.to_json end - def get_desktop_theme - + def get_desktop_settings + @desktop = Desktop.find(params["id"]) + render :json => @desktop.to_json end end \ No newline at end of file diff --git a/app/models/desktop.rb b/app/models/desktop.rb index e88d352b..16c8fd90 100644 --- a/app/models/desktop.rb +++ b/app/models/desktop.rb @@ -10,7 +10,10 @@ class Desktop before_create :initialize_section def initialize_section - user.self.build_section + self.sections.build(name: "Desktop 1") + self.sections.build(name: "Desktop 2") + self.sections.build(name: "Desktop 3") + self.sections.build(name: "Desktop 4") end end \ No newline at end of file diff --git a/app/models/group.rb b/app/models/group.rb index 13668093..4918514d 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -7,7 +7,8 @@ class Group before_create :initialize_tile def initialize_tile - self.build_tile + self.tiles.build + self.tiles.build end end diff --git a/app/models/section.rb b/app/models/section.rb index 7272efcf..f9035c69 100644 --- a/app/models/section.rb +++ b/app/models/section.rb @@ -2,7 +2,7 @@ class Section include Mongoid::Document include Mongoid::Timestamps - field :name, default: "Section" + field :name belongs_to :desktop has_many :groups, :autosave => true, :dependent => :destroy @@ -10,7 +10,8 @@ class Section before_create :initialize_group def initialize_group - self.build_group + self.groups.build + self.groups.build end end \ No newline at end of file diff --git a/app/views/desktop/index.html.erb b/app/views/desktop/index.html.erb index 6f6b43c7..eac389d5 100755 --- a/app/views/desktop/index.html.erb +++ b/app/views/desktop/index.html.erb @@ -80,4 +80,12 @@ Change Theme: