From 193cee2df70d47f007fb225b0dec1299e4789a2f Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Thu, 12 Apr 2012 22:18:58 +0800 Subject: [PATCH] new icons and widgets --- app/assets/images/icons/bookkeeper.png | Bin 0 -> 4915 bytes app/assets/images/icons/calendar.png | Bin 0 -> 2750 bytes app/assets/images/icons/diary.png | Bin 0 -> 2335 bytes app/assets/images/icons/doc.png | Bin 0 -> 2058 bytes app/assets/images/icons/facebook.png | Bin 0 -> 2431 bytes app/assets/images/icons/gmail.png | Bin 0 -> 2718 bytes app/assets/images/icons/iclock.png | Bin 0 -> 2867 bytes app/assets/images/icons/movies.png | Bin 0 -> 3418 bytes app/assets/images/icons/musicbox.png | Bin 0 -> 2273 bytes app/assets/images/icons/newsfeed.png | Bin 0 -> 2095 bytes app/assets/images/icons/talk.png | Bin 0 -> 1496 bytes app/assets/images/icons/ted.png | Bin 0 -> 3046 bytes app/assets/images/icons/weather.png | Bin 0 -> 3207 bytes app/assets/images/icons/youtube.png | Bin 0 -> 1527 bytes app/assets/javascripts/orbitdesktop.js | 128 +++++++++++------- app/assets/stylesheets/desktopmain.css | 2 +- app/controllers/desktop_controller.rb | 34 ++++- app/views/desktop/index.html.erb | 2 + app/views/desktop/settings.html.erb | 9 -- app/views/desktop/settings/sections.html.erb | 15 +- app/views/desktop/settings/themes.html.erb | 14 +- app/views/layouts/_orbit_bar.html.erb | 2 +- .../googlesearch/googlesearch.js | 10 ++ .../googlesearch/img/google_64.png | Bin 0 -> 5413 bytes .../googlesearch/index.html.erb | 34 +++++ public/desktop_widgets/timetable/timetable.js | 2 - public/desktop_widgets/youtube/index.html.erb | 1 + public/desktop_widgets/youtube/youtube.js | 0 28 files changed, 167 insertions(+), 86 deletions(-) create mode 100755 app/assets/images/icons/bookkeeper.png create mode 100755 app/assets/images/icons/calendar.png create mode 100755 app/assets/images/icons/diary.png create mode 100755 app/assets/images/icons/doc.png create mode 100755 app/assets/images/icons/facebook.png create mode 100755 app/assets/images/icons/gmail.png create mode 100755 app/assets/images/icons/iclock.png create mode 100755 app/assets/images/icons/movies.png create mode 100755 app/assets/images/icons/musicbox.png create mode 100755 app/assets/images/icons/newsfeed.png create mode 100755 app/assets/images/icons/talk.png create mode 100755 app/assets/images/icons/ted.png create mode 100755 app/assets/images/icons/weather.png create mode 100755 app/assets/images/icons/youtube.png create mode 100644 public/desktop_widgets/googlesearch/googlesearch.js create mode 100644 public/desktop_widgets/googlesearch/img/google_64.png create mode 100644 public/desktop_widgets/googlesearch/index.html.erb create mode 100644 public/desktop_widgets/youtube/index.html.erb create mode 100644 public/desktop_widgets/youtube/youtube.js diff --git a/app/assets/images/icons/bookkeeper.png b/app/assets/images/icons/bookkeeper.png new file mode 100755 index 0000000000000000000000000000000000000000..41b3bf260e166c4dc1c5aeaaada55c6473c8d9e5 GIT binary patch literal 4915 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 FV1mJPV{ZTe literal 0 HcmV?d00001 diff --git a/app/assets/images/icons/doc.png b/app/assets/images/icons/doc.png new file mode 100755 index 0000000000000000000000000000000000000000..36cb273b8de2888cd4da6769f4086b55eefc686f GIT binary patch literal 2058 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 YA4~4kk#e3Gp#T5?07*qoM6N<$f~sKs=l}o! literal 0 HcmV?d00001 diff --git a/app/assets/images/icons/iclock.png b/app/assets/images/icons/iclock.png new file mode 100755 index 0000000000000000000000000000000000000000..4200755e59aa93de60ff389f2450fb3374b78722 GIT binary patch literal 2867 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

I@*)O?+T?0IM@+4OpuCA_5q@f1> z^y!oH{6?dJrKP0_Sld5#T>k6zfSXXbll1b&jT>ID0Py_zbM$&W>*L?cmoKrjw1k^C zZ{oy>699gcz{igtvA({J?d@$Rm~S(|#pTPFlROXS8yg#$pkWx|>C>lZG#V+K?Gev5 ztJ<8W>T#ZLr#xylJkKLNFW-as2r4scP2zWJ%RE$C;*vDQI4m zxi%aQ5kyghAo%gnq@lPvqtHo`unL>tCLj$0XIx5ipxPgEUlwc}$3K9TQoDzThZkmN zXH)1bMRjv2OjFr)(?NkbSPtA*@i>lgaBu*n)b6n$2u@2W7xX{n=*KM6Y%lV-ZLZ&R z-qp`3nw8$1!b&L&1_ONm{#}FrC8U(63x&czQp(>=DDKlHy+zErld=UV%ebI%0inmz zJ~Qo=Qd|9ge?k0&n;JR`+|_3Twe@kCkOx*NwRh}i=l3Xz{wJjzNGX2J)X va$d7dXn8=%#I_s9@m~iA2met@?E%2QFztj7)x-Qf00000NkvXXu0mjf$+bmT literal 0 HcmV?d00001 diff --git a/app/assets/images/icons/newsfeed.png b/app/assets/images/icons/newsfeed.png new file mode 100755 index 0000000000000000000000000000000000000000..cb20cd921e88426ec2499cea48fcbb3e94fde4e0 GIT binary patch literal 2095 zcmV+~2+;S5P)X)>i_@; zg-Jv~RA_Ui4+A8oKq?!pyEtbRR~(u{F8VhJ_#ZO z510qq$C$^qNL(H&q`YK#sq#W%L?t97nmwTKQo@;((o0FO(-MLpi7y1jB*fc?z2U~Q z^KaLVD)C99{dTYO=+hd*tDp~5og=WDU$`b??rebjKe&wS51qa6)^*wIyxG{+q*|V=8)1XJiQ1v zSKZJl!a6xE$zNbP=70?)*i?oa%CNZt)3c+*9hCiZa3~m@deo_??>Gv)1h5Qe%9^IS z%@w$@3frns9Py^f!RO)4h8#cCTvmRbXG(bw$`2#%p1ne7g)sn(*%?e9}z9BOPz5!7uk_ z1MYUviL4;a{(&GY(+WEIhgh8_UVD{pBM3rJCN;ch(2( z(@7#rn-Y~RiOI{!ZB>}5#h&z)gLAMHBooZ03Ot-*3#r?I-SCe7*-w@t=-oO9i6kJvEzI=FKS&lT}r4qb8=NFpy1hApJdM*~Z?=|4d zmVdw3m)+N_h#lCr18Ca_KODfG5*&4m^YH@wJV@?P0{pdZZ!60U3b6MkUKT*LjX3Xh zp;?86XDwd}Tr&f=HwN2A!0{0NvtVy4WOK#a_Pnk#aqg?DUW$PC=i!Yxi#0&G4r`0a z*C_8a?CpezkoItdKBTk2ileUlBd|k{7hp>@*{&19vPTk}lx7DTGy*sal&qV)t3rQZ z*$dMFL!1bG#FJq#q-{_r$L%$EY7rU{?26#A5VmTJmgmF2HO$l2`qJRMDaw*3uqQ(@ zq(|bkZNqy@nFi*wh;YA zBYsn0l3RDgo>n*3#QBGT*~=TtgKdQFGmcI6%5~_nvq$@*Z6cuC zcK7LHJ2nr?4drsxl)K}pS^YQ`x@lbM`V&LJC9VXzB1vFZ*7X&`;+;Nla?xybUsFCe zT(7p(*{j%XPFlJ<4SvtUCtGIk_Az@*9lL36vdLa+(lRxa%UkpA&flHak6#(Q^|IM$ zH9Agsde~GXF|V|Ar4KC3!wJii%%PX#T@jP;#$?aqE0^g^k*y5U2^|y$pnp5uZFG8!{U2%MRR+Lfr(P=@RwEsj3LA?Geaekskqw@+BP z-q-5pS>N}(L%;$oEkpkBX*ku(2(7MpZP2<^mu)4ct25m+4>{F?!>1vC_5z*Pj%R>2 zc}i!Ttv*dV-MICHeeF1$y+CKp)&j*16I70V4VNNVzZS;Vq=eU0P3;w9M{3AM@lF=i|TP Z{SW7)fEo&MX)>i_@+ zE=fc|RA_nyeQSB_Scks8J6b zJWGNH6GMz#I2et_gOZpC1U6hi@L)t(A&Xpg4KAByrNGv%-RYm{{COUhLR?|lnYPo| z`bplUo%ep;?wt45ooEfltJiU*-V>fIPoB37i3*YL~JW zGY$-kXD-YOd9LHl))@zeRgin=e6z6VagU0WyW6cKKz6Ihj+vlV!hnjD?G_OzD&6H5 zRd!v5yDY`s*QL8~(&{?H?UoQMEt|A%lu}f~PhiJ3BYXOhy&LX(ttd|-YS&SX3q;Ic z>04E3i6#Kyo_V}!j`O7m3%$=`>n|e1{r*Ln*HQDwiI-2Iuc|gn-eTMC>BbEkRfSu< zFJot3z4KW(9HzIomuNJKrfG!3;rrG%O%uzqs8lMH%VkW{yz`x!`-XJ+TVfHnQJDY; z_xp_v8NOB>qO$&d2*uDejYJ|rB9TDTG~aDnmPN5xq*yFsSr#}3(X0Dd8<}WCDgeSg z<=^mC@dDPGH&7G>UDrvaQVk1QN}*67pU>mEF52v;te2w=wI|$@L%s}8sjp!7?<5wB zk;!CG6r~{{%i+2%xm*szFi@|5&7ghAcU#KhEbXmas}5oJ??l&ive|4)%>pQjLN=R4 z*LCdvom{I9dDdJniq|?uRiQGtmvlOfuInu|x)fd4NvG3P2KQoAedP)TDe+SB+IC{e zOiRY=N=T(r#F82E+ICO6>qU`L;-xr!BV;m}wwSGx$z*W)Mm*`R7tdWfk=@$zG5a7C zMIn*h>Z?n8URov+i6%<-&!P_RHyF>mrR7#kK@tv!aeeIcyziFm1yJLj1GNMnD+tdS zcISSA)z5j4)NF2^#Lr&dbB5h3pTi?NJO^qvV(JS-5E)hq=Wz08k*TfTqcsUpIERuy z>#weJY{2vHB%^DvwjF8DShg3?etrp2ne|oO^L-czqCAT>whL($eck+h7psUiwhK|7 z^}CctI7c7#F%lMW;~TLyeTW+y^4r9UQH%+C#@|I${bja}aE`3=Z5TkRaje02u-5Hr zNXT+%QwPyzzCzdw4Ywtn!;KlP<3_U72H(cYj5MP;0JPjudZrGdRR3sNo5DG~wkd|| zNHtC^GlH$}z)o)QTwj|zP3W)l^yH24YO^co?f@#j{{p|<+qAygP6R2T!me0UhQr|)0aESh~Cr8LpevY19wk z)zT!XfXzaH2jViZ3HNq)j@~*>;_AnNn}q43VAvh?IO&zKF&($#((j2o#A#%2$ugd z-07%B#U&OI?bZTWp_ICSf7&AV`BLCn+}cx@hJ3kNDnv6#jO7Ln@!DziJWsl z^d&^{z30PcVqwwIZ?+hw9N&M!92Nj~O?T$&Jch~m{uAc#jiQ_n0hCOtmu8$p>9}Gh yq714bk!-ifW>B@{^h8b``0R(;TQ`bw9^h~4M~KiB@cHim0000X)>i_@? zJV``BRA_;{n@fxxM-_(u)3;}^XTZ-O#WAvZEijP?i%4uDWT6PyWEEw@TSAB+Vd4dd z6+%KXLI@C%*su%9f^3rPA_OcFu{{sZ%&o(s&Z#=5s`}nL z6G2ILy1S~nyT0?RuI?d7IS(8Fa2mi@033%cB)^UT0*C-~h&yE3tK+zdfAm^}sxX^< zfMx4{TptHHl>r3Pp34$|X8`>CVPH88MPSbYc&HkT1??K3#W7iU3)|qV!OLxg;09;~ zu5}9T%LM=@9|o3bB5YT{5((e{Xh-=xg>>2-A}OMM z*v`NxtO2K{X=8_4ra|q3q>c#07L0N~0uTrU5sIGVp&tTpn$81PQ2MOECKDDd!)Q4P z!I^deFZa%FOM?nlQnuPH{nwhZYFxC7Lc1K$()1FYFD-r&Y^m`9(54^H>ci9g*MeK< zFdK9~71nCi)xia{rg@jJtq7f9xqyylUYW64gPM7W$E-Ku><9L*LTBJ1SQnwSE(>9@ zA5$B=30(NGOG6Z8rQk%_l;z?C7Fi^xZ$kHJFc!wbcJL8;$g~@gyY}NEh$)=xc>kqF zL>BPCkt>infj}ezfrm~vWkz35D9CAN5VlHF9+WyI_27fROtCsan>536os?q<#G+9P z6$sRc;E19>bkbMG*t-F`05t`+3}!=qyjveG%~&CV_A_SOg4XMXI6h5Tee&A^tn%3e zThvh@oMhStu%%@OD-De(jZlEA)r4rW5w$j7N`cG>s7oeY402Z36tt{qqp4vkwQI+h z7=56M9L9eYj{OC)t_z<9i#u?d{qoaTYzwwbQwm!8uuV~|qS08!O9Gm}K}p-zdu>E^smTVc zF5jbf+AX843c$9tV687xA%rq;m6~>1HhwIi6bRg9KdjAIF33@XL;|Q5-sLus_2Cp@ zO9%^~{RaHo2CO1YIX`Xyd;c|X6rn*7Q!b#@DpZRK->DBrF6P*$ciJs9LI$!4Rt7UG zAgl3~mWx70yUC1oMx_HUgA>Plr#gX8fX^b&P>^Xh{ytU;`oDqZAsK@48SF!rqIc(kdR|C*!*KVb$w*xNC`{?(6(iq+J zvi^_rc;H(<+wpl@xBiVIUps?-|9vy{-?)4cZ=8A@o7dhjxfYItEgu72(iniLrZ;0T zGufS$?G1$0m6^Nm`OpcRc=_*G{P-v8AlqUg5@2WprG|G@y6Ih-Wi;B=X&-*>EV_k7 zB$p{U%%msAPA7$8yPLw}-JKS;fNpovy8qPo{n%SP1kj%kjTjvPBLE`;jQ~CF4;@bR z7y(DW^J5%*?DOtMw|@IPuK(h@QL7^YD4<(d#7CaJSPkmp7ms=~GZPJFfbVVK#IsB2 z_P*PlcloJDvG&(LfiS{*9(fGMfACxr`oe>I!D9x-h-pl=JO&{3os)tVIo@8miSf!! zjF;tiXSupbxVwV!otqfny%o2s%aG@|x+LL|2$hmB(|o;AXfy&k0`nLvXJ5kQZ+^Df zZ~lGn&+~}^uHGJiOs{13#xJ_s$EcqxZZME~0GxQ{t#*TyYd`%GwpZT9e4*jw+XN61 zR{!!x@b*@`w<+&B_Cai3y^_}CmAD%ifS+c-?Uf8(tGUD>*I-3wfwlmO6Z4qI<8f#&zjbglU# z$Ls6gnCvpZ{~7r8ryhh`FAJRC4oD>J_Z_az3v0LC@qLd!*}VS7G|KQX>@d+Jzw z`)UH9$tO%}lYBbV@BS~GnK+p3n>XUra-W||ANl%^CY}cXZ~pM~@VLxQ=Nj1b&?gjq zJmWS+etd)Pzl#z!@9pZmmEXUFJLi5kFkZ8g0tGGyX#1KrYUSZ>l%8RomUmSM7|l)Z zX3DLXe~l~O&a=Pjb*n85^yN}1vphc9ljIlHSF0O_^)+lPV)W|45tErqqXS5`dD<7Z-NFKBVXtfF&2@zB^}Nb4B2Yg-d7N%AE%!H zQPegwr}g6WdIStY0Zq~(4;Iy2I|VuR5C)bVxYSwgT7g&rl(9vFRuX(N5306F%SOB0 z33SqO99)9d1#wk4DR^7Md2kt??FVOS-qj~dR=eEZ%5I;)LLRg;W21T3*FIh8U__%V zK2II8Gx}vRR-qJUjbTZ?BWVWR++{1{Pc1xqu&Om*=Uf#5kdo&)){{VBbhRrrPH0gTk@dlF6AdmuFhG9{bd34 zHefk3R=;eRuhXhRGshgxl8^O#lY7(hZ7VGmT6P+2e0Wy-cWDh)D7jBxY1jI4fUIxV zzFS3P(OwE<4ETj{n!%)NEwcglX3RAt+pqHqD`E9vms15WL9@KyiH7T*sw^}^UThgN zuD$>$eAp}iI89ey02G?#2CQtkk+bucdhy&o1}mfGKmu(?LIyL}>A*+>m6&x(QL14! z@I$}~S^9Aiz}Wh=Gw()S(ss*-(;yi6gRjC*OEWfUD9$U4w$+T~x=aoKwer(#+V=q~ zeZ@0zV$#sOy-omn1i>H$jdzY{L(obg8U@MhlqL6SurfZZ0vRgRcUlE#!?c|l7qDE` z$#rrb4q~_|suFNR%iP$q2z_AkU;$cl?p$98hJk*Kfd!pd zummi9lde3ygjVzzLOJ>7Oab3bbu! zlCNbre}$)zja0;H;zOl^Z3i%$Q*D~ES}Y$eb$^M0{t|!(0PL5^Mh;5`n#$B9gJ;M) zA7nGOlMNVnU}rvT_gj9P_6@8P0-NZ~SP8%-0R1Yk^a^nNlaruDGwJJN0rgM@+-ex` z0+>`BY=m-;cxB|C@r(GC0K5WV6<8V_0}kv5PQEGUEiy1CqfGj+nvv(bCQ$ zI(Fc7P-82E2JB5>c_bAZuLI8?0`4sW9~i}d-tvQFqs`J4%`!&XD}&E0rHaZkfNE6| oOorVAmX?60Uj&}KDgTQ1UxTaytA9}}H~;_u07*qoM6N<$f@4dlrT_o{ literal 0 HcmV?d00001 diff --git a/app/assets/images/icons/weather.png b/app/assets/images/icons/weather.png new file mode 100755 index 0000000000000000000000000000000000000000..d7033439980715c716de32ea7aa3534c2c20a4b7 GIT binary patch literal 3207 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 literal 0 HcmV?d00001 diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index 03efc5dd0..62556aecc 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -15,7 +15,7 @@ var orbitDesktop = function(dom){ this.sectionList; this.initialize = function(){ var theme = o.theme; - $.getJSON("/desktop/get_desktop_settings",{id:o.desktopId},function(desktopSettings){ + $.getJSON("/desktop/get_desktop_settings",{"get":"desktop","desktopid":o.desktopId},function(desktopSettings){ if(desktopSettings){ theme = desktopSettings.theme; o.theme = theme; @@ -103,20 +103,20 @@ var orbitDesktop = function(dom){ var bindHandlers = function(){ var groupWrapperWidth = 0; var groupWrapperHeight = 0; - $(".element").mousedown(function(){ + $("div#desktop .element").mousedown(function(){ currentElement = $(this); elementParent = $(this).parent(); }) - $(".group").mouseenter(function(){ + $("div#desktop .group").mouseenter(function(){ targetParent = $(this); }) - $(".group").each(function(){groupWrapperWidth+=$(this).width();}) + $("div#desktop .group").each(function(){groupWrapperWidth+=$(this).width();}) groupWrapperWidth+=200; groupWrapperHeight = $(".group").height() + 20; // groupWrapperHeight = (groupWrapperHeight > ($(window).height()-extraspace))? $(window).height()-extraspace:groupWrapperHeight; - $("#group_wrapper").css("width",groupWrapperWidth); + $("div#desktop #group_wrapper").css("width",groupWrapperWidth); - $(".grp").sortable({ + $("div#desktop .grp").sortable({ connectWith: ".grp", tolerance: 'pointer' , revert:true, @@ -128,19 +128,19 @@ var orbitDesktop = function(dom){ //targetParent.width(currentElement.width()); var newWidth = targetElementWidth+currentElementWidth; targetParent.css("max-width",newWidth); - var newParentWidth = $("#group_wrapper").width()+currentElementWidth; - $("#group_wrapper").css("width",newParentWidth); + var newParentWidth = $("div#desktop #group_wrapper").width()+currentElementWidth; + $("div#desktop #group_wrapper").css("width",newParentWidth); }else if(targetParent.height()<540){ var newWidth = targetElementWidth - (540-targetElementWidth); targetParent.css("max-width",newWidth); - var newParentWidth = $("#group_wrapper").width()+currentElementWidth; - $("#group_wrapper").css("width",newParentWidth); + var newParentWidth = $("div#desktop #group_wrapper").width()+currentElementWidth; + $("div#desktop #group_wrapper").css("width",newParentWidth); } } }); - $('.tinycanvas').tinyscrollbar({ axis: 'x'}); - $("div.scrollbar").hover(function(){ + $('div#desktop .tinycanvas').tinyscrollbar({ axis: 'x'}); + $("div#desktop div.scrollbar").hover(function(){ $(this).removeClass('op01'); }, function(){ $(this).addClass('op01'); @@ -162,7 +162,7 @@ var orbitDesktop = function(dom){ } var loadTiles = function(id){ - $("div#group_wrapper").empty(); + $("div#desktop div#group_wrapper").empty(); $.getJSON("/desktop/getgroups",{sectionid:id},function(groups){ var tilecolors = o.themesettings.tilecolor; var opacity = ["op05","op06","op07","op08","op09"]; @@ -178,7 +178,7 @@ var orbitDesktop = function(dom){ $li = $('

  • '+tile.title+'

    Loading...
  • '); $group.find("ul").append($li); }) - $("div#group_wrapper").append($group); + $("div#desktop div#group_wrapper").append($group); }) bindHandlers(); o.initializeWidgets(); @@ -191,19 +191,19 @@ var orbitDesktop = function(dom){ var tempstyle=""; if(i==0){ tempstyle = "style='display:none;'"; - $("span#section_heading").text(section.name); + $("div#desktop span#section_heading").text(section.name); } - $("ul#section_list").append($('
  • '+section.name+'
  • ')); + $("div#desktop ul#section_list").append($('
  • '+section.name+'
  • ')); }) bindSecondaryHandlers(); }) } var bindSecondaryHandlers = function(){ - $("ul#section_list li.section_name").click(function(){ - $("li.section_name").show(); + $("div#desktop ul#section_list li.section_name").click(function(){ + $("div#desktop li.section_name").show(); $(this).hide(); - $("span#section_heading").text($(this).text()); + $("div#desktop span#section_heading").text($(this).text()); loadTiles($(this).find("a").attr("href")); }) } @@ -221,49 +221,45 @@ var orbitDesktop = function(dom){ } }; this.tempFunc = function(th){ - //o.notify("This is test notification!!","alert",2) - console.log(th); - $.post("/desktop/save_desktop_settings",{"id":o.desktopId,"theme":th},function(){ - o.notify("Settings Saved!!","success"); - }) + } this.initializeAppSearch = function(target){ o.currenthtml = target; o.currentface = "apps_manager"; var searchArray,allApps; var bindHandlers = function(){ - $("#group_wrapper").css("min-width",$(window).width()-100); - $(".group_search").css("width",$(window).width()-200); + $("div#app_manager #group_wrapper").css("min-width",$(window).width()-100); + $("div#app_manager .group_search").css("width",$(window).width()-200); //for textbox search - $("#searchbox").focus(function(){$(this).val("");}).keyup(function(e){ + $("div#app_manager #searchbox").focus(function(){$(this).val("");}).keyup(function(e){ if($(this).val()){ - $(".search_result").empty(); - $("#seperator").hide(); - searchArray = $(".element:containsi("+$(this).val()+")"); + $("div#app_manager .search_result").empty(); + $("div#app_manager #seperator").hide(); + searchArray = $("div#app_manager .element:containsi("+$(this).val()+")"); if(searchArray.length>0){ - $("#seperator").show(); + $("div#app_manager #seperator").show(); searchArray.each(function(){ var $newelement = $(''); - $(".search_result").prepend($newelement); + $("div#app_manager .search_result").prepend($newelement); }) } - }else{$("#seperator").hide();$(".search_result").empty();} + }else{$("div#app_manager #seperator").hide();$("div#app_manager .search_result").empty();} }).blur(function(){$(this).val("Search");}); //for Alphabet sorting - $("a#alphabet_sort_btn").click(function(){ + $("div#app_manager a#alphabet_sort_btn").click(function(){ switch ($(this).attr("href")){ case "ascending": $(this).attr("href","descending").find(".thmtxt").text("Alphabet [Z-A]"); - allApps = $(".group_search .element").sort(sortAscending); + allApps = $("div#app_manager .group_search .element").sort(sortAscending); break; case "descending": $(this).attr("href","ascending").find(".thmtxt").text("Alphabet [A-Z]"); - allApps = $(".group_search .element").sort(sortDescending); + allApps = $("div#app_manager .group_search .element").sort(sortDescending); break; } - $(".group_search").html(allApps); + $("div#app_manager .group_search").html(allApps); return false; }) $('.tinycanvas').tinyscrollbar({ axis: 'x'}); @@ -295,13 +291,13 @@ var orbitDesktop = function(dom){ o.currentface = "sections"; var elementParent,element,groupWrapperWidth; var bindHandlers = function(){ - $(".group").width(530); - $(".group").each(function(){groupWrapperWidth+=$(this).width();}) + $("div#sections .group").width(530); + $("div#sections .group").each(function(){groupWrapperWidth+=$(this).width();}) groupWrapperWidth+=200; // groupWrapperHeight = $(".group").height() + 20; // groupWrapperHeight = (groupWrapperHeight > ($(window).height()-extraspace))? $(window).height()-extraspace:groupWrapperHeight; - $("#group_wrapper").css("width",groupWrapperWidth); - $("#group_wrapper .to_drop").sortable({ + $("div#sections #group_wrapper").css("width",groupWrapperWidth); + $("div#sections #group_wrapper .to_drop").sortable({ start:function(){ var $elementParent = $(this).parent().parent(); elementParent = $elementParent; @@ -312,7 +308,7 @@ var orbitDesktop = function(dom){ elementParent.find("div.section_label ul li:not(:nth-child(1))").fadeOut(500); } }); - $(".section_label ul li:not(:nth-child(1))").droppable({ + $("div#sections .section_label ul li:not(:nth-child(1))").droppable({ drop:function(){ if($("#"+$(this).attr("data-category")+" .element").length>=24){ o.notify("Section is full.","alert"); @@ -388,7 +384,7 @@ var orbitDesktop = function(dom){ o.currenthtml = target; o.currentface = "settings"; var bindHandlers = function(){ - $("ul#setting_left_nav li a").click(function(){ + $("div#settings ul#setting_left_nav li a").click(function(){ var tfunc = $(this).attr("href"); switch(tfunc){ case "themes": @@ -398,10 +394,10 @@ var orbitDesktop = function(dom){ sections(); break; } - $("ul#setting_left_nav li a").removeClass('thmc1 thmtxt').data('clicked',null); + $("div#settings 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(){ + $("div#settings ul#setting_left_nav li a").hover(function(){ $(this).removeClass('admtxt').addClass('thmc1 thmtxt'); }, function(){ var t = $(this).data('clicked') ? '' : 'thmc1 thmtxt'; @@ -415,9 +411,31 @@ var orbitDesktop = function(dom){ sh = $(this).siblings('.s_tab').height(); $(this).css({'height': h-sh-24}).tinyscrollbar({ axis: 'y'}); }); + + $("a#name_save_btn").click(function(){ + var desktopnm = new Array; + $("#desktop_names input").each(function(){ + desktopnm.push($(this).val()); + }) + $.post("/desktop/save_desktop_settings",{"save":"desktopnames","desktopid":o.desktopId,"desktopnms":desktopnm},function(result,status){ + if(status=="success"){ + if(result[0].success=="true") + o.notify("Names Saved!!","success",2); + else + o.notify("Name saving failed!!","imp",2); + }else{ + o.notify("Connection problem!!","alert",2); + } + }) + }) } - $("div#panel_r").load("/desktop/settingsections",function(){ + $("div#settings div#panel_r").load("/desktop/settingsections",function(){ + $.getJSON("/desktop/get_desktop_settings",{"get":"sectionnames","desktopid":o.desktopId},function(sectionnames){ + $("#desktop_names input").each(function(i){ + $(this).val(sectionnames[i]); + }) bindHandlers(); + }) }) } @@ -427,7 +445,16 @@ var orbitDesktop = function(dom){ o.changeTheme($(this).find('.theme_name').text()); $(".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($(this).text()); + $.post("/desktop/save_desktop_settings",{"save":"theme","desktopid":o.desktopId,"theme":$(this).text()},function(result,status){ + if(status=="success"){ + if(result[0].success=="true") + o.notify("Theme Saved!!","success",2); + else + o.notify("Theme saving failed!!","imp",2); + }else{ + o.notify("Connection problem!!","alert",2); + } + }); }); $('.tinycanvas').each(function(){ var h = $(this).parent().height(), @@ -460,8 +487,11 @@ var orbitDesktop = function(dom){ }); } - $("div#panel_r").load("/desktop/settingthemes",function(){ + $("div#settings div#panel_r").load("/desktop/settingthemes",function(){ + $.getJSON("/desktop/get_desktop_settings",{"get":"theme","desktopid":o.desktopId},function(theme){ + $("#st1 ul.theme_list li:containsi("+theme+")").addClass("thmc1").find("span").addClass("thmtxt"); bindHandlers(); + }) }) } @@ -510,7 +540,7 @@ orbitDesktop.prototype.widgetfolder = "desktop_widgets"; orbitDesktop.prototype.desktopId = "1"; orbitDesktop.prototype.notifyImgPath = "temp"; orbitDesktop.prototype.iconPath = "/assets/icons/"; - +orbitDesktop.prototype.currentLanguage = "en"; var uselessfunction = function(){ $.post("/desktop/temp_func",{sectionid:"4f83e7bbbd98eb041600001d"}); } diff --git a/app/assets/stylesheets/desktopmain.css b/app/assets/stylesheets/desktopmain.css index f862c7bd5..35121f3de 100644 --- a/app/assets/stylesheets/desktopmain.css +++ b/app/assets/stylesheets/desktopmain.css @@ -271,7 +271,7 @@ a:focus { outline: none; } .theme_plate > div:first-child { margin-right: 48px;} .s_title { font-size: 15px; line-height: 60px; text-align: left; } .s_action { padding: 24px 0; overflow: hidden; } -#theme_submit { +.setting_btn { display: block; float: right; font-size: 15px; diff --git a/app/controllers/desktop_controller.rb b/app/controllers/desktop_controller.rb index 2706fc8a8..4cf425a2c 100644 --- a/app/controllers/desktop_controller.rb +++ b/app/controllers/desktop_controller.rb @@ -35,16 +35,42 @@ class DesktopController< ApplicationController #ajax data load.... def save_desktop_settings - @desktop = Desktop.find(params["id"]) - @desktop.update_attributes(:theme => params["theme"]) + @desktop = Desktop.find(params["desktopid"]) + @savewhat = params["save"] + case @savewhat + when "theme" + @desktop.update_attributes(:theme => params["theme"]) + when "desktopnames" + @sections = @desktop.sections + x = 0; + @sections.each do |section| + @desktopnewnames = params["desktopnms"] + section.update_attributes(:name => @desktopnewnames[x] ) + x = x+1 + end + end a = Array.new a << {"success"=>"true"} render :json=>a.to_json end def get_desktop_settings - @desktop = Desktop.find(params["id"]) - render :json => @desktop.to_json + @desktop = Desktop.find(params["desktopid"]) + @getwhat = params["get"] + case @getwhat + when "desktop" + render :json => @desktop.to_json + when "sectionnames" + secnames = Array.new + @sections = @desktop.sections + @sections.each do |section| + secnames << section.name + end + render :json => secnames.to_json + when "theme" + @theme = @desktop.theme + render :json => @theme.to_json + end end def getgroups diff --git a/app/views/desktop/index.html.erb b/app/views/desktop/index.html.erb index 9e9eef50f..fb3cf6425 100755 --- a/app/views/desktop/index.html.erb +++ b/app/views/desktop/index.html.erb @@ -59,6 +59,7 @@
    +
    @@ -81,6 +82,7 @@ orbitDesktop.prototype.notifyImgPath = "/assets/"; orbitDesktop.prototype.desktopId = "<%= @desktop.id %>"; orbitDesktop.prototype.sectionId = "<%= @section.id %>"; + orbitDesktop.prototype.currentLanguage = "<%= I18n.locale %>"; //uselessfunction(); var od = new orbitDesktop("#ajax_container"); o.notify("Notification Working!!","imp",3) diff --git a/app/views/desktop/settings.html.erb b/app/views/desktop/settings.html.erb index 7d29ea8ad..df41ef601 100644 --- a/app/views/desktop/settings.html.erb +++ b/app/views/desktop/settings.html.erb @@ -22,15 +22,6 @@
    -
    \ No newline at end of file diff --git a/app/views/desktop/settings/sections.html.erb b/app/views/desktop/settings/sections.html.erb index 784d0fd2b..02e538d8e 100644 --- a/app/views/desktop/settings/sections.html.erb +++ b/app/views/desktop/settings/sections.html.erb @@ -1,19 +1,18 @@ -
    +
    Sections Name
    -
      -
    • -
    • -
    • -
    • +
        +
      • +
      • +
      • +
    -
    \ No newline at end of file diff --git a/app/views/desktop/settings/themes.html.erb b/app/views/desktop/settings/themes.html.erb index f43d45099..061be9aa2 100644 --- a/app/views/desktop/settings/themes.html.erb +++ b/app/views/desktop/settings/themes.html.erb @@ -1,4 +1,3 @@ -
    • Select Theme
    • @@ -11,21 +10,13 @@
        -
      • default
      • +
      • default
      • snake
      • sexy
      • vintage
      • natural
      • chris
      • Wood
      • -
      • Wood
      • -
      • Wood
      • -
      • Wood
      • -
      • Wood
      • -
      • Wood
      • -
      • Wood
      • -
      • Wood
      • -
      • Wood
      @@ -66,12 +57,11 @@
    - \ No newline at end of file diff --git a/app/views/layouts/_orbit_bar.html.erb b/app/views/layouts/_orbit_bar.html.erb index 2322b62fc..0ab9af1af 100644 --- a/app/views/layouts/_orbit_bar.html.erb +++ b/app/views/layouts/_orbit_bar.html.erb @@ -15,7 +15,7 @@