Merge pull request #37923 from owncloud/phoenix-default-menu-item

micbar · web-flow · commit 1b14b281fbe7 · 2020-09-22T09:56:02.000+02:00
Add new defaults for the icon and label of the phoenix menu item
diff --git a/changelog/unreleased/37923 b/changelog/unreleased/37923
@@ -0,0 +1,6 @@
+Change: New defaults for phoenix app switcher icon and label
+
+When phoenix is configured (phoenix.baseUrl in config.php), the app switcher has a menu item for Phoenix. This now has a new and configurable default icon and default label.
+
+https://github.com/owncloud/core/pull/37923
+https://github.com/owncloud/product/issues/227
diff --git a/core/img/apps/phoenix.svg b/core/img/apps/phoenix.svg
@@ -0,0 +1,4 @@
+<svg width="48" height="48" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg">
+    <path fill="#fff" d="M40.3333 6H7.66667C5.07667 6 3 8.1 3 10.6667V38.6667C3 41.2333 5.07667 43.3333 7.66667 43.3333H40.3333C42.9 43.3333 45 41.2333 45 38.6667V10.6667C45 8.1 42.9233 6 40.3333 6ZM40.3333 38.6667H7.66667V15.3333H40.3333V38.6667Z"/>
+    <path fill="#fff" d="M17.8767 25.3333L13 30.2222L17.8767 35.1111V31.4444H26.4444V29H17.8767V25.3333ZM35 22.8889L30.1233 18V21.6666H21.5556V24.1111H30.1233V27.7777L35 22.8889Z"/>
+</svg>
diff --git a/lib/private/NavigationManager.php b/lib/private/NavigationManager.php
@@ -193,11 +193,13 @@ private function init() {
 		// add phoenix if setup
 		$phoenixBaseUrl = $this->config->getSystemValue('phoenix.baseUrl', null);
 		if ($phoenixBaseUrl) {
-			$iconPath = $this->urlGenerator->imagePath('core', 'default-app-icon.svg');
+			$iconPath = $this->config->getSystemValue('phoenix.icon', $this->urlGenerator->imagePath('core', 'apps/phoenix.svg'));
+			$l = $this->l10nFac->get("core");
+			$label = $this->config->getSystemValue('phoenix.label', $l->t('New Design'));
 			$this->add([
 				'id' => 'phoenix',
 				'href' => $phoenixBaseUrl,
-				'name' => 'Phoenix',
+				'name' => $label,
 				'icon' => $iconPath,
 				'order' => 99
 			]);
