From b091394a90a22767ec08259eb19a2b0d0294c25d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
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 | 491 ++++++++++++++----------------
settings/js/old-apps.js | 0
settings/routes.php | 8 +-
settings/templates/apps.php | 127 ++++----
34 files changed, 1135 insertions(+), 504 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 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ xml:space="preserve"
+ height="16px"
+ width="16px"
+ version="1.1"
+ y="0px"
+ x="0px"
+ viewBox="0 0 71 100"
+ id="svg2"
+ inkscape:version="0.48.5 r10040"
+ sodipodi:docname="app.svg"><metadata
+ id="metadata10"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+ id="defs8" /><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1920"
+ inkscape:window-height="1014"
+ id="namedview6"
+ showgrid="false"
+ inkscape:zoom="14.75"
+ inkscape:cx="-21.423729"
+ inkscape:cy="8"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg2" /><path
+ d="m8 1c-2.2091 0-4 1.7909-4 4v2h-1v7h10v-7h-1v-2c0-2.2091-1.791-4-4-4zm0 2c1.1046 0 2 0.89543 2 2v2h-4v-2c0-1.1046 0.8954-2 2-2z"
+ transform="matrix(6.25,0,0,6.25,-14.5,0)"
+ id="path4"
+ style="fill:#ffffff;fill-opacity:1" /><path
+ style="fill:none"
+ d="m 3.0644068,10.508475 0,-3.4576275 0.4655371,0 0.465537,0 0.049537,-1.2033899 C 4.1094633,4.2818838 4.1578923,4.0112428 4.4962182,3.3259708 4.7075644,2.8978935 4.9002217,2.6327599 5.2605792,2.2740624 6.7855365,0.75613022 8.9920507,0.69157582 10.623172,2.1171729 c 0.384104,0.3357058 0.882069,1.0763131 1.054177,1.5678422 0.147302,0.4206856 0.262873,1.6086448 0.266436,2.7387137 l 0.002,0.6271187 0.508474,0 0.508475,0 0,3.4576275 0,3.457627 -4.9491527,0 -4.9491525,0 0,-3.457627 z M 10.065882,6.3559322 c -0.02012,-0.3822034 -0.04774,-0.7076271 -0.0614,-0.7231639 -0.013653,-0.015537 -0.024824,0.281921 -0.024824,0.661017 l 0,0.6892655 -1.9630041,0 -1.963004,0 -0.023717,-0.4576271 -0.023717,-0.4576271 -0.013279,0.4915254 -0.013279,0.4915255 2.0613978,0 2.0613972,0 -0.03657,-0.6949153 0,0 z M 6.5396275,3.7118644 C 6.648082,3.5720339 6.7197092,3.4576271 6.6987988,3.4576271 c -0.062956,0 -0.5835446,0.6841947 -0.5835446,0.7669359 0,0.042237 0.051116,0.00136 0.1135916,-0.090834 0.062475,-0.092195 0.2023271,-0.2820343 0.3107817,-0.4218648 z M 9.7498983,4.0169492 C 9.6961899,3.9144068 9.5352369,3.723769 9.392225,3.5933098 L 9.1322034,3.356111 9.3784249,3.6272081 c 0.1354218,0.1491033 0.2814105,0.3397411 0.3244192,0.4236394 0.043009,0.083898 0.093162,0.1525423 0.1114515,0.1525423 0.01829,0 -0.010689,-0.083898 -0.064397,-0.1864406 l 0,0 z M 7.3032896,3.1315382 C 7.2704731,3.0987216 6.877102,3.3089557 6.8306315,3.3841466 6.8091904,3.4188389 6.911918,3.3813452 7.0589148,3.300827 7.2059117,3.2203088 7.3158803,3.1441289 7.3032896,3.1315382 l 0,0 z"
+ id="path3007"
+ inkscape:connector-curvature="0"
+ transform="matrix(6.25,0,0,6.25,-14.5,0)" /></svg>
\ 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 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ height="32px"
+ width="32px"
+ version="1.1"
+ id="svg2"
+ inkscape:version="0.48.5 r10040"
+ sodipodi:docname="app.svg">
+ <metadata
+ id="metadata80">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1920"
+ inkscape:window-height="1014"
+ id="namedview78"
+ showgrid="false"
+ inkscape:zoom="7.375"
+ inkscape:cx="-13.559322"
+ inkscape:cy="16"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg2" />
+ <defs
+ id="defs4">
+ <linearGradient
+ id="m"
+ y2="21.387"
+ gradientUnits="userSpaceOnUse"
+ x2="27.557"
+ gradientTransform="matrix(.89186 0 0 1.0539 3.1208 3.4122)"
+ y1="7.1627"
+ x1="27.557">
+ <stop
+ stop-color="#fff"
+ offset="0"
+ id="stop7" />
+ <stop
+ stop-color="#fff"
+ stop-opacity=".23529"
+ offset=".0097359"
+ id="stop9" />
+ <stop
+ stop-color="#fff"
+ stop-opacity=".15686"
+ offset=".99001"
+ id="stop11" />
+ <stop
+ stop-color="#fff"
+ stop-opacity=".39216"
+ offset="1"
+ id="stop13" />
+ </linearGradient>
+ <linearGradient
+ id="l"
+ y2="43.761"
+ gradientUnits="userSpaceOnUse"
+ x2="35.793"
+ gradientTransform="matrix(.64444 0 0 .64286 .53352 -1.1074)"
+ y1="17.118"
+ x1="35.793">
+ <stop
+ stop-color="#b4cee1"
+ offset="0"
+ id="stop16" />
+ <stop
+ stop-color="#5d9fcd"
+ offset="1"
+ id="stop18" />
+ </linearGradient>
+ <linearGradient
+ id="k"
+ y2="609.51"
+ gradientUnits="userSpaceOnUse"
+ x2="302.86"
+ gradientTransform="matrix(.051143 0 0 .015916 -2.49 22.299)"
+ y1="366.65"
+ x1="302.86">
+ <stop
+ stop-opacity="0"
+ offset="0"
+ id="stop21" />
+ <stop
+ offset=".5"
+ id="stop23" />
+ <stop
+ stop-opacity="0"
+ offset="1"
+ id="stop25" />
+ </linearGradient>
+ <radialGradient
+ id="n"
+ gradientUnits="userSpaceOnUse"
+ cy="486.65"
+ cx="605.71"
+ gradientTransform="matrix(.019836 0 0 .015916 16.388 22.299)"
+ r="117.14">
+ <stop
+ offset="0"
+ id="stop28" />
+ <stop
+ stop-opacity="0"
+ offset="1"
+ id="stop30" />
+ </radialGradient>
+ <radialGradient
+ id="o"
+ gradientUnits="userSpaceOnUse"
+ cy="486.65"
+ cx="605.71"
+ gradientTransform="matrix(-.019836 0 0 .015916 15.601 22.299)"
+ r="117.14">
+ <stop
+ offset="0"
+ id="stop33" />
+ <stop
+ stop-opacity="0"
+ offset="1"
+ id="stop35" />
+ </radialGradient>
+ <linearGradient
+ id="j"
+ y2="34.143"
+ gradientUnits="userSpaceOnUse"
+ x2="21.37"
+ gradientTransform="matrix(.54384 0 0 .61466 3.2689 3.0908)"
+ y1="4.7324"
+ x1="21.37">
+ <stop
+ stop-color="#fff"
+ offset="0"
+ id="stop38" />
+ <stop
+ stop-color="#fff"
+ stop-opacity=".23529"
+ offset=".11063"
+ id="stop40" />
+ <stop
+ stop-color="#fff"
+ stop-opacity=".15686"
+ offset=".99001"
+ id="stop42" />
+ <stop
+ stop-color="#fff"
+ stop-opacity=".39216"
+ offset="1"
+ id="stop44" />
+ </linearGradient>
+ <linearGradient
+ id="i"
+ y2="16"
+ gradientUnits="userSpaceOnUse"
+ x2="62.989"
+ gradientTransform="matrix(.61905 0 0 .61905 -30.392 -.57170)"
+ y1="13"
+ x1="62.989">
+ <stop
+ stop-color="#f9f9f9"
+ offset="0"
+ id="stop47" />
+ <stop
+ stop-color="#d8d8d8"
+ offset="1"
+ id="stop49" />
+ </linearGradient>
+ <linearGradient
+ id="d"
+ y2="3.6337"
+ gradientUnits="userSpaceOnUse"
+ y1="53.514"
+ gradientTransform="matrix(.50703 0 0 .503 68.029 -.67050)"
+ x2="-51.786"
+ x1="-51.786">
+ <stop
+ stop-opacity=".32174"
+ offset="0"
+ id="stop52" />
+ <stop
+ stop-opacity=".27826"
+ offset="1"
+ id="stop54" />
+ </linearGradient>
+ </defs>
+ <path
+ d="m 14.902928,3.2372882 4.76117,4.5146377 -7.141758,6.7719561 4.761174,4.514639 7.141756,-6.771956 4.761171,4.514636 V 3.2372882 H 14.902928 z M 5.3805857,5.4946057 C 4.0617412,5.4946057 3,6.501372 3,7.7519259 V 25.810477 c 0,1.250555 1.0617412,2.257319 2.3805857,2.257319 H 24.42527 c 1.318844,0 2.380584,-1.006764 2.380584,-2.257319 v -6.771956 l -2.380584,-2.25732 v 9.029276 H 5.3805857 V 7.7519259 H 14.902928 L 12.52234,5.4946057 H 5.3805857 z"
+ id="path76"
+ inkscape:connector-curvature="0"
+ style="opacity:0.7;fill:#ffffff;fill-opacity:1" />
+</svg>
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 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ height="16"
+ width="16"
+ version="1.1"
+ id="svg2"
+ inkscape:version="0.48.5 r10040"
+ sodipodi:docname="app.svg">
+ <metadata
+ id="metadata12">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs10" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1920"
+ inkscape:window-height="1014"
+ id="namedview8"
+ showgrid="false"
+ inkscape:zoom="14.75"
+ inkscape:cx="-6.6440678"
+ inkscape:cy="8"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg2" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path6"
+ d="m 12.228,1 c -1.3565,0 -2.4592,1.0977 -2.4592,2.4542 0,0.075 0.0084,0.1504 0.0149,0.2236 L 5.0491,6.0923 C 4.62,5.7256 4.06299,5.506 3.4544,5.506 c -1.3565,0 -2.4542,1.0977 -2.4542,2.4543 0,1.3565 1.0977,2.4542 2.4542,2.4542 0.54607,0 1.0528,-0.1755 1.4606,-0.477 l 4.8637,2.4741 c -0.0024,0.044 -0.0099,0.089 -0.0099,0.1342 0,1.3565 1.1027,2.4542 2.4592,2.4542 1.3565,0 2.4542,-1.0977 2.4542,-2.4542 0,-1.3565 -1.0977,-2.4592 -2.4542,-2.4592 -0.63653,0 -1.218,0.2437 -1.6544,0.6409 l -4.6953,-2.4 C 5.89722,8.2047 5.91308,8.0781 5.91308,7.95 c 0,-0.072 -0.0089,-0.1437 -0.0149,-0.2137 l 4.7395,-2.4145 c 0.42802,0.3627 0.98488,0.5813 1.5898,0.5813 1.3565,0 2.4542,-1.1027 2.4542,-2.4592 0,-1.3565 -1.0977,-2.4542 -2.4542,-2.4542 z"
+ style="fill:#ffffff;fill-opacity:1" />
+</svg>
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 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ height="16"
+ width="16"
+ version="1.1"
+ id="svg2"
+ inkscape:version="0.48.5 r10040"
+ sodipodi:docname="app.svg">
+ <metadata
+ id="metadata10">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs8" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1920"
+ inkscape:window-height="1014"
+ id="namedview6"
+ showgrid="false"
+ inkscape:zoom="14.75"
+ inkscape:cx="-6.6440678"
+ inkscape:cy="8"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg2" />
+ <path
+ d="m6.5 1-0.5 1h-3c-0.554 0-1 0.446-1 1v1h12v-1c0-0.554-0.446-1-1-1h-3l-0.5-1zm-3.5 4 0.875 9c0.061 0.549 0.5729 1 1.125 1h6c0.55232 0 1.064-0.45102 1.125-1l0.875-9z"
+ fill-rule="evenodd"
+ id="path4"
+ style="fill:#ffffff;fill-opacity:1" />
+</svg>
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 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ height="16"
+ width="16"
+ version="1.0"
+ id="svg2"
+ inkscape:version="0.48.5 r10040"
+ sodipodi:docname="app.svg">
+ <metadata
+ id="metadata20">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs18" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1920"
+ inkscape:window-height="1014"
+ id="namedview16"
+ showgrid="false"
+ inkscape:zoom="14.75"
+ inkscape:cx="-6.6440678"
+ inkscape:cy="8"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg2" />
+ <rect
+ rx=".5"
+ ry=".5"
+ height="4"
+ width="4"
+ y="1"
+ x="1"
+ id="rect4"
+ style="fill:#ffffff;fill-opacity:1" />
+ <rect
+ rx=".5"
+ ry=".5"
+ height="1"
+ width="9"
+ y="2"
+ x="6"
+ id="rect6"
+ style="fill:#ffffff;fill-opacity:1" />
+ <rect
+ rx=".5"
+ ry=".5"
+ height="4"
+ width="4"
+ y="6"
+ x="1"
+ id="rect8"
+ style="fill:#ffffff;fill-opacity:1" />
+ <rect
+ rx=".5"
+ ry=".5"
+ height="1"
+ width="9"
+ y="7"
+ x="6"
+ id="rect10"
+ style="fill:#ffffff;fill-opacity:1" />
+ <rect
+ rx=".5"
+ ry=".5"
+ height="4"
+ width="4"
+ y="11"
+ x="1"
+ id="rect12"
+ style="fill:#ffffff;fill-opacity:1" />
+ <rect
+ rx=".5"
+ ry=".5"
+ height="1"
+ width="9"
+ y="12"
+ x="6"
+ id="rect14"
+ style="fill:#ffffff;fill-opacity:1" />
+</svg>
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 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ height="16"
+ width="16"
+ version="1.0"
+ id="svg2"
+ inkscape:version="0.48.5 r10040"
+ sodipodi:docname="app.svg">
+ <metadata
+ id="metadata12">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs10" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1920"
+ inkscape:window-height="1014"
+ id="namedview8"
+ showgrid="false"
+ inkscape:zoom="14.75"
+ inkscape:cx="-6.6440678"
+ inkscape:cy="8"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg2" />
+ <rect
+ style="color:#000000"
+ fill-opacity="0"
+ height="97.986"
+ width="163.31"
+ y="-32.993"
+ x="-62.897"
+ id="rect4" />
+ <path
+ style="block-progression:tb;color:#000000;text-transform:none;text-indent:0;fill:#ffffff;fill-opacity:1"
+ d="m8.4036 1c-1.7312 0-3.1998 1.2661-3.1998 2.9 0.012287 0.51643 0.058473 1.1532 0.36664 2.5v0.033333l0.033328 0.033333c0.098928 0.28338 0.24289 0.44549 0.4333 0.66666s0.41742 0.48149 0.63328 0.69999c0.025397 0.025708 0.041676 0.041633 0.066656 0.066677 0.04281 0.18631 0.094672 0.38681 0.13332 0.56666 0.10284 0.47851 0.092296 0.81737 0.066668 0.93332-0.74389 0.26121-1.6694 0.57228-2.4998 0.93332-0.46622 0.2027-0.8881 0.3837-1.2332 0.59999-0.34513 0.2163-0.68837 0.37971-0.79994 0.86666-0.16004 0.63293-0.19866 0.7539-0.39997 1.5333-0.027212 0.20914 0.083011 0.42961 0.26665 0.53333 1.5078 0.81451 3.824 1.1423 6.1329 1.1333s4.6066-0.35609 6.0662-1.1333c0.11739-0.07353 0.14304-0.10869 0.13332-0.2333-0.04365-0.68908-0.08154-1.3669-0.13332-1.7666-0.01807-0.09908-0.06492-0.19275-0.13332-0.26666-0.46366-0.5537-1.1564-0.89218-1.9665-1.2333-0.7396-0.31144-1.6067-0.63486-2.4665-0.99999-0.048123-0.10721-0.095926-0.41912 0-0.89999 0.025759-0.12912 0.066096-0.26742 0.099994-0.4 0.0808-0.090507 0.14378-0.16447 0.23332-0.26666 0.19096-0.21796 0.39614-0.44661 0.56662-0.66666s0.30996-0.40882 0.39997-0.66666l0.03333-0.033333c0.34839-1.4062 0.34857-1.9929 0.36664-2.5v-0.033333c0-1.6339-1.4686-2.9-3.1998-2.9z"
+ id="path6" />
+</svg>
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 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ height="16"
+ width="16"
+ version="1.0"
+ id="svg2"
+ inkscape:version="0.48.5 r10040"
+ sodipodi:docname="app.svg">
+ <metadata
+ id="metadata12">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs10" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1920"
+ inkscape:window-height="1014"
+ id="namedview8"
+ showgrid="false"
+ inkscape:zoom="14.75"
+ inkscape:cx="-6.6440678"
+ inkscape:cy="8"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg2" />
+ <rect
+ style="color:#000000"
+ fill-opacity="0"
+ height="97.986"
+ width="163.31"
+ y="-32.993"
+ x="-62.897"
+ id="rect4" />
+ <path
+ style="block-progression:tb;color:#000000;text-transform:none;text-indent:0;fill:#ffffff;fill-opacity:1"
+ d="m8.4036 1c-1.7312 0-3.1998 1.2661-3.1998 2.9 0.012287 0.51643 0.058473 1.1532 0.36664 2.5v0.033333l0.033328 0.033333c0.098928 0.28338 0.24289 0.44549 0.4333 0.66666s0.41742 0.48149 0.63328 0.69999c0.025397 0.025708 0.041676 0.041633 0.066656 0.066677 0.04281 0.18631 0.094672 0.38681 0.13332 0.56666 0.10284 0.47851 0.092296 0.81737 0.066668 0.93332-0.74389 0.26121-1.6694 0.57228-2.4998 0.93332-0.46622 0.2027-0.8881 0.3837-1.2332 0.59999-0.34513 0.2163-0.68837 0.37971-0.79994 0.86666-0.16004 0.63293-0.19866 0.7539-0.39997 1.5333-0.027212 0.20914 0.083011 0.42961 0.26665 0.53333 1.5078 0.81451 3.824 1.1423 6.1329 1.1333s4.6066-0.35609 6.0662-1.1333c0.11739-0.07353 0.14304-0.10869 0.13332-0.2333-0.04365-0.68908-0.08154-1.3669-0.13332-1.7666-0.01807-0.09908-0.06492-0.19275-0.13332-0.26666-0.46366-0.5537-1.1564-0.89218-1.9665-1.2333-0.7396-0.31144-1.6067-0.63486-2.4665-0.99999-0.048123-0.10721-0.095926-0.41912 0-0.89999 0.025759-0.12912 0.066096-0.26742 0.099994-0.4 0.0808-0.090507 0.14378-0.16447 0.23332-0.26666 0.19096-0.21796 0.39614-0.44661 0.56662-0.66666s0.30996-0.40882 0.39997-0.66666l0.03333-0.033333c0.34839-1.4062 0.34857-1.9929 0.36664-2.5v-0.033333c0-1.6339-1.4686-2.9-3.1998-2.9z"
+ id="path6" />
+</svg>
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)<h;3K|Lk000e1NJLTq003YB000sM0{{R3R$Rux0000RP)t-s0002R
z#l_6b%+}V{-rnBl=jZP3?)LWf|NsBR(bNV20004WQchC<K<3zH0002KNkl<ZC{vxx
zF;2rk5J1r{)-f$d2xCwvt^G?Mv8InmK^qAU;EI}~QxLaa!xW>hH`2g==JvAG*Cry3
zOSy^oc)mvOX#;`Fm*lvC*p+(xt@Bjc)K69|@9<fR`Z})@b(&PAD^pb+R|!(l2%o@e
zjv;@q6IhKQ&yb2aJTwTBIfes(M&!9g?2PaTaLzH5Cef+G2v9ZKBs$go^=fVs$%mKN
x1DL0XCUNr!Z+8H3Vt3ypdVtHa`X>ExegH*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=
z<G4fRwm9a!Lg&I-=fra7=jZ9hLFva#>dQv!&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)iGu8XT<j|yTh5-C6m#{(yMFIk<5GfMQKG_cnNsj<;RcTA4
zM>zUBCVnGJtbatOMbPtiiR(*j4~{}9Atn_<FkNR^mPC|CNCseLA`Ozvr~B<}78wbV
zxjM?HP$5a*&mIlL9$V#wIwWbQNpx>eS}}(L0n1(*4PDdn?(K6=1p-E%H=f9gm(Mr9
zDHQ@b@jPzd`Lj-ifM(pPciC-LkgH%N0ve5hdstH|$Rrr6M!@EID1WnI<?ucIG&iHK
V6VKV!xaR->002ovPDHLkV1mZb+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|@9<fR`Z})@b(&PAD^pb+R|!(l2%o@ejv;@q6IhKQ&yb2aJTwTB
zIfes(M&!9g?2PaTaLzH5Cef+G2v9ZKBs$go^=fVs$%mKN1DL0XCUNr!Z+8H3Vt3yp
idVtHa`X>ExeiZ;kJxL~_o=~3v0000<MNUMnLSTYXHG|mz
diff --git a/core/img/rating/s10.png b/core/img/rating/s10.png
index b9c190f8ce79bda4534869080eaff7d689c5d387..c674569c3899f3d8a4e141fcfe08abb69fd19072 100644
GIT binary patch
delta 296
zcmV+@0oVSm1keMJBptv|OjJbx007K@4bh7k(~lz7nJd|yCEchg-Ks^AO(BtSKasOG
zfA`*;_v^Ly?7aK+*!%V7{P^!@&isu40004WQchC<K<3zH0002KNkl<ZI8VLEU0Q-b
z7(n4;C5<Jc7Saz>lMdRTpnw%vru*NOSM7kWb9J5<{;l7GC_$Qt5(no>L4str8w(QO
zu4&?#5dCb^*frI<7!PhAH^;7tboJ4;dTr(XJbO1<sg4OKR{O6!_uks63Dv1<0v=qO
z=ib`rEeuZG6ELbP?`;&B;3z>*#<jOL(t0RDFiVp8a`|+xuSEzZS&@yjG5Sh`;3m_-
u-E+SmUWgDV^$PHE*%Kl7{F{XciFO8M$yJ;nJ|@-x0000<MNUMnLSTX}<&K5`
delta 392
zcmV;30eAk;1FZy*Bq`WXOjJbx0070s#ms;W%*@Quiy708BG#EJ*4Eb9oh99<Dc!0?
z-rnAkK_LU@=jV}PKLhUW?vbH3fA;qF_uicM>$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)3n<HqTU^Yjsu8Lvi_Fy2^>OZ!oZo&i*N`fe<G}T5ZEm+
zq$6Ddn{mhH!F1pkGr8~49s(gD-CV^t(*Fy?aO%2k@0SvcArLw%PT=>K|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%Dv70000<MNUMnLSTYfCctn2
diff --git a/core/img/rating/s11.png b/core/img/rating/s11.png
deleted file mode 100644
index c674569c3899f3d8a4e141fcfe08abb69fd19072..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 464
zcmV;>0WbcEP)<h;3K|Lk000e1NJLTq003YB000sQ0{{R3ldLPi0002MP)t-s0002Y
zfDO@$8Pks<)|o5Woh99<Dc!0?->)&^wlw3oL*%<k<h^F)tvKbjIOe@V=D#`T!dmCV
za_F!n>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~&bV<n9xqZZN+Q<DzbprC*iSf=~ml~?V6uXA;t7yhl^gD63o
zh!O|qN<o5Tw;Kx*->zxmnGpSK)7UlDx)={`A2-LYiFEbRwr%D8JbO1<sg4OKR{O6!
z_uks63Dv1<0v=qO=ib`rEeuZG6ELbP?`;&B;3z>*#<jOL(t0RDFiVp8a`|+xuSEzZ
zS&@yjG5Sh`;3m_--E+SmUWgDV^$PHE*%Kl7{F{XciFO8M$yJ;nJ|@-x0000<MNUMn
GLSTXz`tn!+
diff --git a/core/img/rating/s2.png b/core/img/rating/s2.png
index 6846c8771f5036d485e913851f962582365fdd97..2f132cc5fa1e390131bab916c26b0c861799a228 100644
GIT binary patch
delta 524
zcmV+n0`vX31JVSLB!AdYOjJbx0070s#ms;W%*@Quiy708BG#EJ*4Eb9oh99<Dc!0?
z-rnBduQB4bG~>8K<hx4by=LXDIOVoD=DkAZzd7f^TIa-a=jZ3>uqElU8|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`A<Ypie1BA;kPzM!0XWlXr$mHQCaF#E>d$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(R<a
O0000<MNUMnLSTZ{DH0w4
delta 370
zcmV-&0ge9B1i1r{BwUJ6OjJbx0070s#mvmi*4EbDs43pw-ruh=<G4fRwm9a!Lg&I-
z=fra7=jZ9hLFva#>dQv!&WG&0BJ9t3?ZPna&PnaiTJFO^?(XjI#VPN|Pw&-C@y##s
z&Qp=dFn|C5{|n=C=Kufz0d!JMQvg8b*k%9#0NqJMK~y+Tz0}zbf<O!f(CgH?j^Y9W
zZs3Od|NovHMNoM&)%(Ka(4=jK0Q@bNutEn#0s^WKDH6^;*$)ayj{t8~X-lL>IQly#
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#;)jNkl<ZI8VLQ+fsut5C-5?)GY=Nq*bi-0E#VGfm*Z&6<V#W
z@Bc<7mU7CC$&CItFyHJlyO06k-}1Q-DG+F`N&vns5(<Q>1Pjj_34~US0#qabdpd0i
zBus*+Nbv3@NvB&Uf}}zg5*7M*_B&oOevDfON0(2_67f-xSaW|)0qa77@&x|iB~8<D
z81|wEhZ;tSFbg9#6Cngqnpon&>}@y<L)SfbOk-6djRjHr;*<?0Pb?Q+%AV%B?K@Ln
zm1$kJUNq}fAeQEYy&<>VcJyV1cwJGJk0wh1qt1jcK<ROn_#DM?ur{m95<u6sd;R{^
z8QrfEt1X@A?BiL<6TnFnM@{NDbgxQ3mGxG60yvDQetO+#m^)P>eA%3M6Hy@m!?@*_
zo89d?S=v@knr5jH!0YDbUZmpB8wfYQq(99!$_g{RsHVf!00000NkvXXu0mjfJo2Ac
delta 327
zcmV-N0l5C`1kwbs6#;)JNkl<ZI8VLO+fsut5C-5?)D(jU(rQFJfMN?)pcd^xEk$eV
z`@fMJDN*5$p#KHQeDlw+%K-3id0$j03!5W=z^M=+%@Hhoe^jE75Z)94IMZpTM1)i(
zsZH?e&t`V_7jZ%<p-s@+V_^HU@qN<SJ2-z>3JS48DESKInG%0NFnCJSbR0#!_|9d9
zfrJB4x~_?+5GEPSUxvdd^1M^mG**JvQ)n1`ekc*<%un$Jo@d>d`YNZqnAb8z!n7y&
zg*?l0^<_bFj_+D+0vOp7u>fO-l6bKvRVRS1<MjIdixajhNh~U6`SC~BCV-<jiQCL|
z*-p8KO?3j;kC{JyeA#N5TarYBQn9Q$0T{-$IIgxgC21NL2iG>#3E;W7+)4^7m-_Ul
Z`2?fzD-<eqmKXp4002ovPDHLkV1fX;m+Jrk
diff --git a/core/img/rating/s4.png b/core/img/rating/s4.png
index 55e917f92e65d0c79f4f8e0c3c658274a91bc705..fa76c311c693e9a9ae27100dcb5584d798884224 100644
GIT binary patch
delta 335
zcmV-V0kHn;1lk0!6#;)RNkl<ZI8VLQYfpnP6b9g<RXZ$R=%$Ex0j(Q2fjM*+6-4Le
z|NlppjZKqDX-V|`0L_!U<g^d~{w*I98Onm11mHU|gmF!RiRTTfDZtpQMF7rt+^Qyw
z*M^fLc=M9PZdZ|s3Bg2}-XDG2ONRGxYwzIvVOl}~Z()MxA!dIjPvG~S(li~0VJEtC
zsjmM{d?rGQW^n{^#1r>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#;)jNkl<ZI8VLQ+fsut5C-5?)GY=Nq*bi-0E#VGfm*Z&6<V#W
z@Bc<7mU7CC$&CItFyHJlyO06k-}1Q-DG+F`N&vns5(<Q>1Pjj_34~US0#qabdpd0i
zBus*+Nbv3@NvB&Uf}}zg5*7M*_B&oOevDfON0(2_67f-xSaW|)0qa77@&x|iB~8<D
z81|wEhZ;tSFbg9#6Cngqnpon&>}@y<L)SfbOk-6djRjHr;*<?0Pb?Q+%AV%B?K@Ln
zm1$kJUNq}fAeQEYy&<>VcJyV1cwJGJk0wh1qt1jcK<ROn_#DM?ur{m95<u6sd;R{^
z8QrfEt1X@A?BiL<6TnFnM@{NDbgxQ3mGxG60yvDQetO+#m^)P>eA%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#;)kNkl<ZI8VLQ*;2wV6b9g<RSz|FA)v9=rPT^WY>S{QY72_s
z`@fNiY)YM++~|MP%r|o~f746>{w?ogBZ><&G9rM6Z$wxiG$I&BQP+e}tWk_61mF(_
zRTC<dLo^|Hjk3(E84yGEg9I{?-X0rXl=bdA)xCrBhl!q4J7j-iq$rjfAwz<o(R#}B
zyq6^P^e*6zqbHn4lB~%XL)4Q@r!{<Ox056cPlK{E)srQIXniP}cO^*XEXw6*7`iuQ
zdrHu3ax|mab`;4}`tmqJ*A46mMQU_4xooQ?fUeh9Z8<+ANmX0j5V1H7EdkVgzus(K
zobX+e<oLHsKL1*t1OXhSowUM(fbWp>HN3tXK>+(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#;)RNkl<ZI8VLQYfpnP6b9g<RXZ$R=%$Ex0j(Q2fjM*+6-4Le
z|NlppjZKqDX-V|`0L_!U<g^d~{w*I98Onm11mHU|gmF!RiRTTfDZtpQMF7rt+^Qyw
z*M^fLc=M9PZdZ|s3Bg2}-XDG2ONRGxYwzIvVOl}~Z()MxA!dIjPvG~S(li~0VJEtC
zsjmM{d?rGQW^n{^#1r>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~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#;)SNkl<ZI8VLO+fu?n3<ls|qXyi1U_ooeL#rzkv0E(4L8YPy
zzW*C}K|yCIwc8oZRpz_+CzAyDxB8eAq;ZgkfR<a3nDY=OzTYcE0ki!(0q$^ED@4pI
z^QI8q{L!f1C_pv~!6KX9A6s>Q)W7f6_72V;ruiulf>|&#GYfxvyoS)~JjHR`*SZ<r
zdD60SlVBl45|(Twg#dIruP;%gwNj^E#hT@(WL6>~X8K%10M7h4inLPBO{F|Dp?Taq
zY`m5LR0n;nmE(BjsTnP&{SHeZpjRJgr5q^_4ar_?Lu3)qaNTCReQ_dp4Jo-N{rLM7
z0*=CNSe2e9cMM2r`7o44z<wyp$Css2Wy_G5nS>xB$|AtBt^wd`d()7JYyhxnBa49N
iMRRLN!Ag@xe_CG;LPr{%8l*Y^0000<MNUMnLSTZ<wwc`k
delta 354
zcmV-o0iFKa1nmT{6#;)kNkl<ZI8VLQ*;2wV6b9g<RSz|FA)v9=rPT^WY>S{QY72_s
z`@fNiY)YM++~|MP%r|o~f746>{w?ogBZ><&G9rM6Z$wxiG$I&BQP+e}tWk_61mF(_
zRTC<dLo^|Hjk3(E84yGEg9I{?-X0rXl=bdA)xCrBhl!q4J7j-iq$rjfAwz<o(R#}B
zyq6^P^e*6zqbHn4lB~%XL)4Q@r!{<Ox056cPlK{E)srQIXniP}cO^*XEXw6*7`iuQ
zdrHu3ax|mab`;4}`tmqJ*A46mMQU_4xooQ?fUeh9Z8<+ANmX0j5V1H7EdkVgzus(K
zobX+e<oLHsKL1*t1OXhSowUM(fbWp>HN3tXK>+(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#;)kNkl<ZI8VLQ+fsut5C-5?)GY=Nq*X*bfMN?)pcd^x1<~62
z{%>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-B<GgJ}4VMNu_>rO}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#;)SNkl<ZI8VLO+fu?n3<ls|qXyi1U_ooeL#rzkv0E(4L8YPy
zzW*C}K|yCIwc8oZRpz_+CzAyDxB8eAq;ZgkfR<a3nDY=OzTYcE0ki!(0q$^ED@4pI
z^QI8q{L!f1C_pv~!6KX9A6s>Q)W7f6_72V;ruiulf>|&#GYfxvyoS)~JjHR`*SZ<r
zdD60SlVBl45|(Twg#dIruP;%gwNj^E#hT@(WL6>~X8K%10M7h4inLPBO{F|Dp?Taq
zY`m5LR0n;nmE(BjsTnP&{SHeZpjRJgr5q^_4ar_?Lu3)qaNTCReQ_dp4Jo-N{rLM7
z0*=CNSe2e9cMM2r`7o44z<wyp$Css2Wy_G5nS>xB$|AtBt^wd`d()7JYyhxnBa49N
iMRRLN!Ag@xe_CG;LPr{%8l*Y^0000<MNUMnLSTZ<wwc`k
diff --git a/core/img/rating/s8.png b/core/img/rating/s8.png
index ce25cf58df99412a628825ba56f841145d6f53e6..3197f23785f55472924cbc41bceb4ed7664896ec 100644
GIT binary patch
delta 317
zcmV-D0mA<61jq!i6#;)9Nkl<ZI8VKl*;a!v5QayirkJ>pRuORl#TKkUE!steqP6w?
z-^j2Pl*>WC3&{Bn=g-U#0QfgPm+h&<YbXHMY)?_zP_T5INn6UJRD<7`^Lei=MQO8z
zcPEOBemhE|j8Rq-AJ4AgMAOHxcW`w1v_dIQW>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#<e@G)+Q1MzW?(xcNEdG{nwQyA(O)U{h
P00000NkvXXu0mjf<<6U(
delta 354
zcmV-o0iFKH1nmT{6#;)kNkl<ZI8VLQ+fsut5C-5?)GY=Nq*X*bfMN?)pcd^x1<~62
z{%>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-B<GgJ}4VMNu_>rO}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#;((Nkl<ZILp11TXTXi5QS-J8<BV+UXao%(WtRjQ1My|-u3_g
zBgvpn9DH0oFUfoldvZ3LD9Y2c+XABA9fOVoh)}Zrmh%Z5LT19ina_)G2qhw{c@Wqw
zFr*`00-JHi=D~E}7c;r<(H;UJA>CZXH`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#;)9Nkl<ZI8VKl*;a!v5QayirkJ>pRuORl#TKkUE!steqP6w?
z-^j2Pl*>WC3&{Bn=g-U#0QfgPm+h&<YbXHMY)?_zP_T5INn6UJRD<7`^Lei=MQO8z
zcPEOBemhE|j8Rq-AJ4AgMAOHxcW`w1v_dIQW>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#<e@G)+Q1MzW?(xcNEdG{nwQyA(O)U{h
P00000NkvXXu0mjfmX4cU
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 04cb6eb9de..9445175efc 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -119,7 +119,7 @@
<!-- show "More apps" link to app administration directly in app navigation, as last entry -->
<?php if(OC_User::isAdminUser(OC_User::getUser())): ?>
<li id="apps-management">
- <a href="<?php print_unescaped(OC_Helper::linkToRoute('settings_apps').'?installed'); ?>" title=""
+ <a href="<?php print_unescaped(OC_Helper::linkToRoute('settings_apps')); ?>" title=""
<?php if( $_['appsmanagement_active'] ): ?> class="active"<?php endif; ?>>
<img class="app-icon svg" alt="" src="<?php print_unescaped(OC_Helper::imagePath('settings', 'apps.svg')); ?>"/>
<div class="icon-loading-dark" style="display:none;"></div>
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'] = '<img src="' . $img . '"> 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 @@
+<?php
+/**
+ * Copyright (c) 2014 Thomas Müller <deepdiver@owncloud.com>
+ * 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 @@
+<?php
+/**
+ * Copyright (c) 2014 Thomas Müller <deepdiver@owncloud.com>
+ * 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 @@
-<?php
-/**
- * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
- * 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 @@
-<?php
-/**
- * Copyright (c) 2013 Lukas Reschke <lukas@statuscode.ch>
- * 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 <icewind1991@gmail.com>
- * Copyright (c) 2012, Thomas Tanghus <thomas@tanghus.net>
- * 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('<img src="' + OC.imagePath('core', imageName) + '">');
+ }
+ 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);
-
- var userDocumentation = false;
- var adminDocumentation = false;
- if (typeof(app.documentation) !== 'undefined') {
- if (typeof(app.documentation.user) !== 'undefined') {
- userDocumentation = true;
- page.find('span.userDocumentation').html("<a id='userDocumentation' href='" + app.documentation.user + "'>" + t('settings', 'User Documentation') + "</a>");
- 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("<a id='adminDocumentation' href='" + app.documentation.admin + "'>" + t('settings', 'Admin Documentation') + "</a>");
- page.find('p.documentation').show();
- }
- else {
- page.find('span.adminDocumentation').empty();
- adminDocumentation = false;
- }
- if(userDocumentation && adminDocumentation) {
- page.find('span.comma').remove();
- page.find('span.userDocumentation').after('<span class="comma">, </span>');
- }
- else {
- page.find('span.comma').remove();
+ State: {
+ currentCategory: null,
+ apps: null
+ },
+
+ 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');
}
- }
- else {
- page.find('p.documentation').hide();
- }
+ });
- 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}));
- } else {
- page.find('input.update').hide();
+ loadCategory: function(categoryId) {
+ if (OC.Settings.Apps.State.currentCategory === categoryId) {
+ return;
}
+ $('#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;
- 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();
+ $.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];
}
- 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();
+ var html = template(app);
+ if (selector) {
+ selector.html(html);
} else {
- page.find('p.appslink').hide();
- page.find('span.score').hide();
+ $('#apps-list').append(html);
}
- 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 =
- $('<li data-id="' + appdata.id + '" data-type="external" data-installed="0">'
- + '<a class="app externalapp" href="' + OC.filePath('settings', 'apps', 'index.php') + '&appid=' + appdata.id+'">'
- + appdata.name+'</a><small class="externalapp list">3rd party</small></li>');
- 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', '#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;
+ $(document).on('click', 'ul#apps-categories li', function () {
+ var categoryId = $(this).data('categoryId');
+ OC.Settings.Apps.loadCategory(categoryId);
});
- $('#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);
});
- $('#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));
+ $(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 = [];
}
- });
- 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');
+ var appId = element.data('appid');
+ if (appId) {
+ OC.Settings.Apps.enableApp(appId, false, element, groups);
+ OC.Settings.Apps.State.apps[appId].groups = groups;
}
- }
+ });
- $("#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 @@
-<?php /**
- * Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>
- * This file is licensed under the Affero General Public License version 3 or later.
- * See the COPYING-README file.
- */?>
- <script type="text/javascript"
- src="<?php print_unescaped(OC_Helper::linkToRoute('apps_custom'));?>?appid=<?php p($_['appid']); ?>"></script>
- <script type="text/javascript" src="<?php print_unescaped(OC_Helper::linkTo('settings/js', 'apps.js'));?>"></script>
+<script id="categories-template" type="text/x-handlebars-template">
+{{#each this}}
+ <li id="app-category-{{id}}" data-category-id="{{id}}"><a>{{displayName}}</a></li>
+{{/each}}
-<div id="app-navigation">
- <ul class="applist">
- <?php if(OC_Config::getValue('appstoreenabled', true) === true): ?>
- <li>
- <a class="app-external" target="_blank" href="http://owncloud.org/dev"><?php p($l->t('Add your App'));?> …</a>
- </li>
- <?php endif; ?>
+<?php if(OC_Config::getValue('appstoreenabled', true) === true): ?>
+ <li>
+ <a class="app-external" target="_blank" href="http://apps.owncloud.com/?xsortmode=high"><?php p($l->t('More apps'));?> …</a>
+ </li>
+ <li>
+ <a class="app-external" target="_blank" href="http://owncloud.org/dev"><?php p($l->t('Add your app'));?> …</a>
+ </li>
+<?php endif; ?>
+</script>
- <?php foreach($_['apps'] as $app):?>
- <li <?php if($app['active']) print_unescaped('class="active"')?> data-id="<?php p($app['id']) ?>" data-groups="<?php p($app['groups']) ?>"
- <?php if ( isset( $app['ocs_id'] ) ) { print_unescaped("data-id-ocs=\"{".OC_Util::sanitizeHTML($app['ocs_id'])."}\""); } ?>
- data-type="<?php p($app['internal'] ? 'internal' : 'external') ?>" data-installed="1">
- <a class="app<?php if(!$app['internal']) p(' externalapp') ?>"
- href="?appid=<?php p($app['id']) ?>"><?php p($app['name']) ?></a>
- <?php if(!$app['internal'])
- print_unescaped('<small class="'.OC_Util::sanitizeHTML($app['internalclass']).' list">'.OC_Util::sanitizeHTML($app['internallabel']).'</small>') ?>
- </li>
- <?php endforeach;?>
-
- <?php if(OC_Config::getValue('appstoreenabled', true) === true): ?>
- <li>
- <a class="app-external" target="_blank" href="http://apps.owncloud.com"><?php p($l->t('More Apps'));?> …</a>
- </li>
- <?php endif; ?>
- </ul>
-</div>
-<div id="app-content">
- <div class="appinfo">
- <h3><strong><span class="name"><?php p($l->t('Select an App'));?></span></strong><span
- class="version"></span><small class="externalapp" style="visibility:hidden;"></small></h3>
- <span class="score"></span>
- <p class="description"></p>
- <p class="documentation hidden">
+<script id="app-template" type="text/x-handlebars">
+ <div class="section" id="app-{{id}}">
+ {{#if preview}}
+ <div class="app-image{{#if previewAsIcon}} app-image-icon{{/if}} hidden">
+ </div>
+ {{/if}}
+ <h2 class="app-name"><a href="{{detailpage}}" target="_blank">{{name}}</a></h2>
+ <div class="app-version"> {{version}}</div>
+ <div class="app-author"><?php p($l->t('by')); ?> {{author}}
+ {{#if license}}
+ ({{license}}-<?php p($l->t('licensed')); ?>)
+ {{/if}}
+ </div>
+ {{#if score}}
+ <div class="app-score">{{{score}}}</div>
+ {{/if}}
+ {{#if internalclass}}
+ <div class="{{internalclass}} icon-checkmark">{{internallabel}}</div>
+ {{/if}}
+ <div class="app-detailpage"></div>
+ <div class="app-description"><pre>{{description}}</pre></div>
+ <!--<div class="app-changed">{{changed}}</div>-->
+ {{#if documentation}}
+ <p class="documentation">
<?php p($l->t("Documentation:"));?>
- <span class="userDocumentation appslink"></span>
- <span class="adminDocumentation appslink"></span>
+ {{#if documentation.user}}
+ <span class="userDocumentation appslink">
+ <a id='userDocumentation' href='{{documentation.user}}' target="_blank"><?php p($l->t("User Documentation"));?></a>
+ </span>
+ {{/if}}
+
+ {{#if documentation.admin}}
+ <span class="adminDocumentation appslink">
+ <a id='adminDocumentation' href='{{documentation.admin}}' target="_blank"><?php p($l->t("Admin Documentation"));?></a>
+ </span>
+ {{/if}}
</p>
- <img src="" class="preview hidden" />
- <p class="appslink appstore hidden"><a id="appstorelink" href="#" target="_blank"><?php
- p($l->t('See application page at apps.owncloud.com'));?></a></p>
- <p class="appslink website hidden"><a id="websitelink" href="#" target="_blank"><?php
- p($l->t('See application website'));?></a></p>
- <p class="license hidden"><?php
- print_unescaped($l->t('<span class="licence"></span>-licensed by <span class="author"></span>'));?></p>
- <input class="enable hidden" type="submit" />
- <input class="update hidden" type="submit" value="<?php p($l->t('Update')); ?>" />
- <a class="uninstall hidden" href="#"><?php p($l->t('Uninstall')); ?></a>
- <br />
- <input class="hidden" type="checkbox" id="groups_enable"/>
- <label class="hidden" for="groups_enable"><?php p($l->t('Enable only for specific groups')); ?></label>
+ {{/if}}
+ {{#if update}}
+ <input class="update" type="submit" value="<?php p($l->t('Update to %s', array('{{update}}'))); ?>" data-appid="{{id}}" />
+ {{/if}}
+ {{#if active}}
+ <input class="enable" type="submit" data-appid="{{id}}" data-active="true" value="<?php p($l->t("Disable"));?>"/>
+ <input type="checkbox" class="groups-enable" id="groups_enable-{{id}}"/>
+ <label for="groups_enable-{{id}}"><?php p($l->t('Enable only for specific groups')); ?></label>
<br />
<input type="hidden" id="group_select" title="<?php p($l->t('All')); ?>" style="width: 200px">
+ {{else}}
+ <input class="enable" type="submit" data-appid="{{id}}" data-active="false" value="<?php p($l->t("Enable"));?>"/>
+ {{/if}}
+ {{#if canUnInstall}}
+ <input class="uninstall" type="submit" value="<?php p($l->t('Uninstall App')); ?>" data-appid="{{id}}" />
+ {{/if}}
<div class="warning hidden"></div>
+
</div>
+</script>
+
+<div id="app-navigation" class="icon-loading">
+ <ul id="apps-categories">
+
+ </ul>
+</div>
+<div id="app-content">
+ <div id="apps-list" class="icon-loading"></div>
</div>
--
GitLab