add icons to files sidebar, fix shade, fix position of settings icon and text

14 files changed, 61 insertions, 2 deletions

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index d34013db499..455ccae3f96 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -103,6 +103,27 @@
 	min-height: 100%;
 }
 
+/* icons for sidebar */
+.nav-icon-files {
+	background-image: url('../img/folder.svg');
+}
+.nav-icon-favorites {
+	background-image: url('../img/star.svg');
+}
+.nav-icon-sharingin,
+.nav-icon-sharingout {
+	background-image: url('../img/share.svg');
+}
+.nav-icon-sharinglinks {
+	background-image: url('../img/public.svg');
+}
+.nav-icon-extstoragemounts {
+	background-image: url('../img/external.svg');
+}
+.nav-icon-trashbin {
+	background-image: url('../img/delete.svg');
+}
+
 /* move Deleted Files to bottom of sidebar */
 .nav-trashbin {
 	position: fixed !important;
diff --git a/apps/files/img/delete.png b/apps/files/img/delete.png
new file mode 100644
index 00000000000..b2ab8c5efef
--- /dev/null
+++ b/apps/files/img/delete.png
diff --git a/apps/files/img/delete.svg b/apps/files/img/delete.svg
new file mode 100644
index 00000000000..b6dc2cc4173
--- /dev/null
+++ b/apps/files/img/delete.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path opacity=".5" 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"/>
+</svg>
diff --git a/apps/files/img/external.png b/apps/files/img/external.png
new file mode 100644
index 00000000000..2ac5e9344c3
--- /dev/null
+++ b/apps/files/img/external.png
diff --git a/apps/files/img/external.svg b/apps/files/img/external.svg
new file mode 100644
index 00000000000..d1940f2f1b3
--- /dev/null
+++ b/apps/files/img/external.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <path opacity=".5" d="m7.4515 1.6186 2.3806 2.2573-3.5709 3.386 2.3806 2.2573 3.5709-3.386 2.3806 2.2573v-6.7725h-7.1422zm-4.7612 1.1286c-0.65945 0-1.1903 0.5034-1.1903 1.1286v9.029c0 0.6253 0.53085 1.1286 1.1903 1.1286h9.522c0.6594 0 1.1903-0.5034 1.1903-1.1286v-3.386l-1.19-1.1287v4.5146h-9.5217v-9.029h4.761l-1.1905-1.1287h-3.5707z"/>
+</svg>
diff --git a/apps/files/img/folder.png b/apps/files/img/folder.png
new file mode 100644
index 00000000000..ada4c4c2f88
--- /dev/null
+++ b/apps/files/img/folder.png
diff --git a/apps/files/img/folder.svg b/apps/files/img/folder.svg
new file mode 100644
index 00000000000..1a97808443d
--- /dev/null
+++ b/apps/files/img/folder.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g opacity=".5" fill-rule="evenodd" transform="matrix(.86667 0 0 .86667 -172.04 -864.43)">
+  <path d="m200.2 998.57c-0.28913 0-0.53125 0.24212-0.53125 0.53125v13.938c0 0.2985 0.23264 0.5312 0.53125 0.5312h15.091c0.2986 0 0.53125-0.2327 0.53125-0.5312l0.0004-8.1661c0-0.289-0.24212-0.5338-0.53125-0.5338h-12.161l-0.0004 6.349c0 0.2771-0.30237 0.5638-0.57937 0.5638s-0.57447-0.2867-0.57447-0.5638l0.0004-7.0055c0-0.2771 0.23357-0.4974 0.51057-0.4974h2.6507l8.3774 0.0003-0.0004-1.7029c0-0.3272-0.24549-0.6047-0.57258-0.6047h-7.5043v-1.7764c0-0.28915-0.23415-0.53125-0.52328-0.53125z" fill-rule="evenodd"/>
+ </g>
+</svg>
diff --git a/apps/files/img/public.png b/apps/files/img/public.png
new file mode 100644
index 00000000000..f49c5fb1ee5
--- /dev/null
+++ b/apps/files/img/public.png
diff --git a/apps/files/img/public.svg b/apps/files/img/public.svg
new file mode 100644
index 00000000000..23ac51d8367
--- /dev/null
+++ b/apps/files/img/public.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g opacity=".5" transform="matrix(.67042 -.67042 .67042 .67042 .62542 93.143)">
+  <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m69.5-61.5c-1.9217 0-3.5 1.5783-3.5 3.5 0 0.17425 0.0062 0.33232 0.03125 0.5h2.0625c-0.053-0.156-0.094-0.323-0.094-0.5 0-0.8483 0.6517-1.5 1.5-1.5h5c0.8483 0 1.5 0.6517 1.5 1.5s-0.6517 1.5-1.5 1.5h-1.6875c-0.28733 0.79501-0.78612 1.4793-1.4375 2h3.125c1.9217 0 3.5-1.5783 3.5-3.5s-1.5783-3.5-3.5-3.5h-5z"/>
+  <path style="block-progression:tb;color:#000000;text-transform:none;text-indent:0" d="m68.5-54.5c1.9217 0 3.5-1.5783 3.5-3.5 0-0.17425-0.0062-0.33232-0.03125-0.5h-2.0625c0.053 0.156 0.094 0.323 0.094 0.5 0 0.8483-0.6517 1.5-1.5 1.5h-5c-0.8483 0-1.5-0.6517-1.5-1.5s0.6517-1.5 1.5-1.5h1.6875c0.28733-0.79501 0.78612-1.4793 1.4375-2h-3.125c-1.9217 0-3.5 1.5783-3.5 3.5s1.5783 3.5 3.5 3.5h5z"/>
+ </g>
+</svg>
diff --git a/apps/files/img/share.png b/apps/files/img/share.png
new file mode 100644
index 00000000000..61c87e78b6c
--- /dev/null
+++ b/apps/files/img/share.png
diff --git a/apps/files/img/share.svg b/apps/files/img/share.svg
new file mode 100644
index 00000000000..97f52f2e783
--- /dev/null
+++ b/apps/files/img/share.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g opacity=".5" transform="translate(0 -1036.4)">
+  <path d="m12.228 1037.4c-1.3565 0-2.4592 1.0977-2.4592 2.4542 0 0.075 0.0084 0.1504 0.0149 0.2236l-4.7346 2.4145c-0.4291-0.3667-0.98611-0.5863-1.5947-0.5863-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.477l4.8637 2.4741c-0.0024 0.044-0.0099 0.089-0.0099 0.1342 0 1.3565 1.1027 2.4542 2.4592 2.4542s2.4542-1.0977 2.4542-2.4542-1.0977-2.4592-2.4542-2.4592c-0.63653 0-1.218 0.2437-1.6544 0.6409l-4.6953-2.4c0.01892-0.1228 0.03478-0.2494 0.03478-0.3775 0-0.072-0.0089-0.1437-0.0149-0.2137l4.7395-2.4145c0.42802 0.3627 0.98488 0.5813 1.5898 0.5813 1.3565 0 2.4542-1.1027 2.4542-2.4592s-1.0977-2.4542-2.4542-2.4542z"/>
+ </g>
+</svg>
diff --git a/apps/files/img/star.png b/apps/files/img/star.png
new file mode 100644
index 00000000000..6b0ec67ec1c
--- /dev/null
+++ b/apps/files/img/star.png
diff --git a/apps/files/img/star.svg b/apps/files/img/star.svg
new file mode 100644
index 00000000000..fb3eef1e452
--- /dev/null
+++ b/apps/files/img/star.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <g opacity=".5" transform="matrix(.049689 0 0 .049689 -7.3558 -36.792)">
+  <path d="m330.36 858.43 43.111 108.06 117.64 9.2572-89.445 74.392 27.55 114.75-98.391-62.079-100.62 61.66 28.637-112.76-89.734-76.638 116.09-7.6094z" transform="translate(-21.071,-112.5)"/>
+ </g>
+</svg>
diff --git a/apps/files/templates/appnavigation.php b/apps/files/templates/appnavigation.php
index 8e72fe63316..5521a5d44fa 100644
--- a/apps/files/templates/appnavigation.php
+++ b/apps/files/templates/appnavigation.php
@@ -1,7 +1,12 @@
 <div id="app-navigation">
-	<ul>
+	<ul class="with-icon">
 		<?php foreach ($_['navigationItems'] as $item) { ?>
-		<li data-id="<?php p($item['id']) ?>" class="nav-<?php p($item['id']) ?>"><a href="<?php p(isset($item['href']) ? $item['href'] : '#') ?>"><?php p($item['name']);?></a></li>
+		<li data-id="<?php p($item['id']) ?>" class="nav-<?php p($item['id']) ?>">
+			<a href="<?php p(isset($item['href']) ? $item['href'] : '#') ?>"
+				class="nav-icon-<?php p($item['id']) ?>">
+				<?php p($item['name']);?>
+			</a>
+		</li>
 		<?php } ?>
 	</ul>
 	<div id="app-settings">