From b091394a90a22767ec08259eb19a2b0d0294c25d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Thu, 14 Aug 2014 15:48:38 +0200 Subject: [PATCH] introduce new app page layout filter installed and not-installed apps properly kill unneeded file load category 'Installed' on page load adding documentation links new apps mgmt: first style adjustment apps mgmt: only show license and preview if they exist adding buttons new apps mgmt: fix for mobile use app icon if available new apps mgmt: position enable/disable toggle to the right new apps mgmt: proper display of icons or previews new apps mgmt: fix loading spinner reenable group selection for apps new apps mgmt: position enable button normally again new apps mgmt: clarify wording from 'Installed' to 'Enabled' reintroduce enable/disable Move rating image path generation to client-side Move expression outside of l10n fix group handling add buttons for 'More apps' and 'Add your app' again disable changed date of app for now adding recommended label style 'Recommended' app tag fixing php warning sort by rating adding meta-category 'Recommended' Only show existing documentation links lacy loading of screenshots making group based app activation work again adding support to get the app icon not only by the app name but also simply by the fixed name 'app.svg' adding app.svg for all core apps query string '?installed' is not longer needed update and uninstall is back + error feedback remove unneeded parameter fix alignment of 'recommended' label --- apps/files_encryption/img/app.svg | 51 +++ apps/files_external/img/app.svg | 212 +++++++++++++ apps/files_sharing/img/app.svg | 54 ++++ apps/files_trashbin/img/app.svg | 54 ++++ apps/files_versions/img/app.svg | 103 +++++++ apps/user_ldap/img/app.svg | 61 ++++ apps/user_webdavauth/img/app.svg | 61 ++++ core/img/rating/s0.png | Bin 0 -> 299 bytes core/img/rating/s1.png | Bin 299 -> 441 bytes core/img/rating/s10.png | Bin 557 -> 464 bytes core/img/rating/s11.png | Bin 464 -> 0 bytes core/img/rating/s2.png | Bin 441 -> 594 bytes core/img/rating/s3.png | Bin 594 -> 620 bytes core/img/rating/s4.png | Bin 620 -> 602 bytes core/img/rating/s5.png | Bin 602 -> 621 bytes core/img/rating/s6.png | Bin 621 -> 603 bytes core/img/rating/s7.png | Bin 603 -> 621 bytes core/img/rating/s8.png | Bin 621 -> 584 bytes core/img/rating/s9.png | Bin 584 -> 557 bytes core/templates/layout.user.php | 2 +- lib/private/app.php | 118 ++++--- lib/private/installer.php | 3 +- lib/private/ocsclient.php | 2 + settings/ajax/apps/categories.php | 30 ++ settings/ajax/apps/index.php | 65 ++++ settings/ajax/apps/ocs.php | 68 ---- settings/ajax/updateapp.php | 21 +- settings/apps.php | 21 +- settings/css/settings.css | 61 +++- settings/js/apps-custom.php | 26 -- settings/js/apps.js | 497 ++++++++++++++---------------- settings/js/old-apps.js | 0 settings/routes.php | 8 +- settings/templates/apps.php | 133 ++++---- 34 files changed, 1141 insertions(+), 510 deletions(-) create mode 100644 apps/files_encryption/img/app.svg create mode 100644 apps/files_external/img/app.svg create mode 100644 apps/files_sharing/img/app.svg create mode 100644 apps/files_trashbin/img/app.svg create mode 100644 apps/files_versions/img/app.svg create mode 100644 apps/user_ldap/img/app.svg create mode 100644 apps/user_webdavauth/img/app.svg create mode 100644 core/img/rating/s0.png delete mode 100644 core/img/rating/s11.png create mode 100644 settings/ajax/apps/categories.php create mode 100644 settings/ajax/apps/index.php delete mode 100644 settings/ajax/apps/ocs.php delete mode 100644 settings/js/apps-custom.php create mode 100644 settings/js/old-apps.js diff --git a/apps/files_encryption/img/app.svg b/apps/files_encryption/img/app.svg new file mode 100644 index 0000000000..1157c71c66 --- /dev/null +++ b/apps/files_encryption/img/app.svg @@ -0,0 +1,51 @@ + +image/svg+xml \ No newline at end of file diff --git a/apps/files_external/img/app.svg b/apps/files_external/img/app.svg new file mode 100644 index 0000000000..df1bfd163f --- /dev/null +++ b/apps/files_external/img/app.svg @@ -0,0 +1,212 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apps/files_sharing/img/app.svg b/apps/files_sharing/img/app.svg new file mode 100644 index 0000000000..d64e44b70b --- /dev/null +++ b/apps/files_sharing/img/app.svg @@ -0,0 +1,54 @@ + + + + + + image/svg+xml + + + + + + + + diff --git a/apps/files_trashbin/img/app.svg b/apps/files_trashbin/img/app.svg new file mode 100644 index 0000000000..b749f9879e --- /dev/null +++ b/apps/files_trashbin/img/app.svg @@ -0,0 +1,54 @@ + + + + + + image/svg+xml + + + + + + + + diff --git a/apps/files_versions/img/app.svg b/apps/files_versions/img/app.svg new file mode 100644 index 0000000000..862b0a6885 --- /dev/null +++ b/apps/files_versions/img/app.svg @@ -0,0 +1,103 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/apps/user_ldap/img/app.svg b/apps/user_ldap/img/app.svg new file mode 100644 index 0000000000..63a065afdc --- /dev/null +++ b/apps/user_ldap/img/app.svg @@ -0,0 +1,61 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/apps/user_webdavauth/img/app.svg b/apps/user_webdavauth/img/app.svg new file mode 100644 index 0000000000..63a065afdc --- /dev/null +++ b/apps/user_webdavauth/img/app.svg @@ -0,0 +1,61 @@ + + + + + + image/svg+xml + + + + + + + + + diff --git a/core/img/rating/s0.png b/core/img/rating/s0.png new file mode 100644 index 0000000000000000000000000000000000000000..9d5014106e5a6a966af40025839cc05180b53ee7 GIT binary patch literal 299 zcmV+`0o4A9P)hH`2g==JvAG*Cry3 zOSy^oc)mvOX#;`Fm*lvC*p+(xt@Bjc)K69|@9ExegH*1NhYG6P@ez*002ovPDHLkV1hr)gaiNp literal 0 HcmV?d00001 diff --git a/core/img/rating/s1.png b/core/img/rating/s1.png index 9d5014106e5a6a966af40025839cc05180b53ee7..6846c8771f5036d485e913851f962582365fdd97 100644 GIT binary patch delta 427 zcmV;c0aX600=WZ_7=H)@0001!tSi6(004?mOjJbx0070s#mvmi*4EbDs43pw-ruh= zdQv!&WG&0BJ9t3?ZPna&PnaiTJFO^?(XjI z#VPN|Pw&-C@y##s&QtN+fAQR!^3X-{)mZY@Rr1_d^53xZ)_*|s*;@79UH0K(_V)Jo z-kkUAwfF42`}NrW|Njf)a_0a500DGTPE!Ct=GbNc007-dL_t(IPrcOH4uU`o1<>o% zx{l%k0&d`j`~Ux*9Ys)iGu8XTzUBCVnGJtbatOMbPtiiR(*j4~{}9Atn_eS}}(L0n1(*4PDdn?(K6=1p-E%H=f9gm(Mr9 zDHQ@b@jPzd`Lj-ifM(pPciC-LkgH%N0ve5hdstH|$Rrr6M!@EID1WnI002ovPDHLkV1mZb+r$6> delta 284 zcmV+%0ptF;1FHg%7=Hu<00011T*kow000|MOjJbx0070s#mvmi*4EbE-rncu=kD(A z_V)Jw|Nq6&)CK?m00DGTPE!Ct=GbNc006#8L_t(2Q=QB)PQySDK+!MOF)c?3V^Aoq z{YxLQrjJNL8wn2JikhQS5Vu~#6r-;<(!hV__OjI1CL)bXxqpfHc)mvOX#;`Fm*lvC z*p+(xt@Bjc)K69|@9ExeiZ;kJxL~_o=~3v0000lMdRTpnw%vru*NOSM7kWb9J5<{;l7GC_$Qt5(no>L4str8w(QO zu4&?#5dCb^*frI<7!PhAH^;7tboJ4;dTr(XJbO1*#$Ugny!-Xo`}OAh`0xM!|GH7Dvj6}9 z0d!JMQvg8b*k%9#0Ru@yK~y-)y_8#Xf-n$;X=xjgcp+Yp(kjuYu~ty=S_|Iw|NkS& zpiUfoTs<$zd=GnaHk&BQ)3nOZ!oZo&i*N`feK|HGl{GWJOg ze1Je|B!txCxkq0-j38rH)6fneD6YS{-a=s(1!a~+wLJ_H22y=xV$Z}m2+0E>5kQ`! zmgBU$-D-uTfl$<+o2O9nMtrY8C?y|2NKB9_8Du@8m20V#@dku+F-DRB#tpI5-(SIy mslG@Ci_7K*5Z(K-AD|QM%U#B~Q%Dv700000WbcEP))&^wlw3oL*%9ZT@vmoilLFva#>BnyBwJYk$f$Gaf>%Bzl&6(@YhwQu}?7v9t&w1^_FzwDs z?a*57(yQ*nLGHs#@5L$a$WQOpOz_J&@y##s&QtN*qVe2+@!Xp7&_(jqSn}3Y^4wSQ z->~%7K=j#K_1<0f;bQmRocHUs_w2m;_1OFM=KT2YXU_bM00001bW%=J06^y0W&i*H zzDYzuR5(w)$X!~3Ko~&bVzxmnGpSK)7UlDx)={`A2-LYiFEbRwr%D8JbO1*#8KuqElU8|kwk>Bd3n z$4u$RZtArw>dArX%SP+HMC;9&>&}PlydvzsNbJvf?ZPna&Lv6h&|2-%tM0==?!!y& z?(Xl!DeuTn@6}B3%Q^AQFY(S(@!O)2fG~gi_2&He@Bjb*x>2jM00001bW%=J06^y0 zW&i*IC`m*?R5(w)(%VvlFc1ddRn!!N2hwUpJb+>gR-hK`K`ljV>-)cv8!1uYj-dYq z$$azAu*(4OZ+Tx-C<~h-fWWB`Ad$6&_ZNS0 zLMfq5(A#5R`?K+V(%CyWe^?3%u|g>M3gwv+K`?kq({vm~z4*>$hJl0wP`a*(s1PO@ z%wLAXDDu2h*ECjw)>CL0e10eq=FCs=1)gW!nEEQGyqMQAMZ&Zv_=P;na`k0Fa*pp> zZ2}nC6R`kehmv@)CsikauH*Fj{fk@^wkt_2DrWidN7p8Rqd1A%%yrpLxra@40@#n4 zetg+#nOl-XgHo}qIsq8QwK%S}HzjEr7YEli)Cu6ZxZFw#E0_B8r}+e<@GBH5b(RdQv!&WG&0BJ9t3?ZPna&PnaiTJFO^?(XjI#VPN|Pw&-C@y##s z&Qp=dFn|C5{|n=C=Kufz0d!JMQvg8b*k%9#0NqJMK~y+Tz0}zbfIQly# zej`h)M5jg2^LL5sOKcC0LMb686+$pwXIYj+lz&G^24H3)4U){K`|WHN83~cOI?AU| zAxYoQ9u34ETjhm1Bx$EfbZ<~vF^2*H%U&7{UDNXJ?Q>5B0!E%Up2&-r&o{p*6#_c( zJZ|6lvrdJ8X56ZG*=<&kt6(Jp8jXQ_SW_#=7^_CW=6NW8vti}%J^eH{qpuUs+19w{ Q01E&B07*qoM6N<$f)ClXiU0rr diff --git a/core/img/rating/s3.png b/core/img/rating/s3.png index 2f132cc5fa1e390131bab916c26b0c861799a228..55e917f92e65d0c79f4f8e0c3c658274a91bc705 100644 GIT binary patch delta 353 zcmV-n0iOQS1ndN`6#;)jNkl1Pjj_34~US0#qabdpd0i zBus*+Nbv3@NvB&Uf}}zg5*7M*_B&oOevDfON0(2_67f-xSaW|)0qa77@&x|iB~8}@yVcJyV1cwJGJk0wh1qt1jcKeA%3M6Hy@m!?@*_ zo89d?S=v@knr5jH!0YDbUZmpB8wfYQq(99!$_g{RsHVf!00000NkvXXu0mjfJo2Ac delta 327 zcmV-N0l5C`1kwbs6#;)JNkl3JS48DESKInG%0NFnCJSbR0#!_|9d9 zfrJB4x~_?+5GEPSUxvdd^1M^mG**JvQ)n1`ekc*<%un$Jo@d>d`YNZqnAb8z!n7y& zg*?l0^<_bFj_+D+0vOp7u>fO-l6bKvRVRS1#3E;W7+)4^7m-_Ul Z`2?fzD-kU;6zpWbD*6^jQfNgCQP%{gfx3GcV;&W6ZiSv{@-Fx{GF} zLOjh8KMrPDt~M3WYP9dB903gMQ9doDhaxhUTPKPH&~}_ow|j9ycSTgZJoMuumm`3q zD2|%cb?J_XR$oU4QY3)=h-$}|jfSx$qP#>%zJEmm(Dm#5cD21JB829D7!z$M62S9v haVw%=Z6Qg2nlE0xITvwN4ekH{002ovPDHLkV1j(=m~8+6 delta 353 zcmV-n0iOQa1ndN`6#;)jNkl1Pjj_34~US0#qabdpd0i zBus*+Nbv3@NvB&Uf}}zg5*7M*_B&oOevDfON0(2_67f-xSaW|)0qa77@&x|iB~8}@yVcJyV1cwJGJk0wh1qt1jcKeA%3M6Hy@m!?@*_ zo89d?S=v@knr5jH!0YDbUZmpB8wfYQq(99!$_g{RsHVf!00000NkvXXu0mjfNBW;% diff --git a/core/img/rating/s5.png b/core/img/rating/s5.png index fa76c311c693e9a9ae27100dcb5584d798884224..8856309f8384e3a4c073f201232a3a74033a2c4c 100644 GIT binary patch delta 354 zcmV-o0iFKZ1nmT{6#;)kNklS{QY72_s z`@fNiY)YM++~|MP%r|o~f746>{w?ogBZ><&G9rM6Z$wxiG$I&BQP+e}tWk_61mF(_ zRTCHN3tXK>+(Hw~sGNrScX@Ouhe-)IN+P0LQsj zkE`uX0}|H8k}OLY5Ww?dace}YpK)AR{6>G8PvAX4z&lS&jQ{`u07*qoM6N<$f;Y9H AG5`Po delta 335 zcmV-V0kHn<1lk0!6#;)RNklkU;6zpWbD*6^jQfNgCQP%{gfx3GcV;&W6ZiSv{@-Fx{GF} zLOjh8KMrPDt~M3WYP9dB903gMQ9doDhaxhUTPKPH&~}_ow|j9ycSTgZJoMuumm`3q zD2|%cb?J_XR$oU4QY3)=h-$}|jfSx$qP#>%zJEmm(Dm#5cD21JB829D7!z$M62S9v haVw%=Z6Qg2nlE0xITvwN4ekH{002ovPDHLkV1j-*m~H?7 diff --git a/core/img/rating/s6.png b/core/img/rating/s6.png index 8856309f8384e3a4c073f201232a3a74033a2c4c..4112e14fde236a03a0a2f6a22cbb3f543a101739 100644 GIT binary patch delta 336 zcmV-W0k8h;1lt6#6#;)SNklQ)W7f6_72V;ruiulf>|&#GYfxvyoS)~JjHR`*SZ~X8K%10M7h4inLPBO{F|Dp?Taq zY`m5LR0n;nmE(BjsTnP&{SHeZpjRJgr5q^_4ar_?Lu3)qaNTCReQ_dp4Jo-N{rLM7 z0*=CNSe2e9cMM2r`7o44zxB$|AtBt^wd`d()7JYyhxnBa49N iMRRLN!Ag@xe_CG;LPr{%8l*Y^0000S{QY72_s z`@fNiY)YM++~|MP%r|o~f746>{w?ogBZ><&G9rM6Z$wxiG$I&BQP+e}tWk_61mF(_ zRTCHN3tXK>+(Hw~sGNrScX@Ouhe-)IN+P0LQsj zkE`uX0}|H8k}OLY5Ww?dace}YpK)AR{6>G8PvAX4z&lS&jQ{`u07*qoM6N<$f;ktV AGXMYp diff --git a/core/img/rating/s7.png b/core/img/rating/s7.png index 4112e14fde236a03a0a2f6a22cbb3f543a101739..ce25cf58df99412a628825ba56f841145d6f53e6 100644 GIT binary patch delta 354 zcmV-o0iFKa1nmT{6#;)kNklR=ltXhxW^`}Je8c=~!UDj*)z?Cn0)aA-0DN1PP#_cu7M?eeBs4ZCK!E`4`Mf7d zLcfUO7CyWrvHEgEkTl3Z(xlI4-|~{_W86D9x_nx;Cf+a-BjbM*uxun)C-6rvX_`*M za1cE>RMT1$7R88lP6$D)5vzFg{x%+mq3fPIy0&Uf3M)kAn^Vz#omgFXDZ9^g%{yIP zwWmBR%PD_CgIINEZ11jVI_gq_cv=-!ZlIPA6Klp>qx4vYc(>Ki80!P7&r#pD2gBjj z8Qqs5mROtn;uTsejZfhuilZ)d9J(h%zj-BrO}Cks-p5q$D0qngpO} zxBPOmyDdkCvQ?6z7@Gv}x?bGNQuTihgvH<159}yU!=3}7_5c6?07*qoM6N<$f`jX# A-v9sr delta 336 zcmV-W0k8h;1lt6#6#;)SNklQ)W7f6_72V;ruiulf>|&#GYfxvyoS)~JjHR`*SZ~X8K%10M7h4inLPBO{F|Dp?Taq zY`m5LR0n;nmE(BjsTnP&{SHeZpjRJgr5q^_4ar_?Lu3)qaNTCReQ_dp4Jo-N{rLM7 z0*=CNSe2e9cMM2r`7o44zxB$|AtBt^wd`d()7JYyhxnBa49N iMRRLN!Ag@xe_CG;LPr{%8l*Y^0000pRuORl#TKkUE!steqP6w? z-^j2Pl*>WC3&{Bn=g-U#0QfgPm+h&ZEpn3iPu?&yCdj^nBC4}u3vaE?*3 za>k1MYEa>5@ird&zHOgdDqo{iQ9hB#>sP)3TsX0O&bIYCRaqldzC)g$KuLEd8?|-a zQdVfSX`q%56JwUvA;d9WY2|?G=csR*gW>S%Ozh)T@ruchPvIm8gRZbFv4>ZiGen@` zFc8Y=b*H25;8ism%~(1msNnoIz1{3?;}s#R=ltXhxW^`}Je8c=~!UDj*)z?Cn0)aA-0DN1PP#_cu7M?eeBs4ZCK!E`4`Mf7d zLcfUO7CyWrvHEgEkTl3Z(xlI4-|~{_W86D9x_nx;Cf+a-BjbM*uxun)C-6rvX_`*M za1cE>RMT1$7R88lP6$D)5vzFg{x%+mq3fPIy0&Uf3M)kAn^Vz#omgFXDZ9^g%{yIP zwWmBR%PD_CgIINEZ11jVI_gq_cv=-!ZlIPA6Klp>qx4vYc(>Ki80!P7&r#pD2gBjj z8Qqs5mROtn;uTsejZfhuilZ)d9J(h%zj-BrO}Cks-p5q$D0qngpO} zxBPOmyDdkCvQ?6z7@Gv}x?bGNQuTihgvH<159}yU!=3}7_5c6?07*qoM6N<$f@!6q A%m4rY diff --git a/core/img/rating/s9.png b/core/img/rating/s9.png index 3197f23785f55472924cbc41bceb4ed7664896ec..b9c190f8ce79bda4534869080eaff7d689c5d387 100644 GIT binary patch delta 290 zcmV+-0p0${1g!+H6#;((NklCZXH`4zL!*J@lZSR*7j3IvzIx9}#_m}^}q3bgC zNez5}Kx!m})Z@8FUp$N;V^-794j?G5zq;N+VHO2tmPNHa3=#%XePv?L#5oAb10fMW zo}-rIw7cDEg`|N{)SsKDQ1X1QKqw_2KuAoGDj8%wqLpi@l<@|HbTLMf0mcon)Zbsh okg2{%28+w)2M`+F`?4RP6Ya}g#<^2S761SM07*qoM6N<$g0(J#`Tzg` delta 317 zcmV-D0mA;R1jq!i6#;)9NklpRuORl#TKkUE!steqP6w? z-^j2Pl*>WC3&{Bn=g-U#0QfgPm+h&ZEpn3iPu?&yCdj^nBC4}u3vaE?*3 za>k1MYEa>5@ird&zHOgdDqo{iQ9hB#>sP)3TsX0O&bIYCRaqldzC)g$KuLEd8?|-a zQdVfSX`q%56JwUvA;d9WY2|?G=csR*gW>S%Ozh)T@ruchPvIm8gRZbFv4>ZiGen@` zFc8Y=b*H25;8ism%~(1msNnoIz1{3?;}s#
  • - class="active"> diff --git a/lib/private/app.php b/lib/private/app.php index a356139044..95a8a7302d 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -815,7 +815,7 @@ class OC_App { * Lists all apps, this is used in apps.php * @return array */ - public static function listAllApps() { + public static function listAllApps($onlyLocal = false) { $installedApps = OC_App::getAllApps(); //TODO which apps do we want to blacklist and how do we integrate @@ -823,6 +823,7 @@ class OC_App { $blacklist = array('files'); //we don't want to show configuration for these $appList = array(); + $l = \OC::$server->getL10N('core'); foreach ($installedApps as $app) { if (array_search($app, $blacklist) === false) { @@ -849,24 +850,36 @@ class OC_App { if(isset($info['shipped']) and ($info['shipped'] == 'true')) { $info['internal'] = true; - $info['internallabel'] = 'Internal App'; - $info['internalclass'] = ''; + $info['internallabel'] = $l->t('Recommended'); + $info['internalclass'] = 'recommendedapp'; $info['removable'] = false; } else { $info['internal'] = false; - $info['internallabel'] = '3rd Party'; - $info['internalclass'] = 'externalapp'; $info['removable'] = true; } $info['update'] = OC_Installer::isUpdateAvailable($app); - $info['preview'] = OC_Helper::imagePath('settings', 'trans.png'); + $appIcon = self::getAppPath($app) . '/img/' . $app.'.svg'; + if (file_exists($appIcon)) { + $info['preview'] = OC_Helper::imagePath($app, $app.'.svg'); + $info['previewAsIcon'] = true; + } else { + $appIcon = self::getAppPath($app) . '/img/app.svg'; + if (file_exists($appIcon)) { + $info['preview'] = OC_Helper::imagePath($app, 'app.svg'); + $info['previewAsIcon'] = true; + } + } $info['version'] = OC_App::getAppVersion($app); $appList[] = $info; } } - $remoteApps = OC_App::getAppstoreApps(); + if ($onlyLocal) { + $remoteApps = array(); + } else { + $remoteApps = OC_App::getAppstoreApps(); + } if ($remoteApps) { // Remove duplicates foreach ($appList as $app) { @@ -898,9 +911,11 @@ class OC_App { } // priority 3: recommended - if ($a['internalclass'] != $b['internalclass']) { - $aTemp = ($a['internalclass'] == 'recommendedapp' ? 1 : 0); - $bTemp = ($b['internalclass'] == 'recommendedapp' ? 1 : 0); + $internalClassA = isset($a['internalclass']) ? $a['internalclass'] : ''; + $internalClassB = isset($b['internalclass']) ? $b['internalclass'] : ''; + if ($internalClassA != $internalClassB) { + $aTemp = ($internalClassA == 'recommendedapp' ? 1 : 0); + $bTemp = ($internalClassB == 'recommendedapp' ? 1 : 0); return ($bTemp - $aTemp); } @@ -917,63 +932,40 @@ class OC_App { * @return array, multi-dimensional array of apps. * Keys: id, name, type, typename, personid, license, detailpage, preview, changed, description */ - public static function getAppstoreApps($filter = 'approved') { - $categoryNames = OC_OCSClient::getCategories(); - if (is_array($categoryNames)) { - // Check that categories of apps were retrieved correctly - if (!$categories = array_keys($categoryNames)) { + public static function getAppstoreApps($filter = 'approved', $category = null) { + $categories = array($category); + if (is_null($category)) { + $categoryNames = OC_OCSClient::getCategories(); + if (is_array($categoryNames)) { + // Check that categories of apps were retrieved correctly + if (!$categories = array_keys($categoryNames)) { + return false; + } + } else { return false; } + } - $page = 0; - $remoteApps = OC_OCSClient::getApplications($categories, $page, $filter); - $app1 = array(); - $i = 0; - foreach ($remoteApps as $app) { - $app1[$i] = $app; - $app1[$i]['author'] = $app['personid']; - $app1[$i]['ocs_id'] = $app['id']; - $app1[$i]['internal'] = $app1[$i]['active'] = 0; - $app1[$i]['update'] = false; - $app1[$i]['groups'] = false; - $app1[$i]['removable'] = false; - if ($app['label'] == 'recommended') { - $app1[$i]['internallabel'] = 'Recommended'; - $app1[$i]['internalclass'] = 'recommendedapp'; - } else { - $app1[$i]['internallabel'] = '3rd Party'; - $app1[$i]['internalclass'] = 'externalapp'; - } - - - // rating img - if ($app['score'] < 5) { - $img = OC_Helper::imagePath( "core", "rating/s1.png" ); - } elseif ($app['score'] < 15) { - $img = OC_Helper::imagePath( "core", "rating/s2.png" ); - } elseif($app['score'] < 25) { - $img = OC_Helper::imagePath( "core", "rating/s3.png" ); - } elseif($app['score'] < 35) { - $img = OC_Helper::imagePath( "core", "rating/s4.png" ); - } elseif($app['score'] < 45) { - $img = OC_Helper::imagePath( "core", "rating/s5.png" ); - } elseif($app['score'] < 55) { - $img = OC_Helper::imagePath( "core", "rating/s6.png" ); - } elseif($app['score'] < 65) { - $img = OC_Helper::imagePath( "core", "rating/s7.png" ); - } elseif($app['score'] < 75) { - $img = OC_Helper::imagePath( "core", "rating/s8.png" ); - } elseif($app['score'] < 85) { - $img = OC_Helper::imagePath( "core", "rating/s9.png" ); - } elseif($app['score'] < 95) { - $img = OC_Helper::imagePath( "core", "rating/s10.png" ); - } elseif($app['score'] < 100) { - $img = OC_Helper::imagePath( "core", "rating/s11.png" ); - } - - $app1[$i]['score'] = ' Score: ' . $app['score'] . '%'; - $i++; + $page = 0; + $remoteApps = OC_OCSClient::getApplications($categories, $page, $filter); + $app1 = array(); + $i = 0; + $l = \OC::$server->getL10N('core'); + foreach ($remoteApps as $app) { + $app1[$i] = $app; + $app1[$i]['author'] = $app['personid']; + $app1[$i]['ocs_id'] = $app['id']; + $app1[$i]['internal'] = $app1[$i]['active'] = 0; + $app1[$i]['update'] = false; + $app1[$i]['groups'] = false; + $app1[$i]['score'] = $app['score']; + $app1[$i]['removable'] = false; + if ($app['label'] == 'recommended') { + $app1[$i]['internallabel'] = $l->t('Recommended'); + $app1[$i]['internalclass'] = 'recommendedapp'; } + + $i++; } if (empty($app1)) { diff --git a/lib/private/installer.php b/lib/private/installer.php index 02e2190aaf..cd1d8ce392 100644 --- a/lib/private/installer.php +++ b/lib/private/installer.php @@ -201,11 +201,10 @@ class OC_Installer{ /** * update an app by it's id * @param integer $ocsid - * @param bool $isShipped * @return bool * @throws Exception */ - public static function updateAppByOCSId($ocsid, $isShipped=false) { + public static function updateAppByOCSId($ocsid) { $appdata = OC_OCSClient::getApplication($ocsid); $download = OC_OCSClient::getApplicationDownload($ocsid, 1); diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php index dc147dea0c..8ceb43f4c1 100644 --- a/lib/private/ocsclient.php +++ b/lib/private/ocsclient.php @@ -142,9 +142,11 @@ class OC_OCSClient{ $app['license']=(string)$tmp[$i]->license; $app['detailpage']=(string)$tmp[$i]->detailpage; $app['preview']=(string)$tmp[$i]->smallpreviewpic1; + $app['preview-full']=(string)$tmp[$i]->previewpic1; $app['changed']=strtotime($tmp[$i]->changed); $app['description']=(string)$tmp[$i]->description; $app['score']=(string)$tmp[$i]->score; + $app['downloads'] = $tmp[$i]->downloads; $apps[]=$app; } diff --git a/settings/ajax/apps/categories.php b/settings/ajax/apps/categories.php new file mode 100644 index 0000000000..3bde28be99 --- /dev/null +++ b/settings/ajax/apps/categories.php @@ -0,0 +1,30 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +OC_JSON::checkAdminUser(); + +$l = OC_L10N::get('settings'); + +$categories = array( + array('id' => 0, 'displayName' => (string)$l->t('Enabled') ), + array('id' => 1, 'displayName' => (string)$l->t('Not enabled') ), +); + +if(OC_Config::getValue('appstoreenabled', true)) { + $categories[] = array('id' => 2, 'displayName' => (string)$l->t('Recommended') ); + // apps from external repo via OCS + $ocs = OC_OCSClient::getCategories(); + foreach($ocs as $k => $v) { + $categories[] = array( + 'id' => $k, + 'displayName' => str_replace('ownCloud ', '', $v) + ); + } +} + +OCP\JSON::success($categories); diff --git a/settings/ajax/apps/index.php b/settings/ajax/apps/index.php new file mode 100644 index 0000000000..24fba8be31 --- /dev/null +++ b/settings/ajax/apps/index.php @@ -0,0 +1,65 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +OC_JSON::checkAdminUser(); + +$l = OC_L10N::get('settings'); + +$category = intval($_GET['category']); +$apps = array(); + +switch($category) { + // installed apps + case 0: + $apps = \OC_App::listAllApps(true); + $apps = array_filter($apps, function($app) { + return $app['active']; + }); + break; + // not-installed apps + case 1: + $apps = \OC_App::listAllApps(true); + $apps = array_filter($apps, function($app) { + return !$app['active']; + }); + break; + default: + if ($category === 2) { + $apps = \OC_App::getAppstoreApps('approved'); + $apps = array_filter($apps, function($app) { + return isset($app['internalclass']) && $app['internalclass'] === 'recommendedapp'; + }); + } else { + $apps = \OC_App::getAppstoreApps('approved', $category); + } + if (!$apps) { + $apps = array(); + } + usort($apps, function ($a, $b) { + $a = (int)$a['score']; + $b = (int)$b['score']; + if ($a === $b) { + return 0; + } + return ($a > $b) ? -1 : 1; + }); + break; +} + +// fix groups to be an array +$apps = array_map(function($app){ + $groups = array(); + if (is_string($app['groups'])) { + $groups = json_decode($app['groups']); + } + $app['groups'] = $groups; + $app['canUnInstall'] = !$app['active'] && $app['removable']; + return $app; +}, $apps); + +OCP\JSON::success(array("apps" => $apps)); diff --git a/settings/ajax/apps/ocs.php b/settings/ajax/apps/ocs.php deleted file mode 100644 index aad0690e01..0000000000 --- a/settings/ajax/apps/ocs.php +++ /dev/null @@ -1,68 +0,0 @@ - - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. - */ - -OC_JSON::checkAdminUser(); - -$l = \OC::$server->getL10N('settings'); - -if(OC_Config::getValue('appstoreenabled', true)==false) { - OCP\JSON::success(array('type' => 'external', 'data' => array())); -} - -$enabledApps=OC_App::getEnabledApps(); - -if(is_null($enabledApps)) { - OCP\JSON::error(array('data' => array('message' => $l->t('Unable to load list from App Store')))); -} - -$apps=array(); - -// apps from external repo via OCS -$categoryNames=OC_OCSClient::getCategories(); -if(is_array($categoryNames)) { - $categories=array_keys($categoryNames); - $page=0; - $filter='approved'; - $externalApps=OC_OCSClient::getApplications($categories, $page, $filter); - foreach($externalApps as $app) { - // show only external apps that aren't enabled yet - $local=false; - foreach($enabledApps as $a) { - if($a === $app['name']) { - $local=true; - } - } - - if(!$local) { - if($app['preview'] === '') { - $pre=OC_Helper::imagePath('settings', 'trans.png'); - } else { - $pre=$app['preview']; - } - if($app['label'] === 'recommended') { - $label='3rd Party'; - } else { - $label='Recommended'; - } - $apps[]=array( - 'name'=>$app['name'], - 'id'=>$app['id'], - 'active'=>false, - 'description'=>$app['description'], - 'author'=>$app['personid'], - 'license'=>$app['license'], - 'preview'=>$pre, - 'internal'=>false, - 'internallabel'=>$label, - 'update'=>false, - ); - } - } -} - -OCP\JSON::success(array('type' => 'external', 'data' => $apps)); diff --git a/settings/ajax/updateapp.php b/settings/ajax/updateapp.php index 6375a41024..3e28c65285 100644 --- a/settings/ajax/updateapp.php +++ b/settings/ajax/updateapp.php @@ -12,30 +12,33 @@ if (!array_key_exists('appid', $_POST)) { OCP\JSON::error(array( 'message' => 'No AppId given!' )); - exit; + return; } $appId = $_POST['appid']; if (!is_numeric($appId)) { - $appId = OC_Appconfig::getValue($appId, 'ocsid', null); - $isShipped = OC_App::isShipped($appId); - + $appId = \OC::$server->getAppConfig()->getValue($appId, 'ocsid', null); if ($appId === null) { OCP\JSON::error(array( 'message' => 'No OCS-ID found for app!' )); exit; } -} else { - $isShipped = false; } $appId = OC_App::cleanAppId($appId); -\OC_Config::setValue('maintenance', true); -$result = OC_Installer::updateAppByOCSId($appId, $isShipped); -\OC_Config::setValue('maintenance', false); +$config = \OC::$server->getConfig(); +$config->setSystemValue('maintenance', true); +try { + $result = OC_Installer::updateAppByOCSId($appId); + $config->setSystemValue('maintenance', false); +} catch(Exception $ex) { + $config->setSystemValue('maintenance', false); + OC_JSON::error(array("data" => array( "message" => $ex->getMessage() ))); + return; +} if($result !== false) { OC_JSON::success(array('data' => array('appid' => $appId))); diff --git a/settings/apps.php b/settings/apps.php index b725c87b0a..2d6f3c4c69 100644 --- a/settings/apps.php +++ b/settings/apps.php @@ -25,21 +25,14 @@ OC_Util::checkAdminUser(); \OC::$server->getSession()->close(); // Load the files we need -OCP\Util::addStyle('settings', 'settings' ); -OCP\Util::addScript('settings', 'settings'); -OCP\Util::addScript('core', 'select2/select2'); -OCP\Util::addStyle('core', 'select2/select2'); -OC_App::setActiveNavigationEntry( "core_apps" ); - -$combinedApps = OC_App::listAllApps(); +\OCP\Util::addScript('handlebars-v1.3.0'); +\OCP\Util::addScript("settings", "settings"); +\OCP\Util::addStyle("settings", "settings"); +\OCP\Util::addScript('core', 'select2/select2'); +\OCP\Util::addStyle('core', 'select2/select2'); +\OCP\Util::addScript("settings", "apps"); +\OC_App::setActiveNavigationEntry( "core_apps" ); $tmpl = new OC_Template( "settings", "apps", "user" ); - -$tmpl->assign('apps', $combinedApps); - -$appid = (isset($_GET['appid'])?strip_tags($_GET['appid']):''); - -$tmpl->assign('appid', $appid); - $tmpl->printPage(); diff --git a/settings/css/settings.css b/settings/css/settings.css index 581904591d..bc6001ddf8 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -128,7 +128,11 @@ input.userFilter {width: 200px;} .ie8 table.hascontrols{border-collapse:collapse;width: 100%;} .ie8 table.hascontrols tbody tr{border-collapse:collapse;border: 1px solid #ddd !important;} + + + /* APPS */ + .appinfo { margin: 1em 40px; } #app-navigation { padding-bottom: 0px; @@ -139,11 +143,62 @@ input.userFilter {width: 200px;} #app-navigation.appwarning:hover { background: #fbb; } -small.externalapp { color:#FFF; background-color:#BBB; font-weight:bold; font-size: 0.6em; margin: 0; padding: 0.1em 0.2em; border-radius: 3px;} -small.recommendedapp { color:#FFF; background-color:#888; font-weight:bold; font-size: 0.6em; margin: 0; padding: 0.1em 0.2em; border-radius: 3px;} -small.externalapp.list, small.recommendedapp.list { position: absolute; right: 10px; top: 12px; } + +.recommendedapp { + font-size: 11px; + background-position: left center; + padding-left: 18px; + vertical-align: top; +} span.version { margin-left:1em; margin-right:1em; color:#555; } +#app-navigation .app-external, +.app-version, +.recommendedapp { + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; + filter: alpha(opacity=50); + opacity: .5; +} + +#apps-list { + position: relative; + height: 100%; +} +.section { + position: relative; +} +.app-image { + float: left; + padding-right: 10px; + width: 80px; + height: 80px; +} +.app-image img { + max-width: 80px; + max-height: 80px; +} +.app-image-icon img { + background-color: #ccc; + width: 60px; + padding: 10px; + border-radius: 3px; +} +.app-name, +.app-version, +.app-score, +.recommendedapp { + display: inline-block; +} +.app-description { + clear: both; +} +.app-description pre { + white-space: pre-line; +} + +#app-category-2 { + border-bottom: 1px solid #e8e8e8; +} /* Transition to complete width! */ .app:hover, .app:active { max-width: inherit; } diff --git a/settings/js/apps-custom.php b/settings/js/apps-custom.php deleted file mode 100644 index 2b2f256b39..0000000000 --- a/settings/js/apps-custom.php +++ /dev/null @@ -1,26 +0,0 @@ - - * This file is licensed under the Affero General Public License version 3 or - * later. - * See the COPYING-README file. - */ - -// Check if admin user -OC_Util::checkAdminUser(); - -// Set the content type to JS -header('Content-type: application/javascript'); - -// Disallow caching -header("Cache-Control: no-cache, must-revalidate"); -header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); - -$combinedApps = OC_App::listAllApps(); - -foreach($combinedApps as $app) { - echo("appData_".$app['id']."=".json_encode($app)); - echo("\n"); -} - -echo ("var appid =".json_encode($_GET['appid']).";"); diff --git a/settings/js/apps.js b/settings/js/apps.js index 22bac1eaf3..328c57db8e 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -1,225 +1,235 @@ -/** - * Copyright (c) 2011, Robin Appelman - * Copyright (c) 2012, Thomas Tanghus - * This file is licensed under the Affero General Public License version 3 or later. - * See the COPYING-README file. - */ +/* global Handlebars */ + +Handlebars.registerHelper('score', function() { + if(this.score) { + var score = Math.round( this.score / 10 ); + var imageName = 'rating/s' + score + '.png'; + + return new Handlebars.SafeString(''); + } + return new Handlebars.SafeString(''); +}); OC.Settings = OC.Settings || {}; OC.Settings.Apps = OC.Settings.Apps || { - setupGroupsSelect: function() { - OC.Settings.setupGroupsSelect($('#group_select'), { + setupGroupsSelect: function($elements) { + OC.Settings.setupGroupsSelect($elements, { placeholder: t('core', 'All') }); }, - loadApp:function(app) { - var page = $('#app-content'); - page.find('p.license').show(); - page.find('span.name').text(app.name); - page.find('small.externalapp').text(app.internallabel); - if (app.version) { - page.find('span.version').text(app.version); - } else { - page.find('span.version').text(''); - } - page.find('span.score').html(app.score); - page.find('p.description').text(app.description); - page.find('img.preview').attr('src', app.preview); - if (app.preview && app.preview.length) { - page.find('img.preview').show(); - } else { - page.find('img.preview').hide(); - } - page.find('small.externalapp').attr('style', 'visibility:visible'); - page.find('span.author').text(app.author); - // FIXME licenses of downloaded apps go into app.licence, licenses of not-downloaded apps into app.license - var appLicense = ''; - if (typeof(app.licence) !== 'undefined') { - appLicense = app.licence; - } else if (typeof(app.license) !== 'undefined') { - appLicense = app.license; - } - page.find('span.licence').text(appLicense); + State: { + currentCategory: null, + apps: null + }, - var userDocumentation = false; - var adminDocumentation = false; - if (typeof(app.documentation) !== 'undefined') { - if (typeof(app.documentation.user) !== 'undefined') { - userDocumentation = true; - page.find('span.userDocumentation').html("" + t('settings', 'User Documentation') + ""); - page.find('p.documentation').show(); - } - else { - page.find('span.userDocumentation').empty(); - userDocumentation = false; - } - if (typeof(app.documentation.admin) !== 'undefined') { - adminDocumentation = true; - page.find('span.adminDocumentation').html("" + t('settings', 'Admin Documentation') + ""); - page.find('p.documentation').show(); - } - else { - page.find('span.adminDocumentation').empty(); - adminDocumentation = false; + loadCategories: function() { + var categories = [ + {displayName: 'Enabled', id: '0'} + ]; + + var source = $("#categories-template").html(); + var template = Handlebars.compile(source); + var html = template(categories); + $('#apps-categories').html(html); + + OC.Settings.Apps.loadCategory(0); + + $.ajax(OC.generateUrl('settings/apps/categories'), { + data:{}, + type:'GET', + success:function (jsondata) { + var html = template(jsondata); + $('#apps-categories').html(html); + $('#app-category-' + OC.Settings.Apps.State.currentCategory).addClass('active'); + }, + complete: function() { + $('#app-navigation').removeClass('icon-loading'); } + }); - if(userDocumentation && adminDocumentation) { - page.find('span.comma').remove(); - page.find('span.userDocumentation').after(', '); - } - else { - page.find('span.comma').remove(); - } + }, + + loadCategory: function(categoryId) { + if (OC.Settings.Apps.State.currentCategory === categoryId) { + return; } - else { - page.find('p.documentation').hide(); + $('#apps-list') + .addClass('icon-loading') + .html(''); + $('#app-category-' + OC.Settings.Apps.State.currentCategory).removeClass('active'); + $('#app-category-' + categoryId).addClass('active'); + OC.Settings.Apps.State.currentCategory = categoryId; + + $.ajax(OC.generateUrl('settings/apps/list?category={categoryId}', { + categoryId: categoryId + }), { + data:{}, + type:'GET', + success:function (apps) { + OC.Settings.Apps.State.apps = _.indexBy(apps.apps, 'id'); + var source = $("#app-template").html(); + var template = Handlebars.compile(source); + + _.each(apps.apps, function(app) { + OC.Settings.Apps.renderApp(app, template, null); + }); + }, + complete: function() { + $('#apps-list').removeClass('icon-loading'); + } + }); + }, + + renderApp: function(app, template, selector) { + if (!template) { + var source = $("#app-template").html(); + template = Handlebars.compile(source); + } + if (typeof app === 'string') { + app = OC.Settings.Apps.State.apps[app]; } - if (typeof(app.website) !== 'undefined') { - page.find('p.website').show(); - page.find('a#websitelink').attr('href', app.website); - } - - if (app.update !== false) { - page.find('input.update').show(); - page.find('input.update').data('appid', app.id); - page.find('input.update').attr('value',t('settings', 'Update to {appversion}', {appversion:app.update})); + var html = template(app); + if (selector) { + selector.html(html); } else { - page.find('input.update').hide(); + $('#apps-list').append(html); } - if (app.removable !== false && app.active === false) { - page.find('a.uninstall').show(); - page.find('a.uninstall').data('appid', app.id); - page.find('a.uninstall').attr('value', t('settings', 'Uninstall App')); - } else { - page.find('a.uninstall').hide(); - } - - page.find('input.enable').show(); - page.find('input.enable').val((app.active) ? t('settings', 'Disable') : t('settings', 'Enable')); - 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.appstore').show(); - page.find('a#appstorelink').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(); - } - if (typeof($('#app-navigation ul li[data-id="'+app.id+'"]').data('errormsg')) !== "undefined") { - page.find(".warning").show(); - page.find(".warning").text($('#app-navigation ul li[data-id="'+app.id+'"]').data('errormsg')); - } else { - page.find(".warning").hide(); + var page = $('#app-' + app.id); + + // image loading kung-fu + if (app.preview) { + var currentImage = new Image(); + currentImage.src = app.preview; + + currentImage.onload = function() { + page.find('.app-image') + .append(this) + .fadeIn(); + }; } + // set group select properly if(OC.Settings.Apps.isType(app, 'filesystem') || OC.Settings.Apps.isType(app, 'prelogin') || OC.Settings.Apps.isType(app, 'authentication') || OC.Settings.Apps.isType(app, 'logging')) { - page.find("#groups_enable").hide(); - page.find("label[for='groups_enable']").hide(); - page.find("#groups_enable").attr('checked', null); + page.find(".groups-enable").hide(); + page.find("label[for='groups_enable-"+app.id+"']").hide(); + page.find(".groups-enable").attr('checked', null); } else { + page.find('#group_select').val((app.groups || []).join(',')); if (app.active) { if (app.groups.length) { - OC.Settings.Apps.setupGroupsSelect(); - $('#group_select').select2('val', app.groups || []); - page.find("#groups_enable").attr('checked','checked'); + OC.Settings.Apps.setupGroupsSelect(page.find('#group_select')); + page.find(".groups-enable").attr('checked','checked'); } else { - page.find("#groups_enable").attr('checked', null); + page.find(".groups-enable").attr('checked', null); } - page.find("#groups_enable").show(); - page.find("label[for='groups_enable']").show(); + page.find(".groups-enable").show(); + page.find("label[for='groups_enable-"+app.id+"']").show(); } else { - page.find("#groups_enable").hide(); - page.find("label[for='groups_enable']").hide(); + page.find(".groups-enable").hide(); + page.find("label[for='groups_enable-"+app.id+"']").hide(); } } }, - enableApp:function(appid, active, element, groups) { + + isType: function(app, type){ + return app.types && app.types.indexOf(type) !== -1; + }, + + enableApp:function(appId, active, element, groups) { + OC.Settings.Apps.hideErrorMessage(appId); groups = groups || []; - var appitem=$('#app-navigation ul li[data-id="'+appid+'"]'); + var appItem = $('div#app-'+appId+''); element.val(t('settings','Please wait....')); if(active && !groups.length) { - $.post(OC.filePath('settings','ajax','disableapp.php'),{appid:appid},function(result) { + $.post(OC.filePath('settings','ajax','disableapp.php'),{appid:appId},function(result) { if(!result || result.status !== 'success') { if (result.data && result.data.message) { - OC.Settings.Apps.showErrorMessage(result.data.message); - appitem.data('errormsg', result.data.message); + OC.Settings.Apps.showErrorMessage(appId, result.data.message); + appItem.data('errormsg', result.data.message); } else { - OC.Settings.Apps.showErrorMessage(t('settings', 'Error while disabling app')); - appitem.data('errormsg', t('settings', 'Error while disabling app')); + OC.Settings.Apps.showErrorMessage(appId, t('settings', 'Error while disabling app')); + appItem.data('errormsg', t('settings', 'Error while disabling app')); } element.val(t('settings','Disable')); - appitem.addClass('appwarning'); - } - else { - appitem.data('active',false); - appitem.data('groups', ''); + appItem.addClass('appwarning'); + } else { + appItem.data('active',false); + appItem.data('groups', ''); element.data('active',false); - OC.Settings.Apps.removeNavigation(appid); - appitem.removeClass('active'); + OC.Settings.Apps.removeNavigation(appId); + appItem.removeClass('active'); element.val(t('settings','Enable')); - element.parent().find("#groups_enable").hide(); - element.parent().find("label[for='groups_enable']").hide(); - var app = OC.get('appData_' + appid); - app.active = false; + element.parent().find(".groups-enable").hide(); + element.parent().find("#groups_enable-"+appId).hide(); + element.parent().find("label[for='groups_enable-"+appId+"']").hide(); + element.parent().find('#group_select').hide().val(null); + OC.Settings.Apps.State.apps[appId].active = false; } },'json'); } else { - $.post(OC.filePath('settings','ajax','enableapp.php'),{appid: appid, groups: groups},function(result) { + $.post(OC.filePath('settings','ajax','enableapp.php'),{appid: appId, groups: groups},function(result) { if(!result || result.status !== 'success') { if (result.data && result.data.message) { - OC.Settings.Apps.showErrorMessage(result.data.message); - appitem.data('errormsg', result.data.message); + OC.Settings.Apps.showErrorMessage(appId, result.data.message); + appItem.data('errormsg', result.data.message); } else { - OC.Settings.Apps.showErrorMessage(t('settings', 'Error while enabling app')); - appitem.data('errormsg', t('settings', 'Error while disabling app')); + OC.Settings.Apps.showErrorMessage(appId, t('settings', 'Error while enabling app')); + appItem.data('errormsg', t('settings', 'Error while disabling app')); } element.val(t('settings','Enable')); - appitem.addClass('appwarning'); + appItem.addClass('appwarning'); } else { - OC.Settings.Apps.addNavigation(appid); - appitem.data('active',true); + OC.Settings.Apps.addNavigation(appId); + appItem.data('active',true); element.data('active',true); - appitem.addClass('active'); + appItem.addClass('active'); element.val(t('settings','Disable')); - var app = OC.get('appData_' + appid); + var app = OC.Settings.Apps.State.apps[appId]; app.active = true; + if (OC.Settings.Apps.isType(app, 'filesystem') || OC.Settings.Apps.isType(app, 'prelogin') || OC.Settings.Apps.isType(app, 'authentication') || OC.Settings.Apps.isType(app, 'logging')) { - element.parent().find("#groups_enable").hide(); - element.parent().find("label[for='groups_enable']").hide(); + element.parent().find(".groups-enable").attr('checked', null); + element.parent().find("#groups_enable-"+appId).hide(); + element.parent().find("label[for='groups_enable-"+appId+"']").hide(); + element.parent().find(".groups-enable").hide(); + element.parent().find("#groups_enable-"+appId).hide(); + element.parent().find("label[for='groups_enable-"+appId+"']").hide(); + element.parent().find('#group_select').hide().val(null); } else { - element.parent().find("#groups_enable").show(); - element.parent().find("label[for='groups_enable']").show(); + element.parent().find("#groups_enable-"+appId).show(); + element.parent().find("label[for='groups_enable-"+appId+"']").show(); if (groups) { - appitem.data('groups', JSON.stringify(groups)); + appItem.data('groups', JSON.stringify(groups)); } else { - appitem.data('groups', ''); + appItem.data('groups', ''); } } } },'json') - .fail(function() { - OC.Settings.Apps.showErrorMessage(t('settings', 'Error while enabling app')); - appitem.data('errormsg', t('settings', 'Error while enabling app')); - appitem.data('active',false); - appitem.addClass('appwarning'); - OC.Settings.Apps.removeNavigation(appid); - element.val(t('settings','Enable')); - }); + .fail(function() { + OC.Settings.Apps.showErrorMessage(appId, t('settings', 'Error while enabling app')); + appItem.data('errormsg', t('settings', 'Error while enabling app')); + appItem.data('active',false); + appItem.addClass('appwarning'); + OC.Settings.Apps.removeNavigation(appId); + element.val(t('settings','Enable')); + }); } }, - updateApp:function(appid, element) { + + updateApp:function(appId, element) { + var oldButtonText = element.val(); element.val(t('settings','Updating....')); - $.post(OC.filePath('settings','ajax','updateapp.php'),{appid:appid},function(result) { + OC.Settings.Apps.hideErrorMessage(appId); + $.post(OC.filePath('settings','ajax','updateapp.php'),{appid:appId},function(result) { if(!result || result.status !== 'success') { - OC.Settings.Apps.showErrorMessage(t('settings','Error while updating app'),t('settings','Error')); - element.val(t('settings','Update')); + OC.Settings.Apps.showErrorMessage(appId, t('settings','Error while updating app')); + element.val(oldButtonText); } else { element.val(t('settings','Updated')); @@ -227,42 +237,25 @@ OC.Settings.Apps = OC.Settings.Apps || { } },'json'); }, - uninstallApp:function(appid, element) { + + uninstallApp:function(appId, element) { + OC.Settings.Apps.hideErrorMessage(appId); element.val(t('settings','Uninstalling ....')); - $.post(OC.filePath('settings','ajax','uninstallapp.php'),{appid:appid},function(result) { + $.post(OC.filePath('settings','ajax','uninstallapp.php'),{appid:appId},function(result) { if(!result || result.status !== 'success') { - OC.Settings.Apps.showErrorMessage(t('settings','Error while uninstalling app'),t('settings','Error')); + OC.Settings.Apps.showErrorMessage(appId, t('settings','Error while uninstalling app')); element.val(t('settings','Uninstall')); } else { - OC.Settings.Apps.removeNavigation(appid); - var appItem = $('#app-navigation li').filterAttr('data-id', appid); - appItem.removeClass('active'); + OC.Settings.Apps.removeNavigation(appId); + element.parent().fadeOut(function() { + element.remove(); + }); } },'json'); }, - insertApp:function(appdata) { - var applist = $('#app-navigation ul li'); - var app = - $('
  • ' - + '' - + appdata.name+'3rd party
    • '); - app.data('app', appdata); - var added = false; - applist.each(function() { - if(!parseInt($(this).data('installed')) && $(this).find('a').text().toLowerCase() > appdata.name.toLowerCase()) { - $(this).before(app); - added = true; - return false; // dang, remember this to get out of loop - } - }); - if(!added) { - applist.last().after(app); - } - return app; - }, - removeNavigation: function(appid){ - $.getJSON(OC.filePath('settings', 'ajax', 'navigationdetect.php'), {app: appid}).done(function(response){ + removeNavigation: function(appId){ + $.getJSON(OC.filePath('settings', 'ajax', 'navigationdetect.php'), {app: appId}).done(function(response){ if(response.status === 'success'){ var navIds=response.nav_ids; for(var i=0; i< navIds.length; i++){ @@ -310,107 +303,87 @@ OC.Settings.Apps = OC.Settings.Apps || { .animate({opacity: 1}) .animate({opacity: 0.75}); - if (!SVGSupport() && entry.icon.match(/\.svg$/i)) { + if (!OC.Util.hasSVGSupport() && entry.icon.match(/\.svg$/i)) { $(img).addClass('svg'); - replaceSVG(); + OC.Util.replaceSVG(); } } } } }); }, - showErrorMessage: function(message) { - $('.appinfo .warning').show(); - $('.appinfo .warning').text(message); + + showErrorMessage: function(appId, message) { + $('div#app-'+appId+' .warning') + .show() + .text(message); }, - isType: function(app, type){ - return app.types && app.types.indexOf(type) !== -1; + + hideErrorMessage: function(appId) { + $('div#app-'+appId+' .warning') + .hide() + .text(''); } + }; -$(document).ready(function(){ - $('#app-navigation ul li').each(function(index,li){ - var app = OC.get('appData_'+$(li).data('id')); - if (app) { - app.groups= $(li).data('groups') || []; - } - $(li).data('app',app); - $(this).find('span.hidden').remove(); - }); - $('#app-navigation ul li').keydown(function(event) { - if (event.which === 13 || event.which === 32) { - $(event.target).click(); - } - return false; +$(document).ready(function () { + OC.Settings.Apps.loadCategories(); + + $(document).on('click', 'ul#apps-categories li', function () { + var categoryId = $(this).data('categoryId'); + OC.Settings.Apps.loadCategory(categoryId); }); - $(document).on('click', '#app-navigation', function(event){ - var tgt = $(event.target); - if (tgt.is('li') || tgt.is('a')) { - var item = tgt.is('li') ? $(tgt) : $(tgt).parent(); - var app = item.data('app'); - OC.Settings.Apps.loadApp(app); - $('#app-navigation .selected').removeClass('selected'); - item.addClass('selected'); - } - return false; - }); - $('#app-content input.enable').click(function(){ + $(document).on('click', '#apps-list input.enable', function () { + var appId = $(this).data('appid'); var element = $(this); - var appid=$(this).data('appid'); - var active=$(this).data('active'); - if(appid) { - OC.Settings.Apps.enableApp(appid, active, element); - } + var active = $(this).data('active'); + + OC.Settings.Apps.enableApp(appId, active, element); }); - $('#app-content input.update').click(function(){ + + $(document).on('click', '#apps-list input.uninstall', function () { + var appId = $(this).data('appid'); var element = $(this); - var appid=$(this).data('appid'); - if(appid) { - OC.Settings.Apps.updateApp(appid, element); - } + + OC.Settings.Apps.uninstallApp(appId, element); }); - $('#app-content a.uninstall').click(function(){ + + $(document).on('click', '#apps-list input.update', function () { + var appId = $(this).data('appid'); var element = $(this); - var appid=$(this).data('appid'); - if(appid) { - OC.Settings.Apps.uninstallApp(appid, element); + + OC.Settings.Apps.updateApp(appId, element); + }); + + $(document).on('change', '#group_select', function() { + var element = $(this).parent().find('input.enable'); + var groups = $(this).val(); + if (groups && groups !== '') { + groups = groups.split(','); + } else { + groups = []; + } + + var appId = element.data('appid'); + if (appId) { + OC.Settings.Apps.enableApp(appId, false, element, groups); + OC.Settings.Apps.State.apps[appId].groups = groups; } }); - $('#group_select').change(function(ev) { - var element = $('#app-content input.enable'); - // getting an array of values from select2 - var groups = ev.val || []; - var appid = element.data('appid'); - if (appid) { - OC.Settings.Apps.enableApp(appid, false, element, groups); - var li = $('[data-id="'+appid+'"]'); - var app = OC.get('appData_' + $(li).data('id')); - app.groups = groups; - li.data('groups', groups); - li.attr('data-groups', JSON.stringify(groups)); - } - }); - - if(appid) { - var item = $('#app-navigation ul li[data-id="'+appid+'"]'); - if(item) { - item.trigger('click'); - item.addClass('active'); - $('#app-navigation').animate({scrollTop: item.offset().top-70}, 'slow','swing'); - } - } - - $("#groups_enable").change(function() { - var $select = $('#group_select'); + $(document).on('change', ".groups-enable", function() { + var $select = $(this).parent().find('#group_select'); $select.val(''); + if (this.checked) { - OC.Settings.Apps.setupGroupsSelect(); - } - else { + OC.Settings.Apps.setupGroupsSelect($select); + } else { $select.select2('destroy'); } + $select.change(); }); + }); diff --git a/settings/js/old-apps.js b/settings/js/old-apps.js new file mode 100644 index 0000000000..e69de29bb2 diff --git a/settings/routes.php b/settings/routes.php index 25a8b1da7e..d942e54036 100644 --- a/settings/routes.php +++ b/settings/routes.php @@ -69,10 +69,12 @@ $this->create('settings_cert_post', '/settings/ajax/addRootCertificate') $this->create('settings_cert_remove', '/settings/ajax/removeRootCertificate') ->actionInclude('settings/ajax/removeRootCertificate.php'); // apps -$this->create('settings_ajax_apps_ocs', '/settings/ajax/apps/ocs.php') - ->actionInclude('settings/ajax/apps/ocs.php'); $this->create('settings_ajax_enableapp', '/settings/ajax/enableapp.php') ->actionInclude('settings/ajax/enableapp.php'); +$this->create('settings_ajax_load_app_categories', '/settings/apps/categories') + ->actionInclude('settings/ajax/apps/categories.php'); +$this->create('settings_ajax_load_apps', '/settings/apps/list') + ->actionInclude('settings/ajax/apps/index.php'); $this->create('settings_ajax_disableapp', '/settings/ajax/disableapp.php') ->actionInclude('settings/ajax/disableapp.php'); $this->create('settings_ajax_updateapp', '/settings/ajax/updateapp.php') @@ -81,8 +83,6 @@ $this->create('settings_ajax_uninstallapp', '/settings/ajax/uninstallapp.php') ->actionInclude('settings/ajax/uninstallapp.php'); $this->create('settings_ajax_navigationdetect', '/settings/ajax/navigationdetect.php') ->actionInclude('settings/ajax/navigationdetect.php'); -$this->create('apps_custom', '/settings/js/apps-custom.js') - ->actionInclude('settings/js/apps-custom.php'); // admin $this->create('settings_ajax_getlog', '/settings/ajax/getlog.php') ->actionInclude('settings/ajax/getlog.php'); diff --git a/settings/templates/apps.php b/settings/templates/apps.php index 5199d3fd7c..1ad37000f3 100644 --- a/settings/templates/apps.php +++ b/settings/templates/apps.php @@ -1,65 +1,82 @@ - - * This file is licensed under the Affero General Public License version 3 or later. - * See the COPYING-README file. - */?> - - + - -
  • data-id="" data-groups="" - - data-type="" data-installed="1"> - - '.OC_Util::sanitizeHTML($app['internallabel']).'') ?> -
    • - + + +
    -
    -

    t('Select an App'));?>

    - -

    - - - - - - - - -
    - - -
    - - - -
    +