From 11d3906951980193c33c0c282a65c2475745e34d Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 3 Apr 2012 18:06:16 +0800 Subject: [PATCH] new icons --- app/assets/javascripts/orbitdesktop.js | 29 +++++++++ app/assets/stylesheets/desktop.css | 3 +- app/assets/stylesheets/desktopmain.css | 51 ++++++++++++++- app/views/desktop/index.html.erb | 58 +++++++++++++++++- public/desktop_themes/default/images/apps.png | Bin 287 -> 0 bytes public/desktop_themes/default/images/home.png | Bin 362 -> 0 bytes .../default/images/sections.png | Bin 359 -> 0 bytes .../default/settings/default.json | 40 +++++++++++- 8 files changed, 173 insertions(+), 8 deletions(-) delete mode 100644 public/desktop_themes/default/images/apps.png delete mode 100644 public/desktop_themes/default/images/home.png delete mode 100644 public/desktop_themes/default/images/sections.png diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index 7d6d649c..24180334 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -239,6 +239,35 @@ var orbitDesktop = function(dom){ $("#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); } o.initialize(); } diff --git a/app/assets/stylesheets/desktop.css b/app/assets/stylesheets/desktop.css index 4fc3c086..1864ab8e 100644 --- a/app/assets/stylesheets/desktop.css +++ b/app/assets/stylesheets/desktop.css @@ -2,9 +2,8 @@ *This is a manifest file that'll automatically include all the stylesheets available in this directory *and any sub-directories. You're free to add application-wide styles to this file and they'll appear at *the top of the compiled file, but it's generally better to create a new file per style scope. - *= require reset *= require style -*= require bootstrap + *= require bootstrap *= require bootstrap-orbit *= require desktopmain */ \ No newline at end of file diff --git a/app/assets/stylesheets/desktopmain.css b/app/assets/stylesheets/desktopmain.css index 180abd9c..df68d361 100644 --- a/app/assets/stylesheets/desktopmain.css +++ b/app/assets/stylesheets/desktopmain.css @@ -1,5 +1,52 @@ @import url(http://fonts.googleapis.com/css?family=Cuprum); -@import url(reset.css); +/* http://meyerweb.com/eric/tools/css/reset/ + v2.0 | 20110126 + License: none (public domain) +*/ + +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +b, u, i, center, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td, +article, aside, canvas, details, embed, +figure, figcaption, footer, header, hgroup, +menu, nav, output, ruby, section, summary, +time, mark, audio, video { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font: inherit; + vertical-align: baseline; +} +/* HTML5 display-role reset for older browsers */ +article, aside, details, figcaption, figure, +footer, header, hgroup, menu, nav, section { + display: block; +} +body { + line-height: 1; +} +ol, ul { + list-style: none; +} +blockquote, q { + quotes: none; +} +blockquote:before, blockquote:after, +q:before, q:after { + content: ''; + content: none; +} +table { + border-collapse: collapse; + border-spacing: 0; +} /* basic setting */ body { @@ -31,7 +78,6 @@ a { text-decoration: none; } } #rwidget { height: 516px; - overflow: hidden; } .widget_fn { display: block; @@ -102,6 +148,7 @@ a { text-decoration: none; } .section_slc li:hover { background-color: #F0F0F0; } .admbg { background-color: #fff; } .admtxt { color: #666; } +.admtxt:hover { color: #666; } .hfn { font-size: 15px; line-height: 36px; diff --git a/app/views/desktop/index.html.erb b/app/views/desktop/index.html.erb index c5209dff..a87241a7 100755 --- a/app/views/desktop/index.html.erb +++ b/app/views/desktop/index.html.erb @@ -1,8 +1,60 @@
- - - +
    +
  • +
      +
      • +
      • +
      • +
    +
    • +
  • +
      +
      • +
      • +
      • +
    +
    • +
  • +
      +
      • +
      • +
      • +
      • +
    +
    • +
  • +
      +
      • +
      • +
      • +
      • +
      • +
    +
    • +
  • +
      +
      • +
      • +
      • +
    +
    • +
  • +
      +
      • +
      • +
      • +
      • +
      • +
    +
    • +
  • +
      +
      • +
    +
    • +
    • +
diff --git a/public/desktop_themes/default/images/apps.png b/public/desktop_themes/default/images/apps.png deleted file mode 100644 index 67b69c89f8d6947f4c50e10914cd9f80632c142e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 287 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3EX7WqAsj$Z!;#Vf4nJ za0`Jja>QWe}Xi&D$;i?WLqoP$mE3|Gs0yauWi z1F3W_N=+=u%+FH@$;?eE2|GrwKi&AKh+bCdPn#|_MU77rTs^LICEOKRvpW||^0|H%7?T;h>h VyI*drX$Lxh!PC{xWt~$(695eXU#$QD diff --git a/public/desktop_themes/default/images/home.png b/public/desktop_themes/default/images/home.png deleted file mode 100644 index 56efebb5444d2e03cd3ef0fc94634923ba135a62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 362 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3EX7WqAsj$Z!;#Vf4nJ za0`Jja>QWe}Xi&D$;i?WLqoP$mE3|Gs0yauWi z1F3W_N=+=u%+FH@$;?e18;&w=d(yxP__r%5hILtXFB(fc7m()pLl4rqa9Q|y= zH_?x*5oJrXy-%cw`m-MjUncWNu7LBBsQ9;8N3t8&$cX7LbqFi#o*t#3J^N84cgoYi zJ^oxNM;U9GEj-hwKE1{uGR4nJ za0`Jja>QWe}Xi&D$;i?WLqoP$mE3|Gs0yauWi z1F3W_N=+=u%+FH@$;?e$gOYM-DN1h5s&TZv1ccTH;OggGoEyG`x1Ic%gf> z?*PjM4