From c701bed2e3572b3b5d5d192cbe3f801d016c881d Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Mon, 8 Oct 2012 15:49:48 +0200 Subject: [PATCH] fix a lot of small layout bugs and make the apps page overall prettier plus add ratings finally --- core/img/rating/s1.png | Bin 0 -> 454 bytes core/img/rating/s10.png | Bin 0 -> 848 bytes core/img/rating/s11.png | Bin 0 -> 724 bytes core/img/rating/s2.png | Bin 0 -> 731 bytes core/img/rating/s3.png | Bin 0 -> 918 bytes core/img/rating/s4.png | Bin 0 -> 989 bytes core/img/rating/s5.png | Bin 0 -> 939 bytes core/img/rating/s6.png | Bin 0 -> 992 bytes core/img/rating/s7.png | Bin 0 -> 939 bytes core/img/rating/s8.png | Bin 0 -> 987 bytes core/img/rating/s9.png | Bin 0 -> 908 bytes lib/app.php | 37 ++++++++++++++++-------------------- lib/ocsclient.php | 2 ++ settings/css/settings.css | 3 ++- settings/js/apps.js | 3 +++ settings/templates/apps.php | 2 ++ 16 files changed, 25 insertions(+), 22 deletions(-) create mode 100644 core/img/rating/s1.png create mode 100644 core/img/rating/s10.png create mode 100644 core/img/rating/s11.png create mode 100644 core/img/rating/s2.png create mode 100644 core/img/rating/s3.png create mode 100644 core/img/rating/s4.png create mode 100644 core/img/rating/s5.png create mode 100644 core/img/rating/s6.png create mode 100644 core/img/rating/s7.png create mode 100644 core/img/rating/s8.png create mode 100644 core/img/rating/s9.png diff --git a/core/img/rating/s1.png b/core/img/rating/s1.png new file mode 100644 index 0000000000000000000000000000000000000000..445d965ffeb2a64310790eb99829e92f22d48672 GIT binary patch literal 454 zcmV;%0XhDOP)WFU8GbZ8()Nlj2>E@cM*00AmVL_t(o!|m9+j)Wi> z1>mFE0%?r2z5%W8{~DIW#%QHhh?QGmyx{;&He39sawg;(lA{a)Q2u|k*6T0~D_P&S zetZTsP4l%f$vP(eG+^Ik*LAP%5V9f)==*-V9>?+3ok3P$0k%QL7#L#!0Hsva9YWT9 zlJny;O%njX7z2yh>vI@m$g&K1o`Z8vR)n>IN~zTtvo&Yq!p@OWk`-Yc8m;Skb+xFq zK78h!Z{Jr{g(OMHim=kVR_>a0VN%M=#K`iu(kIl_<{mq*i)4jax4WRCC_X+)LWswS zk>zLIz6sCsd;#`9z&ZE+vmxu*N)ed-diFMCIi7&?dM1Rh``+LQkQH$lXWJ^v^04={ wZ+mUqVp$g7lR>fqtjmGYn=xdCTa-V}FUsqJC7kViDgXcg07*qoM6N<$g7yBu%K!iX literal 0 HcmV?d00001 diff --git a/core/img/rating/s10.png b/core/img/rating/s10.png new file mode 100644 index 0000000000000000000000000000000000000000..b8d66c2a4c41085dae62d3c3408702a950cd86ed GIT binary patch literal 848 zcmV-W1F!svP)WFU8GbZ8()Nlj2>E@cM*00Oj0L_t(o!|j;AYZGA@ z$3J&(?(WSc5Zh|iYAu3;WV9|0ZY~NAB8d2(2u^M~2#$*2pqmsNbgK@If>uOOsHTY4 zw6?i4=_Qx&Fwlj8uq3NPb)$~3atPh*91818gpIENM4^RlP7w!fLSNx47hfp=j$W8cSzWC1 z$jr9YQY;p=z6z+lz8FWA!pe^mHA;luMh}Zx{s!DrKi3G|K8C;M;_HgZv(L%Mk(AZN z`eZ%maky>U05qFTrl+UTG)?Qf0}3Z*G`|jBrHm#gdjP+LDMbD_{+dfGs0|dBve?r3 z#bUAJ{DGJ7{!>phRaJyufF{N}nb9pUj@q<>8b{7Q8z?Mg_1mWNH+%oKe?hsa%XqbA zFvfaB0kp*=zH+hlo$kAoQdU1}Gy6wJNBf+=g&kqiO=dk8Ec+FdQyyGZddHX0%S;<*RpQls% a$MyqD4?3BHWb!=#0000WFU8GbZ8()Nlj2>E@cM*00KBkL_t(o!|m8TYZO5k z!14d?+`i;)A%@ea(HMjj)?#B}XA{9f1QEYUT08v)ieO_Wf`xX`!cx$P2nvxLqUOci zOZIN>=4M|lPEL=k$>tKoVxDG-9e(@3^UTc7f{y<`qVA_m)|WDE9llj6GO4|CnDAK=Ae9fjUE5`&+*eR*-L4$)SA7$d;e^DOjV69+5Ay>&{ii&L2*m0P4yfFWk+`fJ28!nCHbym{QC z7bwqM#;VL{YYb}$Hs0OJOskD>DhSgaz9eaHkaWKRkR}eMJx3PBB%vZy0ijX=oV~WJ ztud^Tiu!M_XQ`ubylK+zDv4|jpnf>OrTR6dnB{rG?SRl!%r3m7lp6r$X@juQwZ-I;dVej@^cf@R&i^`A$O4M!^N={q5Tloc$O}1qdZ|(-Ct}GhxarkWO z&An{n)g7X4P%JrZ?aLbc&8t1#^D5qW|2Wgu;afWXar^{BS9EdNxN(aB0000WFU8GbZ8()Nlj2>E@cM*00KWrL_t(o!|j+)i_<_D z#-B-=WSSOABCJA{z2|68egwS=i}+0hPaZu8-o1HV@Srz8fd}zag~hbOmZYqkw&^yL zv`ylnCMKJvjkciJc}_XZ{CLUp%sYPou76*P*_YUHoOmBB&+|Adqgs_g?%6X8<)?cw zv)}LUEg1g;OV~DmeSaS#8UX+-%i1X+*;H^=MFXb2=a6U<05BSjc1nhA+vzuFRWN{= zuVPUYA&3$vr2qiaH2)|eNg61noRtyD{qT!-@qF?D%d0aiJqtBTp)@o^>;mWV%fe(z zDeCn)TCEmTRVCM#;&?m;0QkP2j!(WhYsE@|m!BTTg5*L}8W06JofNt@!r3`2?R2C2 zhGC>E(==n>_tO+4Dl6=eSvf~1A0Nh%5zWHolXaY zkQ}Sq?Z#z^@H~&RezJ0VKy^9*88t_Z*0!0ztWzTSls?R^DtFV})X}#U47V#DH(0avg$PLnPP1X4AF( zY*%qsi2+M*2*^!b*#r3Q1nTYkpp?RKoZl|sdT-QqJvl>jR;dBZ!I(K{9-pB7;0Xaf z19*|%_6CCif*`2+G6(=@x7)dMG-qvk{p`KjdKItw+*)NEXL0>C{QwWMtLS!QP{IHJ N002ovPDHLkV1oJ=Ij#Tz literal 0 HcmV?d00001 diff --git a/core/img/rating/s3.png b/core/img/rating/s3.png new file mode 100644 index 0000000000000000000000000000000000000000..26c9baff55f066f80c1d73336c0302d1ee57a409 GIT binary patch literal 918 zcmV;H18Mw;P)WFU8GbZ8()Nlj2>E@cM*00R0+L_t(o!|j;AZ`(!` z$3NtW;)xQVN=}^Au4@#?5NNEkbm*2P0Wt&uf*}7%)^6>8kf1=9Zbg9(?UrW97@$p2 z6i$H@vV+8t5?en_kvvi)J2+BBnX1{^C<;k$AtjO@ynF9^_wF4m?f-AV;P==)co?4r z%W<5z-EJ>g?<|+)rT+8J2!n$&N#^eE?wJW=9$5NGFSrK}W1~^~Vc%H||vC;jsNhv853Y5!bEX!IL))?6OoTZFO$EMfVMPQ}wf{L4WaC>jSSV;sP zU??{5m5q7+(_@7<%_^13iPN%Lt^VyG=b4q-2Ly*ZXoi93v=O0+ZeBd91?nxrZxQBK zP_3Oz#m05rW6n%EYgtz2!ZnYq83}lS%oot}Iih?4cW_9o9P;vggoIGpsLtzCx9pQ^ z)zKdM9}i|8S?LLI z+jQMFrOn%{U%#ipv+=Y2pYF%a$Db1n?5rn)0IaXCC-%{!&T(&V52e(Sl{o#}`R>G4 sy!GohncDR%$FfIwEx)t1ft62%OgtyQ~&?~07*qoM6N<$f+`5GKL7v# literal 0 HcmV?d00001 diff --git a/core/img/rating/s4.png b/core/img/rating/s4.png new file mode 100644 index 0000000000000000000000000000000000000000..47f1f694bf74df3a1664d8b5e3d3e9e3395b4656 GIT binary patch literal 989 zcmV<310wv1P)WFU8GbZ8()Nlj2>E@cM*00TiuL_t(o!|j;AZ{uVb z$3M0c`;8MRB!vPkr9!#^d88~1Y%GVwfRGU4KRJo%HW-i?K}Za+p_3S3I~W*|;1EIu zsgM?Ny`;2pe$=u3+Of@0Vv@#be3u9?x@WN^zy9cbp6B~K?+7FSVu=kYZKYO#Zs3I@Xl^0#62`kWAMud zD=B2c0%*6}E3u{(R%F)F3OGM}2T`p9;Qap4O3IjK^?JRPSe;HMeJ?WW$_nsWA10cn zp=xDRt&C;}&hFfJAcah`gb)Cy}5}9A*fU;)a!Lj(^M{(b-&*S z!1w)h{N%mJtQ6S&{>?-!57CS&nyRNiMZ*r!=q> z)o$FnQc0F&rL0z~mH57&Dr#bjoGcn^CZmJzUQ1#_V$?Q?M=c`nqKCzPa1lUH{`HJe z&1(dGhd`C=T>pxaXyj)7YJ5C18PhZ;+c)<1_D~dMhPA)HpDa?B>$-(z&8z|S=WZ#% z5WH?1MeNJ~{tmuGt36B5ckshOX7HD>7ER2utT`vA)sm&SqO;}};m2S2T#-FV>?KM(7&S}e<&>#>WRU8J%ivNCr;)!jGn1}9M7mW!;fQCXP@7`rE+*Kj(=_`?C_Q`afg>exSi0zmDN4Z@+FYXVs;Aq2K<-?uZD z`)sq>ob1O7%gRoGXVdp=YP+wq{qhY3eoDWce*1pX`TA|bk&`b0nXGryljHI6F;dFB zw~PR6Z*R}+$^TERiyONd}~qO%^_KWu*jECdgvZ8VTS00000 LNkvXXu0mjfCsNO_ literal 0 HcmV?d00001 diff --git a/core/img/rating/s5.png b/core/img/rating/s5.png new file mode 100644 index 0000000000000000000000000000000000000000..aa225b6a9a9e2b12e4f9c5cf91fe0f0b29a20765 GIT binary patch literal 939 zcmV;c162HpP)WFU8GbZ8()Nlj2>E@cM*00R$6L_t(o!|j+oZ_`i| zhF|-}_Kg!MB!vPEr9$d}GEx=>HkKkWAS8tNCtca#AApcp*bou}Y{0;X1VsoHq#~yX z(xfzT;?%Ky?bv1r4*6^hb&4bPEO8v?kfZ30`2RA134s0R*cM9HdDD&6aPy*{(7eMf+)JoE`6;E4d92p|$gb$#uh91rHa7U&oa-aut+X zx&>3)0ff0eu>hb=7GX0T(uvDMljXEo*=%;=5YOdu`wA8}*2sN;vsVNs2(Szl#FfBH zr#k(c{RFXVaK$;WS~1+wLxe2TG=~!FOTZ| zfhbvneKwcN1?%y@7A7vN(FHJ7G)xugrJKlKUE_ey-QRZK-S;bR?!sy5;R+BTD{xUh zpYL0f2fNTxsRYK@OtU&Cmc?fix8k*rPyEAXg*oC4dkh>`)=?aC`~s_~Nqk&`vE={& N002ovPDHLkV1l6(p$h;2 literal 0 HcmV?d00001 diff --git a/core/img/rating/s6.png b/core/img/rating/s6.png new file mode 100644 index 0000000000000000000000000000000000000000..fd4f42e22c6c7e4f9ca8992df46ccfd48bd9a309 GIT binary patch literal 992 zcmV<610Vc}P)WFU8GbZ8()Nlj2>E@cM*00TrxL_t(o!|j;AZ{uVb z$3M1X`;8MRB!vPkr9!#^Wuz=Ou(2Ex142TG|KublHW-i?K}Za+p_6Wa?YQAaBsg?B z^^gwIBCeN|HqMVawqHB88A?LZByH}J*d6X!Y$>ll%JY4`@ALkEXL0!>?ERj2$G4Kp z$g*vFDJ<7@GhyZC8Pt9F2~l{wlwvNMb!dFN6xRO!{?ZKlBrNr!0p9Vggt&#KX>|Vh zY9WWLf(1~o*B4@qx;1Uqg)`t}?=wW91c3ARHw!sqRjgL4wGgY(Xbj)eW}Q0&yxP}^ zrfH~}j;iTsrr`MQ^`~;ks#rn@0BW_`Q?Ujv6+&dfQpOTH`Y{PQKht*}(s%3RgupD6 ziM=D@&_U5Q=ye{`_d-;C9ldx3@%)=u8*if*HZoy7GQOBdN(ezdpQltRVOf@Pwnent zZ2)}VAC4cqr_CAyo4-FOtJR5qJxjP*j!la-br)3F{t&No2>RNXSO9%( zi$FSnW*MVr#)BxgBCQ2 zj5TC)Z@%k-6|+XCw`Ey#FM^)uO^7rqVp^;j1^5eL|LvR?C{!XBUk$SyKzpcMriR;xrEMyB(}ou8}L2uWFU8GbZ8()Nlj2>E@cM*00R$6L_t(o!|j;QZ_;2G z$G`1M+m}LuFr7M_i-`xr(RuOU&C5(Y7!zasPj>aD|AEHDi#KE9L2uK8M-!bfW}3{D z8D%gBg|gE2ZE5QPi@;!XQb{p;E-h{Oq|f*H_IZB*M-l&UT3>v#y5|4SEW-DL!4*UX4<&jSa0Z#<*L;#T}s_UzN<&e0t0+&)s zK`8|QD2g&Q7T1^9?n~d+-lDBH=#Y?)bdW1d&o8yx9Gd z+pNHC{Qv-Xt^{6Og7389+6*?+VKW8*ICo<`_AEtFe9N-B?hIm-V1rR86e4H!RaAR_ z)Au9>DLoIbrNA{iJ_aQ2Ge1Ob+zg18cR z=~SoZvY#M!4X!u`Rx5_vE{G}1G|hb?^@=FVa_9kd64r1hxOxJ(DDZ-*2uo~(nSw`c!r*3bg9jU7NtL$8!zH8sd*R**<%pniG+07xI3gVR() zy+B-9gFQQ!%LQ}$LyJ5KYj^=n6%A8Gdg&JO*H$^;bNAlvy9a*d%{@3RJ)CGUWd)AR z=ktB@`(Q;|DwV((n>wqr%UFCqb}3%__|%_eR+#PLuv^MevW{ZP@e3ZktscTYJa7O2 N002ovPDHLkV1m@_q80!E literal 0 HcmV?d00001 diff --git a/core/img/rating/s8.png b/core/img/rating/s8.png new file mode 100644 index 0000000000000000000000000000000000000000..951c3fd3be43add49758497907ec9075314bdb1f GIT binary patch literal 987 zcmV<110?*3P)WFU8GbZ8()Nlj2>E@cM*00TcsL_t(o!|j;AZ|hVP z$3M0c`^JeBl0t!&QX#zod88~1Y%C9n0U;s8fASDYO z3etnLh}V~tHqMVawyz!A3?(LMewijiUA?o!l5ak`=bZ07*XO`vyZROmeoMU5JIQrt z*|xnFmg~BiS%oZ%`VZbG3QyOP%&W{g*56wT>+tX}^ICP;0`K%rLfk>qGrx8I14{@2K%>#P6l<8x?_2j?5F{*ik zpz9E*lAW7(DTrF`S$`N`Oa#d^&CzEidwY8*iZa34-``K>sor(nOst7Jp!(8nCFq0K zZlZ{t3BZ3&O0>$01YHL|?9FsCudI0ivn*>W_~R;`brQ0&rY_;9U-?Fn9ZBScDB5PK zvTay=W;&T?)3 zeps_=_NumwH8TN2_ZajFPU{H2-@|ARC3K1o{lJ|G-8*&NLk>!Y-zJvurWFU8GbZ8()Nlj2>E@cM*00QtyL_t(o!|j;AZ_`i^ z$G`TA?H4CfND2iSN`=$`Wuz<&Y%E1$Ku8GjpLAt|{{V!TcXZ;5Gk9GSk4?+}upORy=Hh-CX4e+aQF%_;ha~g`|Piul#zw&L`dhyVX0O zxdH&d{PJKTWu$@CXf)#ccDp^<4zRWRoDc$$NDzqxqEIx~R(?w%X<$W)r<8(H3INbF z?Ld|=;LOf5?i#P)n;Y=0Ix>_($rTaWI|w}!0+~b4*n)3+5T#j2`9;v9=b_GBf|Q#} z9ZT1B-syAz0FL7z3Vw9I-zcTXX0s?13Q$#57)U_t?M*I9T@WP)BFgcPf^Gvr?<)Wx z3>1j+0=VZRa2Z@?!etBqaOUb-s#uz)amR6DrAIa{`1`F=sR%K0 znNW^h9BN8wWfhCXLrYJoR2mBY*g3%4twN9_IF=3)C=itsdv%h1194jjw-UbS|Ia$e`s;t< z1o+lAAm?E=YH+#+)KkmIKLh~ekIca9>WLgk18aZ%FO^EsobY>xalWmiW9!H- zTu1rxiU53wpY6Q9%Ns9m!|R#JUNi-)NZsXfId01R({Zg<17qwLP6n$_4jsi??;i0f iYxn?ek~LHN3-%rR=n&6g64PY>0000=0 and $app['score']<5) $img=OC_Helper::imagePath( "core", "rating/s1.png" ); + elseif($app['score']>=5 and $app['score']<15) $img=OC_Helper::imagePath( "core", "rating/s2.png" ); + elseif($app['score']>=15 and $app['score']<25) $img=OC_Helper::imagePath( "core", "rating/s3.png" ); + elseif($app['score']>=25 and $app['score']<35) $img=OC_Helper::imagePath( "core", "rating/s4.png" ); + elseif($app['score']>=35 and $app['score']<45) $img=OC_Helper::imagePath( "core", "rating/s5.png" ); + elseif($app['score']>=45 and $app['score']<55) $img=OC_Helper::imagePath( "core", "rating/s6.png" ); + elseif($app['score']>=55 and $app['score']<65) $img=OC_Helper::imagePath( "core", "rating/s7.png" ); + elseif($app['score']>=65 and $app['score']<75) $img=OC_Helper::imagePath( "core", "rating/s8.png" ); + elseif($app['score']>=75 and $app['score']<85) $img=OC_Helper::imagePath( "core", "rating/s9.png" ); + elseif($app['score']>=85 and $app['score']<95) $img=OC_Helper::imagePath( "core", "rating/s10.png" ); + elseif($app['score']>=95 and $app['score']<100) $img=OC_Helper::imagePath( "core", "rating/s11.png" ); + + $app1[$i]['score'] = ' Score: '.$app['score'].'%'; $i++; - } - } - + if ( empty( $app1 ) ) { - return false; - } else { - return $app1; - } } diff --git a/lib/ocsclient.php b/lib/ocsclient.php index fc2095f5c1..c5c4357313 100644 --- a/lib/ocsclient.php +++ b/lib/ocsclient.php @@ -140,6 +140,7 @@ class OC_OCSClient{ $app['preview']=(string)$tmp[$i]->smallpreviewpic1; $app['changed']=strtotime($tmp[$i]->changed); $app['description']=(string)$tmp[$i]->description; + $app['score']=(string)$tmp[$i]->score; $apps[]=$app; } @@ -188,6 +189,7 @@ class OC_OCSClient{ $app['changed']=strtotime($tmp->changed); $app['description']=$tmp->description; $app['detailpage']=$tmp->detailpage; + $app['score']=$tmp->score; return $app; } diff --git a/settings/css/settings.css b/settings/css/settings.css index d5e826b33c..60a4278466 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -50,7 +50,7 @@ li { color:#888; } li.active { color:#000; } small.externalapp { color:#FFF; background-color:#BBB; font-weight:bold; font-size: 0.6em; margin: 0; padding: 0.1em 0.2em; border-radius: 4px;} small.externalapp.list { float: right; } -span.version { margin-left:3em; margin-right:3em; color:#555; } +span.version { margin-left:1em; margin-right:1em; color:#555; } .app { position: relative; display: inline-block; padding: 0.2em 0 0.2em 0 !important; text-overflow: hidden; overflow: hidden; white-space: nowrap; /*transition: .2s max-width linear; -o-transition: .2s max-width linear; -moz-transition: .2s max-width linear; -webkit-transition: .2s max-width linear; -ms-transition: .2s max-width linear;*/ } .app.externalapp { max-width: 12.5em; z-index: 100; } @@ -58,6 +58,7 @@ span.version { margin-left:3em; margin-right:3em; color:#555; } .app:hover, .app:active { max-width: inherit; } .appslink { text-decoration: underline; } +.score { color:#666; font-weight:bold; font-size:0.8em; } /* LOG */ #log { white-space:normal; } diff --git a/settings/js/apps.js b/settings/js/apps.js index 6ef33706f6..8de95100c4 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -17,6 +17,7 @@ OC.Settings.Apps = OC.Settings.Apps || { } else { page.find('span.version').text(''); } + page.find('span.score').html(app.score); page.find('p.description').html(app.description); page.find('img.preview').attr('src', app.preview); page.find('small.externalapp').attr('style', 'visibility:visible'); @@ -28,11 +29,13 @@ OC.Settings.Apps = OC.Settings.Apps || { page.find('input.enable').data('appid', app.id); page.find('input.enable').data('active', app.active); if (app.internal == false) { + page.find('span.score').show(); page.find('p.appslink').show(); page.find('a').attr('href', 'http://apps.owncloud.com/content/show.php?content=' + app.id); page.find('small.externalapp').hide(); } else { page.find('p.appslink').hide(); + page.find('span.score').hide(); } }, enableApp:function(appid, active, element) { diff --git a/settings/templates/apps.php b/settings/templates/apps.php index 0662148ebf..1e9598de1e 100644 --- a/settings/templates/apps.php +++ b/settings/templates/apps.php @@ -8,6 +8,7 @@