From 671f16f7069dd070db63f9f13e0c1e8882c3d953 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 5 Oct 2016 11:03:48 +0200
Subject: [PATCH] Add icons to activity navigation
Signed-off-by: Joas Schilling <coding@schilljs.com>
---
apps/comments/lib/Activity/Extension.php | 5 +++--
apps/files/lib/Activity.php | 2 ++
apps/files_sharing/lib/Activity.php | 1 +
apps/systemtags/lib/Activity/Extension.php | 2 +-
core/css/icons.css | 7 +++++++
core/img/actions/star-dark.svg | 1 +
core/img/places/files-dark.svg | 1 +
7 files changed, 16 insertions(+), 3 deletions(-)
create mode 100644 core/img/actions/star-dark.svg
create mode 100644 core/img/places/files-dark.svg
diff --git a/apps/comments/lib/Activity/Extension.php b/apps/comments/lib/Activity/Extension.php
index 0a7503c1915..8abe42eb9df 100644
--- a/apps/comments/lib/Activity/Extension.php
+++ b/apps/comments/lib/Activity/Extension.php
@@ -247,14 +247,15 @@ class Extension implements IExtension {
public function getNavigation() {
$l = $this->getL10N();
return [
- 'apps' => [],
- 'top' => [
+ 'apps' => [
self::APP_NAME => [
'id' => self::APP_NAME,
+ 'icon' => 'icon-comment',
'name' => (string) $l->t('Comments'),
'url' => $this->URLGenerator->linkToRoute('activity.Activities.showList', ['filter' => self::APP_NAME]),
],
],
+ 'top' => [],
];
}
diff --git a/apps/files/lib/Activity.php b/apps/files/lib/Activity.php
index b9cc98cf7ea..a5277a6c18b 100644
--- a/apps/files/lib/Activity.php
+++ b/apps/files/lib/Activity.php
@@ -306,6 +306,7 @@ class Activity implements IExtension {
'top' => [
self::FILTER_FAVORITES => [
'id' => self::FILTER_FAVORITES,
+ 'icon' => 'icon-favorite',
'name' => (string) $this->l->t('Favorites'),
'url' => $this->URLGenerator->linkToRoute('activity.Activities.showList', ['filter' => self::FILTER_FAVORITES]),
],
@@ -313,6 +314,7 @@ class Activity implements IExtension {
'apps' => [
self::FILTER_FILES => [
'id' => self::FILTER_FILES,
+ 'icon' => 'icon-files-dark',
'name' => (string) $this->l->t('Files'),
'url' => $this->URLGenerator->linkToRoute('activity.Activities.showList', ['filter' => self::FILTER_FILES]),
],
diff --git a/apps/files_sharing/lib/Activity.php b/apps/files_sharing/lib/Activity.php
index f69f86175f8..4d57cc8c7b2 100644
--- a/apps/files_sharing/lib/Activity.php
+++ b/apps/files_sharing/lib/Activity.php
@@ -429,6 +429,7 @@ class Activity implements IExtension {
'top' => [
self::FILTER_SHARES => [
'id' => self::FILTER_SHARES,
+ 'icon' => 'icon-share',
'name' => (string) $l->t('Shares'),
'url' => $this->URLGenerator->linkToRoute('activity.Activities.showList', ['filter' => self::FILTER_SHARES]),
],
diff --git a/apps/systemtags/lib/Activity/Extension.php b/apps/systemtags/lib/Activity/Extension.php
index c7342bd2af7..9fac2ddbc62 100644
--- a/apps/systemtags/lib/Activity/Extension.php
+++ b/apps/systemtags/lib/Activity/Extension.php
@@ -98,7 +98,7 @@ class Extension implements IExtension {
public function getTypeIcon($type) {
switch ($type) {
case self::APP_NAME:
- return false;
+ return 'icon-tag';
}
return false;
diff --git a/core/css/icons.css b/core/css/icons.css
index 45069a23c44..50dcf51fd3a 100644
--- a/core/css/icons.css
+++ b/core/css/icons.css
@@ -282,6 +282,10 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-
background-image: url('../img/actions/sound-off.svg?v=1');
}
+.icon-favorite {
+ background-image: url('../img/actions/star-dark.svg?v=1');
+}
+
.icon-star,
.icon-starred:hover,
.icon-starred:focus {
@@ -365,6 +369,9 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading-
.icon-files {
background-image: url('../img/places/files.svg?v=1');
}
+.icon-files-dark {
+ background-image: url('../img/places/files-dark.svg?v=1');
+}
.icon-file,
.icon-filetype-text {
background-image: url('../img/filetypes/text.svg?v=1');
diff --git a/core/img/actions/star-dark.svg b/core/img/actions/star-dark.svg
new file mode 100644
index 00000000000..6edb7ea5000
--- /dev/null
+++ b/core/img/actions/star-dark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="22" width="22"><path d="M11.017.06l2.946 7.384L22 8.077l-6.11 5.082L17.77 21l-6.72-4.242-6.876 4.213 1.957-7.703L0 8.03l7.932-.52z"/></svg>
diff --git a/core/img/places/files-dark.svg b/core/img/places/files-dark.svg
new file mode 100644
index 00000000000..dfcad56018a
--- /dev/null
+++ b/core/img/places/files-dark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="32" width="32"><path d="M2.917 5.015c-.5 0-.92.42-.92.92v22.16c0 .516.402.92.92.92h26.157a.91.91 0 0 0 .92-.92V9.938c0-.5-.418-.926-.92-.926H15.997l-4-4z" fill-rule="evenodd"/></svg>
\ No newline at end of file
--
GitLab