Add the icon for the default sections

Signed-off-by: Joas Schilling <coding@schilljs.com>

Author: nickvergessen

core/img/actions/settings-dark.svg

@@ -792,7 +792,8 @@ public function __construct($webRoot, \OC\Config $config) {
 				$c->getEncryptionManager(),
 				$c->getUserManager(),
 				$c->getLockingProvider(),
-				new \OC\Settings\Mapper($c->getDatabaseConnection())
+				new \OC\Settings\Mapper($c->getDatabaseConnection()),
+				$c->getURLGenerator()
 			);
 			return $manager;
 		});

lib/private/Server.php

@@ -29,6 +29,7 @@
 use OCP\IDBConnection;
 use OCP\IL10N;
 use OCP\ILogger;
+use OCP\IURLGenerator;
 use OCP\IUserManager;
 use OCP\Lock\ILockingProvider;
 use OCP\Settings\ISettings;
@@ -55,6 +56,8 @@ class Manager implements IManager {
 	private $userManager;
 	/** @var ILockingProvider */
 	private $lockingProvider;
+	/** @var IURLGenerator */
+	private $url;
 
 	/**
 	 * @param ILogger $log
@@ -65,7 +68,7 @@ class Manager implements IManager {
 	 * @param IUserManager $userManager
 	 * @param ILockingProvider $lockingProvider
 	 * @param Mapper $mapper
-	 * @internal param IDBConnection $dbc
+	 * @param IURLGenerator $url
 	 */
 	public function __construct(
 		ILogger $log,
@@ -75,7 +78,8 @@ public function __construct(
 		EncryptionManager $encryptionManager,
 		IUserManager $userManager,
 		ILockingProvider $lockingProvider,
-		Mapper $mapper
+		Mapper $mapper,
+		IURLGenerator $url
 	) {
 		$this->log = $log;
 		$this->dbc = $dbc;
@@ -85,6 +89,7 @@ public function __construct(
 		$this->encryptionManager = $encryptionManager;
 		$this->userManager = $userManager;
 		$this->lockingProvider = $lockingProvider;
+		$this->url = $url;
 	}
 
 	/**
@@ -260,11 +265,11 @@ private function query($className) {
 	public function getAdminSections() {
 		// built-in sections
 		$sections = [
-			0 => [new Section('server', $this->l->t('Server settings'), 0)],
-			5 => [new Section('sharing', $this->l->t('Sharing'), 0)],
-			45 => [new Section('encryption', $this->l->t('Encryption'), 0)],
-			98 => [new Section('additional', $this->l->t('Additional settings'), 0)],
-			99 => [new Section('tips-tricks', $this->l->t('Tips & tricks'), 0)],
+			0 => [new Section('server', $this->l->t('Server settings'), 0, $this->url->imagePath('settings', 'admin.svg'))],
+			5 => [new Section('sharing', $this->l->t('Sharing'), 0, $this->url->imagePath('core', 'actions/share.svg'))],
+			45 => [new Section('encryption', $this->l->t('Encryption'), 0, $this->url->imagePath('core', 'actions/password.svg'))],
+			98 => [new Section('additional', $this->l->t('Additional settings'), 0, $this->url->imagePath('core', 'actions/settings-dark.svg'))],
+			99 => [new Section('tips-tricks', $this->l->t('Tips & tricks'), 0, $this->url->imagePath('settings', 'help.svg'))],
 		];
 
 		$rows = $this->mapper->getAdminSectionsFromDB();

lib/private/Settings/Manager.php

@@ -23,25 +23,29 @@
 
 namespace OC\Settings;
 
-use OCP\Settings\ISection;
+use OCP\Settings\IIconSection;
 
-class Section implements ISection {
+class Section implements IIconSection {
 	/** @var string */
 	private $id;
 	/** @var string */
 	private $name;
 	/** @var int */
 	private $priority;
+	/** @var string */
+	private $icon;
 
 	/**
 	 * @param string $id
 	 * @param string $name
 	 * @param int $priority
+	 * @param string $icon
 	 */
-	public function __construct($id, $name, $priority) {
+	public function __construct($id, $name, $priority, $icon = '') {
 		$this->id = $id;
 		$this->name = $name;
 		$this->priority = $priority;
+		$this->icon = $icon;
 	}
 
 	/**
@@ -74,4 +78,15 @@ public function getName() {
 	public function getPriority() {
 		return $this->priority;
 	}
+
+	/**
+	 * returns the relative path to an 16*16 icon describing the section.
+	 * e.g. '/core/img/places/files.svg'
+	 *
+	 * @returns string
+	 * @since 12
+	 */
+	public function getIcon() {
+		return $this->icon;
+	}
 }

lib/private/Settings/Section.php

@@ -737,35 +737,6 @@ table.grid td.date{
 	padding-left: 25px;
 }
 
-/* icons for sidebar */
-.nav-icon-server {
-	background-image: url('../img/admin.svg?v=1');
-}
-.nav-icon-sharing {
-	background-image: url('../img/share.svg?v=1');
-}
-.nav-icon-theming {
-	background-image: url('../img/theming.svg?v=1');
-}
-.nav-icon-encryption {
-	background-image: url('../img/password.svg?v=1');
-}
-.nav-icon-workflow {
-	background-image: url('../img/tag.svg?v=1');
-}
-.nav-icon-survey_client {
-	background-image: url('../img/toggle.svg?v=1');
-}
-.nav-icon-logging {
-	background-image: url('../img/edit.svg?v=1');
-}
-.nav-icon-additional {
-	background-image: url('../img/settings.svg?v=1');
-}
-.nav-icon-tips-tricks {
-	background-image: url('../img/help.svg?v=1');
-}
-
 #security-warning li {
 	list-style: initial;
 	margin: 10px 0;