From 11d3906951980193c33c0c282a65c2475745e34d Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 3 Apr 2012 18:06:16 +0800 Subject: [PATCH 1/7] 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 Date: Tue, 3 Apr 2012 18:32:42 +0800 Subject: [PATCH 2/7] update icons --- .../default/images/d_activities.png | Bin 0 -> 535 bytes public/desktop_themes/default/images/d_album.png | Bin 0 -> 720 bytes .../default/images/d_app_manager.png | Bin 0 -> 415 bytes .../desktop_themes/default/images/d_appstore.png | Bin 0 -> 553 bytes public/desktop_themes/default/images/d_blog.png | Bin 0 -> 436 bytes public/desktop_themes/default/images/d_books.png | Bin 0 -> 589 bytes .../desktop_themes/default/images/d_calendar.png | Bin 0 -> 598 bytes .../default/images/d_certification.png | Bin 0 -> 714 bytes public/desktop_themes/default/images/d_clubs.png | Bin 0 -> 524 bytes .../default/images/d_connection.png | Bin 0 -> 454 bytes .../desktop_themes/default/images/d_courses.png | Bin 0 -> 500 bytes .../default/images/d_experience.png | Bin 0 -> 533 bytes public/desktop_themes/default/images/d_files.png | Bin 0 -> 379 bytes public/desktop_themes/default/images/d_home.png | Bin 0 -> 488 bytes .../desktop_themes/default/images/d_homework.png | Bin 0 -> 506 bytes .../desktop_themes/default/images/d_journal_p.png | Bin 0 -> 517 bytes public/desktop_themes/default/images/d_labs.png | Bin 0 -> 805 bytes public/desktop_themes/default/images/d_landt.png | Bin 0 -> 481 bytes public/desktop_themes/default/images/d_mypage.png | Bin 0 -> 464 bytes .../desktop_themes/default/images/d_patents.png | Bin 0 -> 495 bytes .../desktop_themes/default/images/d_personal.png | Bin 0 -> 589 bytes .../default/images/d_publication.png | Bin 0 -> 524 bytes .../desktop_themes/default/images/d_research.png | Bin 0 -> 575 bytes .../default/images/d_research_d.png | Bin 0 -> 533 bytes .../default/images/d_research_p.png | Bin 0 -> 557 bytes .../desktop_themes/default/images/d_sections.png | Bin 0 -> 243 bytes .../desktop_themes/default/images/d_seminar_p.png | Bin 0 -> 532 bytes .../desktop_themes/default/images/d_settings.png | Bin 0 -> 573 bytes .../desktop_themes/default/images/d_working.png | Bin 0 -> 553 bytes 29 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 public/desktop_themes/default/images/d_activities.png create mode 100644 public/desktop_themes/default/images/d_album.png create mode 100644 public/desktop_themes/default/images/d_app_manager.png create mode 100644 public/desktop_themes/default/images/d_appstore.png create mode 100644 public/desktop_themes/default/images/d_blog.png create mode 100644 public/desktop_themes/default/images/d_books.png create mode 100644 public/desktop_themes/default/images/d_calendar.png create mode 100644 public/desktop_themes/default/images/d_certification.png create mode 100644 public/desktop_themes/default/images/d_clubs.png create mode 100644 public/desktop_themes/default/images/d_connection.png create mode 100644 public/desktop_themes/default/images/d_courses.png create mode 100644 public/desktop_themes/default/images/d_experience.png create mode 100644 public/desktop_themes/default/images/d_files.png create mode 100644 public/desktop_themes/default/images/d_home.png create mode 100644 public/desktop_themes/default/images/d_homework.png create mode 100644 public/desktop_themes/default/images/d_journal_p.png create mode 100644 public/desktop_themes/default/images/d_labs.png create mode 100644 public/desktop_themes/default/images/d_landt.png create mode 100644 public/desktop_themes/default/images/d_mypage.png create mode 100644 public/desktop_themes/default/images/d_patents.png create mode 100644 public/desktop_themes/default/images/d_personal.png create mode 100644 public/desktop_themes/default/images/d_publication.png create mode 100644 public/desktop_themes/default/images/d_research.png create mode 100644 public/desktop_themes/default/images/d_research_d.png create mode 100644 public/desktop_themes/default/images/d_research_p.png create mode 100644 public/desktop_themes/default/images/d_sections.png create mode 100644 public/desktop_themes/default/images/d_seminar_p.png create mode 100644 public/desktop_themes/default/images/d_settings.png create mode 100644 public/desktop_themes/default/images/d_working.png diff --git a/public/desktop_themes/default/images/d_activities.png b/public/desktop_themes/default/images/d_activities.png new file mode 100644 index 0000000000000000000000000000000000000000..b481e67688b1dbf06ef423e260bef838aa44dd9f GIT binary patch literal 535 zcmV+y0_gpTP)V>IRB3Hx05CK!Ff%VPG7mC5@Bjb- zZAnByR7i=%mf>-OFbstsU7&1IM#u;qfo_ly=mgCMWP_v|umSD_WCOCn>krJu)ge1_ z-BfqJGqQOfmSk*@gt5JnbX@G>pRF3mfo_=@ZUqkt*jd39Nf<0Pxv~g7StbMcRQ%4U zV-9umUpWTJ9m&xHCz5T3hB?Q@%$nnefd?#=Oy6Ja;C&82odZsVS`Jnl{x1NH6`ULD zYtVlIa5O6m1^l6?YR z9DF5NC*U8s;4u)Hysr*?=Hu{Q@K!sDRUIAy?v#+4wvrXBU3_21< ze2%wbD*~>$+$KX?4}KYib4lhm002ovPDHLkV1gt}+7JK$ literal 0 HcmV?d00001 diff --git a/public/desktop_themes/default/images/d_album.png b/public/desktop_themes/default/images/d_album.png new file mode 100644 index 0000000000000000000000000000000000000000..6f0e4a1716e512966230e5ff96a717967da0298f GIT binary patch literal 720 zcmV;>0x$iEP)V>IRB3Hx05CK!Ff%VPG7mC5@Bjb; zCP_p=R7i>4m*H{SFbsu1`~2V9AnF9w2K5H@22D3`H}D2^Hb^(f29+nMvH?9ooe5rl z5VR4Rl$_++-1Xh@L_rW90Y8HBOcL*b`Ma?GL*gAE8v*E$CH$sU#$Wy@U8GXWcR&YS0{^GRYGfu zt>K}d;Cwd(owrXXQ?h?|ezB66#W0d>o()97c-)v@5B%aRyf!%`;?BLadIfRGe+hib zY$sush+E?JIaG+(1zT6J)zFO*Lpd{uS!^;}em_aPAS&4J%~YPA%TgtLw*Y}yftJ{r zu4yDK0JgVsbc+3TOxd}Llfri+?@87x<~&!lUsWjB55(@X27WmEwlW{hIA6UKk3vT5 zzS{*|?(3(GFp+h)0KRZO3=-*+3*ZG-TI9B1>!}Mf#wnD^ zkGyprC;S^lvGx4nJ za0`Jja>QWe}Xi&D$;i?WLqoP$mE3|Gs0yauWi z1F3W_N=+=u%+FH@$;?ewzr0Nb0!Qmp84H=+ zR!UniK6YQngo7Lb%Rk|4i@wkK=bB1srjNtC{kGMw5xdv=%}JpA#E+w2v=ir?J>TD; z`0TOWfw>zkzUi?PmS2y#FqQjQ(a{5^V;Ar2D@ne1a%*bM?6>P17d7YKvwzOLk)it7 z>g4HXzl#5pO`Pm-J*6c4qV7@N0JXiTY6qpYw9hUwip}W;1^|PntDnm{r-UW|G`5~z literal 0 HcmV?d00001 diff --git a/public/desktop_themes/default/images/d_appstore.png b/public/desktop_themes/default/images/d_appstore.png new file mode 100644 index 0000000000000000000000000000000000000000..e82e745dc4d4baac7a50738d4ed79b6c6f8fe8fe GIT binary patch literal 553 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@$;?e_DOGFWz0!ZeQ9?RL{M6p#k55i}*P=V&WCus}gIw{e zEDwbo_#HYoO7~ASbcuWtl+C~{e7fBE1499iYFFi>sE)eM!lU1rf44MtIIWx0Q6*I% zQmk%xZ}WSl^c4llC$f+KaXn+6%_-ir<+DxTxnj2ErY%zy)};M8cgX*5=nkQj?+q&T zE%h_C<_J#|b8&6ha7WD7xYf)(hui&5Sk|HY4WDOvev3X9-zK)Son#Hq!YN7vw}pIDr*Ut;fbxtvz^Y@Zf)$=n9P?YcF; z^%H-enaccP4a4so(QN5G$!ROA8SdYkbJ_4#{B#3@yXl84en;FsDyg!EZP`}mcXc;a pYUbA#eEW2R`ES;ZxA$L)&-=^OzG74OI$&fmc)I$ztaD0e0su#3+Uo!S literal 0 HcmV?d00001 diff --git a/public/desktop_themes/default/images/d_blog.png b/public/desktop_themes/default/images/d_blog.png new file mode 100644 index 0000000000000000000000000000000000000000..0bb552512d0f6b3bb257b8c0b43b79a5eeced6d9 GIT binary patch literal 436 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@$;?e}%W;?enb`fb4`0|8h4FegpT zgM3GV-Z*Fn0AazJ0}+k7Hx7Pm?&a^{^18tP?hN1hGxN@FN_1v>Aujc&C5lme(jFC| zndWYq4hNdvZDCMZutB=|K%|1Ejyaoy;(^<)UKs}II_qbPw6woYo4H!G{;_-mkKSud z?)7`Ge%kx$-2Zr;<>^tYdbV}S-m`ogEPL5){bj44EO(agVlU^qr}E&9+`EF@(AbjY zcOs5AE}40B!?Y(tXUtAWI!~IWIO%8m+jk-}ukPNq>rk1(LAL|j6n{uC+F!mW!8GOK zzi-=qsrI~DKkc%4QQ4Q+ree=v>-l>n!nJ~ALZ!`gc2x4tUwh8tk7mzn9>2h=TT9rc XXSXU%h`u5Z3^xW(S3j3^P6V>IRB3Hx05CK!Ff%VPG7mC5@Bjb- zqe(z}W#Ecvc`KoE=aCRseRO9Y6yRhD}}L=G?!Fa zd>cq=EL-=yvkAU2h={tF288YP<#IwtT}6)T8twso2=Dq79-Gf4@B(}Q>i~C=BkYTB z>BMUxsW#saB#m`?@yeVS-+T5_IrCRD0JcD5*|xN)){Dmrv#E{oa3pD>HYHrl6;7w9 z$G#YM9uI*(U=9p`2~Ys<7T5MZ358Be<_P$S@b|R0cxdL29B;L~P+{hUWh-os8{_K2 zMjy-o_$D)z;5?niUX~wCuBcD=`4++{-tPMpt`gq6O7y0}T{@M(Z^C;|oL8)*bm}~= z5=8UMq=g*e=33EQ;k=(g2Zf|dWzvORCT%3gxJnRR2Sk&RD%|uT3hhy+bo4I~@uZ_p z6)qySV>IRB3Hx05CK!Ff%VPG7mC5@Bjb- ztVu*cR7i=j9%PEv8 zDZ36R{R1PZ2bL!WhGDL9OMlAl8z?++%&7qmZhb$K_yDXD8#aIzBMwSOh~Hr*s%$&O z(MqZ$t=&2o-mXm8AxUGQz9tNyf6>QJ*xg)1HmAg4sOOHxxfrzBRH&aB4wqMKtAyAF zI-Rr0*v7EhLa9covI%tR5uJ6!-=L~f#J(MN&QTrF^(ZA3l6v>Qo+3_#`qBNi*mrCb z(ecI80=<(gj7=`@G(;KII^qzln7!RX@M=8CGdXciRWOCi_9Ic2EP7?bPK!yZ>cYdOQUe455Oku kV>IRB3Hx05CK!Ff%VPG7mC5@Bjb; zAW1|)R7i=nm(g+CFbszO^zv?vpbg3mqHN%9pb@-5lnLq$>J8#dP<4VR6GR)tnc(k( z0E>c2id3(-!%-p$d;%bn5=df$I+7Prx5Y=PK}E9Tt#mS$?dy&tJUIZU0Q3L`02cr? z00&?%x|6xj(mqN11>h_?02sxW1JH=CbQ=z{wXY9X#EwmBnfJEB=6>Omn^E&qX zi@-x-EC%f{)jA1{fh%cKhA}7s{0P`quoBt1bVmxw8<+dC9vGio9vF^f9q=1GBu1HF z4Yoipa$Sq<=(B99wXV+Guci0V*!Gxe9rJYq?xk&{)qT1Yx&!cPe5vnAOsbtpOHJ~r zFuf{TE-l~UgCVq`>%`E;p9}ph{rgaTW8i~Kwx?7s)Q?V2r9%$5@*L@bUl%}+TrS58 z1D{2)^RqK4sz|g*WCF??r)Zsmt2y9k#T*c4EQTm3M{}kAHPTK-#>-9%JeN$lT zMBz23l&ZXOUOJ)qo4_D>3OK7s{uI@k`q0yw-yE=ohiZQG##f;wU>niEX}L69);pQr wtzdoOM&8QE!hfhzuxiKor>$e*e-lak1w9&~JOTeH1poj507*qoM6N<$g6lXnk^lez literal 0 HcmV?d00001 diff --git a/public/desktop_themes/default/images/d_clubs.png b/public/desktop_themes/default/images/d_clubs.png new file mode 100644 index 0000000000000000000000000000000000000000..f22aa6dde60a5007a67c449fa5455f7571a2b1cf GIT binary patch literal 524 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@$;?eD7|t<#TYW;sbiZ=yRh7A)A{ACL$qQYGdtTkdt-59U^`>B3I|=LO zTN^bCGFj~JbHC|H*c$X;gXoW}nt4`stag$I-@o!`{px=z@YjYjg>HAZ{$RcNkhekI z#a~3?n3lr2oA={9L&{WcN{F@3|M~vZ%+g&fI#V4c_u@J@ zgU?;LD(A2?b624C%Hu&tC;i%9*mK-&`O(E?SH735>MEKYbu2nhY|Y%OEA!Sno`3pC zzo$*MQPtdQmBpN}T-__5S_@a_^KD+)+V>zqreO7w)`>w1FO7n>8>?42#5D6Z92fn$ zzH)lb#dLPva3{tC&o{)RCjWinx7UdfeK=4)5one@f}Y5-e?`Cn5NV04nJ za0`Jja>QWe}Xi&D$;i?WLqoP$mE3|Gs0yauWi z1F3W_N=+=u%+FH@$;?eY_EoZ}IC{(WdiU;|8_jMXlXmd;K5+eDd!@Vl1G_=dBDp=yjAh|FShqeBFX*ejV0KyhhEeGA zr|%1OGxcAd{gLvPfxzbngMhE8OjY{Ck$ySD7ws&^oZ|#jmL*6TiHlk+7@cTFllZYv*+D sk@*%=shcU)xcGE*dE7VeLvxky@UFgdpyeeCFeDi~UHx3vIVCg!06Va|egFUf literal 0 HcmV?d00001 diff --git a/public/desktop_themes/default/images/d_courses.png b/public/desktop_themes/default/images/d_courses.png new file mode 100644 index 0000000000000000000000000000000000000000..3d521ddf5be0309553470b86fd0d3cb619216f98 GIT binary patch literal 500 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@$;?e}%W;?enZ+TFmz1_CYil@;zG z4l5XzGdZz3upb{4_UidJ$+R?FQ1yoUfVyZM&qhO zg=cF2o%qiaLfo56t#^3p&JbLDWaSBE)d?YARJsFw6z65>nHyZI?sBd?S2yv)dVvkI zAHSNEd34bXhq}iqrUyzd>}3D6?XOr)mfo)=VlwXvZ4|dInBiGvzi;i9)!~!23CG&7 z&%Hh0sd(-yXY4n z>+tRYD0hob)78&qol`;+03MOY1poj5 literal 0 HcmV?d00001 diff --git a/public/desktop_themes/default/images/d_experience.png b/public/desktop_themes/default/images/d_experience.png new file mode 100644 index 0000000000000000000000000000000000000000..f182981bcc378e2b64d5cc5cea54782d25611d18 GIT binary patch literal 533 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@$;?et0cw0N^_8L{;u>xP+Q3JL+9xSvHK$|9xDln z3tngb9(Lf)$@Qyle81rl#a0vTVZ|f2wD^dPThNBN_ZoXAuW$6Xn%RF+R5dI|C3Kt7 z;&&|jJ#Kl-x}B9>T|0eo(wjwj@28as+g`JJ|8~keIaR*OSKo4EXSfGV_K@k3Ea0$6 zm{TZSxN_gIM+@&i{+D{u#j`oh|M_0eyaP@d?_(=0#DpUDC)k5JKW_PXM V%UZY_nt&0*;OXk;vd$@?2>>b0)6)O| literal 0 HcmV?d00001 diff --git a/public/desktop_themes/default/images/d_files.png b/public/desktop_themes/default/images/d_files.png new file mode 100644 index 0000000000000000000000000000000000000000..99299d80c262428b928af292f2a0883170ec5b1c GIT binary patch literal 379 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@$;?eF8(Mim$vkskz)5;Zuaf7a(+UZTRfcpvKH`N zX|SnfyC$|_@)Ty?4LoP=u~mq>P77Im-BDvdMZj zE=`&|sXus4(SoD(Jkbjne9lhgWpC|MJa8@OqnZ#`K-7U&#ofPH?maHgw`P_w;qr9% zUGn|etQ^b#Z)MIukhEz|{}6oDP)V>IRB3Hx05CK!Ff%VPG7mC5@Bjb- zK1oDDR7i>KR?%^TFbsY4`X5GM1V-ox*&rFgBV+_dAR913N1z)p0-fOXqq;^26D+q0 z$z9)_??ATotS2N>ki-^v*@X4kh)V!10Lo~^<^xI3s7Vg|#wdegt3AFvq=6T7Bug2c zvIklF&M8hg#HDc*B5UlSVsH_^F)n8*WI>*78h%B5GEpoM*aKxptfd`E9@Sj1-V}5S zj=U(9M7&oU`ou^ytTMft(*aC~8?~rqdhRT&^sVvxLtLqod8A##lJq^v3f4fMv}@4P z>i`GHWTQ^!m39rbt2HFMg7a%}1hC8K;n(m9)6ZkXx4NJU{j%A$_?o%z3}BGw3c$hb zfu^G*d@Pej!1S`4?8(V-v0!)Yd#Ycbf8swQ{V>IRB3Hx05CK!Ff%VPG7mC5@Bjb- zP)S5VR7i=b%7@o>@Dw>StFzo9ajKZswaT;269E%D(`I z@DS=Z;BHN@fR6|i`ublL>{|#0xGhZm0KDY4c+veLAW5%!ro<9wdk*@gOMeGkBC!?l zO&P0 w7@G<%>F-Y|3ZW(aK{J2?$rt+U+U!FA0|AA_q>}7QP5=M^07*qoM6N<$f-oY_RR910 literal 0 HcmV?d00001 diff --git a/public/desktop_themes/default/images/d_journal_p.png b/public/desktop_themes/default/images/d_journal_p.png new file mode 100644 index 0000000000000000000000000000000000000000..5f0e2757650b99eb5d141dbdbaec653ad6a88523 GIT binary patch literal 517 zcmV+g0{Z=lP)V>IRB3Hx05CK!Ff%VPG7mC5@Bjb- zTS-JgR7i>Km(g*;Fc3r+8o(vcLDT^)xCBa|1a}a3fJ;a^PzR6>=m4jJ%|~=b7M68V z?BpjqqZvzgx6hh62@H~m3`5c~U(Jl?Fy^3r0aVnLg5R7$PqNnRAQzr8(L(*2P6JPw zXrWPb8<}*%I)3 zA}!6f%yEy?Gz_Db^ZVs|&!p5v^GMw;t4HEJ#ZXaJZX$pEku z#V2Q=9sAJ0-?2P=;Jb?}056iK+>J(~bL@ksv^aR1%34eR;6Dd`yyw literal 0 HcmV?d00001 diff --git a/public/desktop_themes/default/images/d_labs.png b/public/desktop_themes/default/images/d_labs.png new file mode 100644 index 0000000000000000000000000000000000000000..fcb929e6b5a4f6eb4045deace9c7393ff8bfbe58 GIT binary patch literal 805 zcmV+=1KRwFP)V>IRB3Hx05CK!Ff%VPG7mC5@Bjb; zdr3q=R7i=%SM71zFbsX^bpVZ^4eAY|Oi*tSX98;jYlEZ{SR2?IB$>e4!0H56CwTo~ zpn8PKxXB;mj^`uz2!QyM??~bn^z9~E|3h&HU<5$>?Eq96TxDlNz?O+*X}vH{6UkO^ zt?_d7Qj%X%TFd1f$u-Gs5ZaThNUnspHSA7!^=A~fa68;F_0YGp29{}ELje?u(uF6X2n&KQa0G}lJ9E=pAq2hcHSW=+ z3z8d>%~xaWyheDh!q=EL7VF+*WD_f=xH7ORS=iZV`xDcItBgm(#8Mo1&ita{rCr?H zUX^qrDCfGRoOi((r_peUVzqEG-d^10wBuY>EmL>K+O0@FG7SYy7r?Xu9OOm*+lSXL zn0Bhkc=}3DKFyDV+*xVt4oqVgJ6LDDftNHetpi8NJzP6QX67Cf*O*QnHnL0jlj*XL-Oly`m8D-8_tdl?D$V?q;9BN*6E){f*TD#-q zh9(sgr_+S08oEo?$mb2sWF*4Uh%zfS?4hTw6-do$6$_rBb~|b0PaiHT~i!s z0`LdG()J^+&*H4ClH#ercV#~@hob?o`T(DmRr&&P@I6wCYg-SPfRrM&7Zcvh_ck7TU5-s00000NkvXXu0mjfBsXmz literal 0 HcmV?d00001 diff --git a/public/desktop_themes/default/images/d_landt.png b/public/desktop_themes/default/images/d_landt.png new file mode 100644 index 0000000000000000000000000000000000000000..c003ec8d534b5659664b6b057794bd27801e6b4c GIT binary patch literal 481 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@$;?e2LgEx@_ATn393KIB>&8=_|DuIhFi}5y91av zOn#y|v9coBv*Gc_BBnjQdItmpmK8EcC0DZUwn%MhD`4RI;raT|y0}ZHkL@g(8gk2a zk_r2{(0JwlyQg1X&rQGykV0oWJnb z>$bz0^H~L_uBnH+exEzopr0OQ`ryZ`_I literal 0 HcmV?d00001 diff --git a/public/desktop_themes/default/images/d_mypage.png b/public/desktop_themes/default/images/d_mypage.png new file mode 100644 index 0000000000000000000000000000000000000000..9d466a959782deb9837a937181321f535cc402a7 GIT binary patch literal 464 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@$;?e|)^|1D@Jsl`nExb^+H=`M8>m27YJDR+wf$PhAR z{l=ig5GE7HR;HrdP`UJo+Z;xnlmzaHv1R^GBa3cj-C;3Swhvn8`Sa6(bthIe)GsaU zzrAmR_NEGEp0?+VL!lGoq3CbeQUvdr_=Ii4)5a4&u< zdV7IUuQA(6{YlH86h}XLdi>Gq=x0I>><<*)#O{(yJ!V)tch`ma60#>J)XeeF$aHy literal 0 HcmV?d00001 diff --git a/public/desktop_themes/default/images/d_patents.png b/public/desktop_themes/default/images/d_patents.png new file mode 100644 index 0000000000000000000000000000000000000000..5b08a5293ee7a9102cb19e2fd71d973b6a2c4572 GIT binary patch literal 495 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@$;?egnPb;?enb+QZyt1A$iiMLZ5_ z8D<>PQ}Qn5O$glOcyqx^7FFRE!A*@XS=QSdXen(wDB=?G)ibQ4_RjPdb8G!nHny3q z4)}jiHuV6fK)|i{YuA<8m0fXQT*Bb-s^2GQZFFkijfEfIoCx;ziaj`0IbxFE#0z&O zyHDymvT<(B@6~K&k7ZaEF!9aXsz3esRP`S+jH(Q*JAT-dt^9i9Y5nR=lid}yYq)1F zDfe`{wEU~~whd~Hzm?zGod47xdz96;vDCJfWs*m~Xq7t4zRs=l!yg=+{GR8DcjIv_ zj(xi~SCtm*WZS_ouVK3Cf#~x!=gyaDO=I}Is)~;{tn}oTWB1~O)HEliWaP76-m*Az zX6)NW?nbj+jCOU5tQJU-Z7QV>IRB3Hx05CK!Ff%VPG7mC5@Bjb- zqe(kO^LYU?0ZV zSZY$;agObWK1;FX1SFw&Dv~Y9k&}(KUn%`SBR+E5j{gD9LDg`H$Oxg%j0F6Qyfp%i zS}y@tO0Y=(L^7wz3Sxe90!hS!5-QS5z~4%+NG}1mO0Y~XJa;GIQ93>H9D`&jfPY!t z!%HSezLC5Jz^fg-ZN$!06J?U&P$RXiPUxx9}MCC3+KcO zVsK1EbaVN;GWd)wb@!J1S9^RB%Ft@|2&Fl`|J`MfvP4nJ za0`Jja>QWe}Xi&D$;i?WLqoP$mE3|Gs0yauWi z1F3W_N=+=u%+FH@$;?eUvg=twQz)+xI0iN#&U>TE&ftj+zG(;dDX znCrUk1JjKDf}<_+jkiwdv+H?VTywbBb0@n;qu|Y}3x*Dtik4WLPYQEh@@KIu?-T8+ zB_Dj>m&kr#va!Bn{r8^v9AnkF<`cFWU%K{CY|=Nr?eaxocTe^N^Dg;zuXOuC^C=s3 zz04+@Ii#*6YaMkUtQa~5TvsjzcNFE}U}?_9y-_%MVyQ^-X(y|}GpX5*7b z88d_L==^_h;i^C5KDDFu#x1cvM!)Mz*XtGamu+D7SwHW|;pJWJ%=P)V>IRB3Hx05CK!Ff%VPG7mC5@Bjb- zl}SWFR7i=%mVJ?fFc8HbXP`*HK_dYPNZ=e)LM2oJ5-I@+oP(SLPQklBAak1~UxoJi zW_Bi%Ecp@Gm!u+zcj)6S)F*&@022U;umA=CP4Y>Sd!ivZF|R&0hihC&+RP*_w+`ga zB*)0h1mPfgEqHSY9u-he+^8I`eH-w+4&FlvDvW}fM6QGnA+S@Ofr8{sLgpInW=3?*Tiw-knM{ z909xNxa@dR6a9@Qq}x$&D*6;z+9_lqi{;GSqXEEYbTsoxoMN`o;fgD_a;xpptB1O^ zf8)bQIE8A#in)v%kOiXQvB@3*ZzAT+e$Qlkz$y64!7=ztz!kZ<(AQW_p|k3*3M}L% z%jSm8;~7AUzuQBJYAn75fbXIw5}zY>806IL`Nv1#mWc~|$v^%V{Q@5-w$xwocP#(_ N002ovPDHLkV1hbe>jMA) literal 0 HcmV?d00001 diff --git a/public/desktop_themes/default/images/d_research_d.png b/public/desktop_themes/default/images/d_research_d.png new file mode 100644 index 0000000000000000000000000000000000000000..4301e57315840e94dd08df1792846b7a3986c952 GIT binary patch literal 533 zcmV+w0_y#VP)V>IRB3Hx05CK!Ff%VPG7mC5@Bjb- zYe_^wR7i=vm(g*Mrq5j;XSs7G)&=mzly^#;ud=?31Q8KE0MCwTo43Bj0v zeMWb>^I@b12!uEQk|~{tyoyMx`mF7LB63lkMC6?14M=GN41gtHtlBgw-zjKU2#gJ& zD+P}mfT4^r#?wLsP9kD+gP#zqz8=PS1X}%W0kdJICh+ya!cuo?@awg$g@;hLSFSPl zcdrc$*20&d=y&6Thls&M`Ld^=P6i)*UND%*pLq@xZ5P)mX7Iy22`s^Lp-#HcX$;zv zUiMNbz?cJd(lej=8YsY23T=QF53~jfV5Jax(fV>IRB3Hx05CK!Ff%VPG7mC5@Bjb- zgGod|R7i=n*6neFFbsfUM(79~fdzWW2;HEJzzA$mHZU8s8zdXF8>AbA4c`8U9fXiS zAVhcmk+a~jg$S;IN{t%$1A1d_%jkf!zMqATOffu&4$R|zzZ44a1H9~n&hQen2HKs_ z5Pe8ItBH$1!-7i7-egb^=$qeRh>=@U$SSx(xbnHF=tI(I;4)53C5-L7W!||l+##NE z4j+ME@mu3VWKQEQ%<1yvcD}d)b|YE1yk_wpm*6?n!Vk(>z&X4WweTz)!`Gtvnj%=^ zhdt389B}!H?1GlSdNg~WYv9I@9A1Q$!V*g15*^6=w{Iz}g=;iK6yN$hCH@&fL*DCJ z*d<_z$IzbXv%1)MuGA^qiM%ee$i+fSn#;l^dgOL!NPSpBe!T|PxHIO41TIlfXReA{ z6Qs^o&Ol4>cV88Gn(3_Oh`s^^RY~n!#<$$9jA!CkpiXt=Gw>_E!787i&(s&-V4nJ za0`Jja>QWe}Xi&D$;i?WLqoP$mE3|Gs0yauWi z1F3W_N=+=u%+FH@$;?eEamT(fRhOAs2%Jk8_~*z5k~Q zFM4VOwd&Y=iyuC$skqY8=-S#BA1}Ray)>PH83^Lj`(2i-|1@RSH+kdk10dj@v)O_% XJBHoWVB>!^prH(&u6{1-oD!M<=q5{^ literal 0 HcmV?d00001 diff --git a/public/desktop_themes/default/images/d_seminar_p.png b/public/desktop_themes/default/images/d_seminar_p.png new file mode 100644 index 0000000000000000000000000000000000000000..36cfb59ad19b3f908689a16dfb4269f07b72a4b7 GIT binary patch literal 532 zcmV+v0_**WP)V>IRB3Hx05CK!Ff%VPG7mC5@Bjb- zYDq*vR7i=?N|`OKx+Z8h8=D zG(ZkC1x~`>ur5Xc08JvV=_vi9QP&-(&aIAB=N8AMG;?kR$K`BbFSQOYxVSpn)$YiL z$@;|3=)%hZ_y$l}I+uLLcL1LNIsn63=aP=CB2d zbKfqR#a>qLUfM2lTVgfO9Q(!~?YqF+06G?g{(;}UaXEef_`>`Pb1quqsMMjuSibx( zDK$9#N5{GphWfQLhRK5hJ`{#tWZYAH@f1LBlB<;oZBb9sX|w7%t>n5ecqDlg27Uop WisgF#u#<}b0000mfJu8 literal 0 HcmV?d00001 diff --git a/public/desktop_themes/default/images/d_settings.png b/public/desktop_themes/default/images/d_settings.png new file mode 100644 index 0000000000000000000000000000000000000000..0ca9b18def1edb4cc9b16839384826eaa2f6a043 GIT binary patch literal 573 zcmV-D0>b@?P)V>IRB3Hx05CK!Ff%VPG7mC5@Bjb- zlSxEDR7i=%SJ7?5AP{}2`d^R02p*sxbOU#TjFb^Pf;VVJARD*~RAhqJk3f9B0Kt(h zKMCm!@9rTE4tyYqJ@B?+Yy*Iz89DgAfnW!q0bo`C2|yq0;jr>jTL3>5yl;?PvpG)i zB#)ursjaP3S> zII*0nS$g6b%fXZEc{`8CV3$_IDsj0YhDx~41bHBH%Bjov^a*~l>75uca>`jBzQ6?Qgu%z7({NtmG}^$C7-~gH-tS|lDv-zRYRjPs90?tx zh$!4v1b#L#9it5HnB(1c^)Bc5K++=rT)6@m0Gz|O#qH|*$nd`e_i2v7ZEAJZIbQ2_ zS}YvJjj&(2k6#kj?UfhE;>wkR18_<7U$C%BrLgvcz8YKpI~DN{ejVRrC`@nE00000 LNkvXXu0mjfupsfM literal 0 HcmV?d00001 diff --git a/public/desktop_themes/default/images/d_working.png b/public/desktop_themes/default/images/d_working.png new file mode 100644 index 0000000000000000000000000000000000000000..9bc389819905540e71306d713020e6e1d77e4fd3 GIT binary patch literal 553 zcmV+^0@nSBP)V>IRB3Hx05CK!Ff%VPG7mC5@Bjb- ze@R3^R7i=%m+w)+KoG@$u>r3HN}vO^0xf|KgbJhsu>$FUSOI4R(gEqfSi$o{j`8Na ze=q^w%uYV+9*@1klF6KlnUS=VWZl!G z0%r-*1C~b;he_B}pe+#ZD#-fW4>XE*bxo@`r7C(cTj1XF*-H@{;1!rKH0vUEMXSO! zAFwK1wQ~Mg#>Xg1E^Fodu{mxlNq3cTQCzCV|BzCyQZ`+|Uqp)dt#Iz+1g<4u-7~3N zNZKa4`Ac<@>34OgTy5#_i=@2^{+9F}A)RN3E`d~Yje%?vOlq*njZbL5%C{}Vf3(!_00000NkvXXu0mjfwWH}} literal 0 HcmV?d00001 From c4b9a9e2752d12462288599306a7c455b2ea6764 Mon Sep 17 00:00:00 2001 From: devin Date: Wed, 4 Apr 2012 05:53:49 +0800 Subject: [PATCH 3/7] dock effect --- app/assets/javascripts/orbitdesktop.js | 30 ++++++++++ app/assets/stylesheets/desktopmain.css | 39 ++++++++----- app/assets/stylesheets/style.css.erb | 1 + app/views/desktop/index.html.erb | 79 +++++++++++++------------- 4 files changed, 97 insertions(+), 52 deletions(-) diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index 24180334..ece489b7 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -274,3 +274,33 @@ var orbitDesktop = function(dom){ orbitDesktop.prototype.themefolder = "themes"; +// 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(); + }); + + }); + + +}()); \ No newline at end of file diff --git a/app/assets/stylesheets/desktopmain.css b/app/assets/stylesheets/desktopmain.css index df68d361..39f49a35 100644 --- a/app/assets/stylesheets/desktopmain.css +++ b/app/assets/stylesheets/desktopmain.css @@ -89,6 +89,32 @@ a { text-decoration: none; } height: 30px; margin: 15px 0 0 15px; } +.docklist { + + } +.docklist li { + position: relative; + } +.dock_child { + display: none; + overflow: hidden; + position: absolute; + left: 60px; + top: 0; + } +.docklist > li:hover .dock_child { display: block; } +.dock_item { float: left; } +.fn_des.thmtxt { + line-height: 60px; + padding: 0 6px; + font-size: 15px; + position: absolute; + min-width: 48px; + text-align: center; + white-space: nowrap; + display: none; + } + .ini_input { margin: 0; padding: 0; @@ -249,19 +275,6 @@ a { text-decoration: none; } font-size: 15px; } -/* fake Orbit bar */ -#orbitbar { - height: 28px; - border-radius: 0px; - padding-top: 2px; - padding-bottom: 1px; - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.8); - background-image: -webkit-linear-gradient(top, #444, #111); - position: absolute; - z-index: 9999; - top: 0; - width: 100%; -} #group_wrapper{ } diff --git a/app/assets/stylesheets/style.css.erb b/app/assets/stylesheets/style.css.erb index 2e203a02..8d514425 100644 --- a/app/assets/stylesheets/style.css.erb +++ b/app/assets/stylesheets/style.css.erb @@ -1,3 +1,4 @@ +@import url(http://fonts.googleapis.com/css?family=Cuprum); @font-face{ font-family: 'WebSymbolsRegular'; src: url(<%= asset_path 'websymbols-regular-webfont.eot' %>); diff --git a/app/views/desktop/index.html.erb b/app/views/desktop/index.html.erb index a87241a7..0b0c211d 100755 --- a/app/views/desktop/index.html.erb +++ b/app/views/desktop/index.html.erb @@ -1,60 +1,61 @@
    -
  • -
      -
      • -
      • -
      • +
    • Home +
        +
      • App Manager
        • +
      • All Sections
        • +
      • Settings
      • -
    • -
        -
        • -
        • -
        • +
      • Publication +
          +
        • Journal Papers
          • +
        • Seminar Papers
          • +
        • Books
        • -
      • -
          -
          • -
          • -
          • -
          • +
        • Research +
            +
          • Research Domain
            • +
          • Research Project
            • +
          • Patents
            • +
          • Labs
          • -
        • -
            -
            • -
            • -
            • -
            • -
            • +
          • Experience +
              +
            • Working
              • +
            • Education
              • +
            • Honors
              • +
            • Activities
              • +
            • Clubs
            • -
          • -
              -
              • -
              • -
              • +
            • Learning & Teaching +
                +
              • Courses
                • +
              • Homework
                • +
              • Certification
              • -
            • -
                -
                • -
                • -
                • -
                • -
                • +
              • Personal +
                  +
                • myPage
                  • +
                • Blog
                  • +
                • Album
                  • +
                • Calendar
                  • +
                • Files
                • -
              • -
                  -
                  • +
                • Orbit +
                    +
                  • Academia Connection
                  • -
                  • +
                • AppStore
                +
From a7d84e8583c169c79db7a200aa704dc220bea36c Mon Sep 17 00:00:00 2001 From: devin Date: Thu, 5 Apr 2012 02:31:32 +0800 Subject: [PATCH 4/7] add tinyscrollbar --- app/assets/javascripts/desktop.js | 1 + app/assets/javascripts/orbitdesktop.js | 12 ++++++---- app/assets/stylesheets/desktopmain.css | 32 +++++++++++++++++++++----- app/views/desktop/app_manager.html.erb | 6 +++-- app/views/desktop/desktop.html.erb | 7 ++++-- app/views/desktop/index.html.erb | 2 +- app/views/desktop/sections.html.erb | 7 ++++-- public/desktop_pages/desktop.html | 2 +- public/desktop_pages/sections.html | 2 +- 9 files changed, 52 insertions(+), 19 deletions(-) diff --git a/app/assets/javascripts/desktop.js b/app/assets/javascripts/desktop.js index e957a968..af5e7b22 100644 --- a/app/assets/javascripts/desktop.js +++ b/app/assets/javascripts/desktop.js @@ -7,6 +7,7 @@ //= require jquery //= require jquery_ujs //= require jquery-ui +//= require jquery.tinyscrollbar.min //= require bootstrap //= require orbitdesktopAPI //= require orbitdesktop diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index ece489b7..d9ec29da 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -33,7 +33,7 @@ var orbitDesktop = function(dom){ }; this.bindDesktopEvents = function(){ - $("a#app_manager").click(function(){ + $("a#d_app_manager").click(function(){ var target = $(this).attr("href"); if(o.currenthtml!=target){ o.desktopData[o.currentface] = $(o.contentHolder).html(); @@ -42,7 +42,7 @@ var orbitDesktop = function(dom){ }); } }); - $("a#desktop").click(function(){ + $("a#d_desktop").click(function(){ var target = $(this).attr("href"); if(o.currenthtml!=target){ o.desktopData[o.currentface] = $(o.contentHolder).html(); @@ -51,7 +51,7 @@ var orbitDesktop = function(dom){ }); } }); - $("a#sections").click(function(){ + $("a#d_sections").click(function(){ var target = $(this).attr("href"); if(o.currenthtml!=target){ o.desktopData[o.currentface] = $(o.contentHolder).html(); @@ -122,6 +122,7 @@ var orbitDesktop = function(dom){ } }); + $('#holder').tinyscrollbar({ axis: 'x'}); } if(!o.desktopData[o.currentface]){ $(o.contentHolder).empty().load("/desktop/"+target,function(){ @@ -174,6 +175,7 @@ var orbitDesktop = function(dom){ $(".group_search").html(allApps); return false; }) + $('#holder').tinyscrollbar({ axis: 'x'}); } if(!o.desktopData[o.currentface]){ $(o.contentHolder).empty().load("desktop_pages/"+target,function(){ @@ -213,6 +215,7 @@ var orbitDesktop = function(dom){ $(".section_label ul li:not(:nth-child(1)) span.tile").hover(function(){ $(this).toggleClass("op06"); })//.mouseleave(function(){$(this).addClass("op06");}); + $('#holder').tinyscrollbar({ axis: 'x'}); }; if(!o.desktopData[o.currentface]){ $(o.contentHolder).empty().load("desktop_pages/"+target,function(){ @@ -299,7 +302,8 @@ orbitDesktop.prototype.themefolder = "themes"; $(this).removeClass('thmc1'); $fn_des.stop(true, true).fadeOut(); }); - + + }); diff --git a/app/assets/stylesheets/desktopmain.css b/app/assets/stylesheets/desktopmain.css index 39f49a35..5c8bd8cf 100644 --- a/app/assets/stylesheets/desktopmain.css +++ b/app/assets/stylesheets/desktopmain.css @@ -24,6 +24,11 @@ time, mark, audio, video { font: inherit; vertical-align: baseline; } +#container input, #container textarea, #container select, #container input:focus, #container textarea:focus { + border-radius: 0; + box-shadow: none; + font: inherit; +} /* HTML5 display-role reset for older browsers */ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section { @@ -54,7 +59,7 @@ body { font-size: 12px; background-color: #000; } -a { text-decoration: none; } +a, a:hover { text-decoration: none; } /* desktop layout */ #container { margin: 72px 0 0 156px; @@ -69,12 +74,14 @@ a { text-decoration: none; } position: absolute; top: 144px; left: 0; - z-index: 999; + z-index: 9; } #holder { - overflow: hidden; - overflow-x: auto; + /*overflow: hidden; + overflow-x: auto;*/ height: 540px; + width: auto; + position: relative; } #rwidget { height: 516px; @@ -104,7 +111,7 @@ a { text-decoration: none; } } .docklist > li:hover .dock_child { display: block; } .dock_item { float: left; } -.fn_des.thmtxt { +.fn_des.admtxt { line-height: 60px; padding: 0 6px; font-size: 15px; @@ -154,7 +161,7 @@ a { text-decoration: none; } float: left; margin: 0 12px 0 0; position: relative; - z-index: 99; + z-index: 9; } .dtitle:hover { /* $(this).addClass( .thmc1 or .thmc2 ); */ @@ -247,6 +254,19 @@ a { 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; + bottom: 0; + left: 0; + height: 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; } /* Orbit Notification */ #orbitnote { diff --git a/app/views/desktop/app_manager.html.erb b/app/views/desktop/app_manager.html.erb index 570799f9..d8948c39 100755 --- a/app/views/desktop/app_manager.html.erb +++ b/app/views/desktop/app_manager.html.erb @@ -13,8 +13,9 @@
- -
+
+
+
@@ -118,4 +119,5 @@
+
diff --git a/app/views/desktop/desktop.html.erb b/app/views/desktop/desktop.html.erb index 7ec473c8..c852ded9 100755 --- a/app/views/desktop/desktop.html.erb +++ b/app/views/desktop/desktop.html.erb @@ -1,6 +1,6 @@