Merge pull request #6627 from nextcloud/icon-on-apps-settings

Icon on apps settings
nextcloud · Sep 25, 2017 · f2b7205 · f2b7205
2 parents 1ad79e3 + 9ff6dab
commit f2b7205
Show file tree

Hide file tree

Showing 14 changed files with 73 additions and 6 deletions.
diff --git a/core/css/icons.scss b/core/css/icons.scss
@@ -488,3 +488,57 @@ img, object, video, button, textarea, input, select {
 .icon-picture {
 	background-image: url('../img/places/picture.svg?v=1');
 }
+
+/* APP CATEGORIES ------------------------------------------------------------------- */
+.icon-category-installed {
+	background-image: url('../img/actions/user.svg?v=1');
+}
+.icon-category-enabled {
+	background-image: url('../img/actions/checkmark.svg?v=1');
+}
+.icon-category-disabled {
+	background-image: url('../img/actions/close.svg?v=1');
+}
+.icon-category-app-bundles {
+	background-image: url('../img/categories/bundles.svg?v=1');
+}
+
+.icon-category-files {
+	background-image: url('../img/categories/files.svg?v=1');
+}
+
+.icon-category-social {
+	background-image: url('../img/categories/social.svg?v=1');
+}
+
+.icon-category-office {
+	background-image: url('../img/categories/office.svg?v=1');
+}
+
+.icon-category-auth {
+	background-image: url('../img/categories/auth.svg?v=1');
+}
+
+.icon-category-monitoring {
+	background-image: url('../img/categories/monitoring.svg?v=1');
+}
+
+.icon-category-multimedia {
+	background-image: url('../img/categories/multimedia.svg?v=1');
+}
+
+.icon-category-organization {
+	background-image: url('../img/categories/organization.svg?v=1');
+}
+
+.icon-category-customization {
+	background-image: url('../img/categories/customization.svg?v=1');
+}
+
+.icon-category-integration {
+	background-image: url('../img/categories/integration.svg?v=1');
+}
+
+.icon-category-tools {
+	background-image: url('../img/actions/settings-dark.svg?v=1');
+}
diff --git a/core/img/actions/close.svg b/core/img/actions/close.svg
diff --git a/core/img/categories/auth.svg b/core/img/categories/auth.svg
diff --git a/core/img/categories/bundles.svg b/core/img/categories/bundles.svg
diff --git a/core/img/categories/customization.svg b/core/img/categories/customization.svg
diff --git a/core/img/categories/files.svg b/core/img/categories/files.svg
diff --git a/core/img/categories/integration.svg b/core/img/categories/integration.svg
diff --git a/core/img/categories/monitoring.svg b/core/img/categories/monitoring.svg
diff --git a/core/img/categories/multimedia.svg b/core/img/categories/multimedia.svg
diff --git a/core/img/categories/office.svg b/core/img/categories/office.svg
diff --git a/core/img/categories/organization.svg b/core/img/categories/organization.svg
diff --git a/core/img/categories/social.svg b/core/img/categories/social.svg
diff --git a/settings/js/apps.js b/settings/js/apps.js
@@ -41,9 +41,9 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		}
 
 		var categories = [
-			{displayName: t('settings', 'Enabled apps'), ident: 'enabled', id: '0'},
-			{displayName: t('settings', 'Disabled apps'), ident: 'disabled', id: '1'},
-			{displayName: t('settings', 'Your apps'), ident: 'installed', id: '2'}
+			{displayName: t('settings', 'Your apps'), ident: 'installed', id: '0'},
+			{displayName: t('settings', 'Enabled apps'), ident: 'enabled', id: '1'},
+			{displayName: t('settings', 'Disabled apps'), ident: 'disabled', id: '2'}
 		];
 
 		var source   = $("#categories-template").html();

diff --git a/settings/templates/apps.php b/settings/templates/apps.php
@@ -18,13 +18,13 @@
 <script id="categories-template" type="text/x-handlebars-template">
 {{#each this}}
 	<li id="app-category-{{ident}}" data-category-id="{{ident}}" tabindex="0">
-		<a href="#">{{displayName}}</a>
+		<a href="#" class="icon-category-{{ident}}">{{displayName}}</a>
 	</li>
 {{/each}}
 
 <?php if($_['appstoreEnabled']): ?>
 	<li>
-		<a class="app-external" target="_blank" rel="noreferrer" href="https://docs.nextcloud.org/server/12/developer_manual/"><?php p($l->t('Developer documentation'));?> ↗</a>
+		<a class="app-external icon-info" target="_blank" rel="noreferrer" href="https://docs.nextcloud.org/server/12/developer_manual/"><?php p($l->t('Developer documentation'));?> ↗</a>
 	</li>
 <?php endif; ?>
 </script>