summaryrefslogtreecommitdiffstats
path: root/settings/js
diff options
context:
space:
mode:
authorFelix A. Epp <work@felixepp.de>2017-01-21 17:06:26 +0100
committerJan-Christoph Borchardt <hey@jancborchardt.net>2017-04-25 00:22:01 +0200
commit91a4676fc0034f63bacc36ea2591599b373e5447 (patch)
treeaebe6d1832521a3bda1ad379fde9dc8777f10ab4 /settings/js
parentd01832ff64652f3e52fa41cccb19f122701af2c8 (diff)
downloadnextcloud-server-91a4676fc0034f63bacc36ea2591599b373e5447.tar.gz
nextcloud-server-91a4676fc0034f63bacc36ea2591599b373e5447.zip
Make enabled and disabled apps a tabular list
Signed-off-by: Felix A. Epp <work@felixepp.de>
Diffstat (limited to 'settings/js')
-rw-r--r--settings/js/apps.js16
1 files changed, 12 insertions, 4 deletions
diff --git a/settings/js/apps.js b/settings/js/apps.js
index 9a3ff09337d..3d94a128d3f 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -94,7 +94,14 @@ OC.Settings.Apps = OC.Settings.Apps || {
// default values for missing fields
return _.extend({level: 0}, app);
});
- var source = $("#app-template").html();
+ var source
+ if (categoryId === 'enabled' || categoryId === 'disabled') {
+ source = $("#app-template-installed").html();
+ $('#apps-list').addClass('installed');
+ } else {
+ source = $("#app-template").html();
+ $('#apps-list').removeClass('installed');
+ }
var template = Handlebars.compile(source);
if (appList.length) {
@@ -257,12 +264,13 @@ OC.Settings.Apps = OC.Settings.Apps || {
*/
imageUrl : function (url, appfromstore) {
- var img = '<svg width="72" height="72" viewBox="0 0 72 72">';
-
+ var img;
if (appfromstore) {
+ img = '<svg width="72" height="72" viewBox="0 0 72 72">';
img += '<image x="0" y="0" width="72" height="72" preserveAspectRatio="xMinYMin meet" xlink:href="' + url + '" class="app-icon" /></svg>';
} else {
- img += '<image x="0" y="0" width="72" height="72" preserveAspectRatio="xMinYMin meet" filter="url(#invertIcon)" xlink:href="' + url + '?v=' + oc_config.version + '" class="app-icon"></image></svg>';
+ img = '<svg width="32" height="32" viewBox="0 0 32 32">';
+ img += '<image x="0" y="0" width="32" height="32" preserveAspectRatio="xMinYMin meet" filter="url(#invertIcon)" xlink:href="' + url + '?v=' + oc_config.version + '" class="app-icon"></image></svg>';
}
return img;
},