From b1b8c99193c52fa0cf2ac530a96d391ec7fcbc61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Wed, 8 Nov 2017 14:53:44 +0100
Subject: Theming: add hint about favicon generation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Julius Härtl <jus@bitgrid.net>
---
 apps/theming/css/settings-admin.css       |  4 ++++
 apps/theming/lib/Settings/Admin.php       |  2 ++
 apps/theming/templates/settings-admin.php | 11 +++++++++++
 3 files changed, 17 insertions(+)

diff --git a/apps/theming/css/settings-admin.css b/apps/theming/css/settings-admin.css
index 7270ec59b83..b0fdb79b291 100644
--- a/apps/theming/css/settings-admin.css
+++ b/apps/theming/css/settings-admin.css
@@ -101,3 +101,7 @@ form.uploadButton {
     max-height: 20%;
     margin-top: 20px;
 }
+
+.theming-hints {
+    margin-top: 20px;
+}
\ No newline at end of file
diff --git a/apps/theming/lib/Settings/Admin.php b/apps/theming/lib/Settings/Admin.php
index 12f5dd2b8fa..708bf1914ea 100644
--- a/apps/theming/lib/Settings/Admin.php
+++ b/apps/theming/lib/Settings/Admin.php
@@ -82,6 +82,8 @@ class Admin implements ISettings {
 			'background'      => $this->themingDefaults->getBackground(),
 			'backgroundMime'  => $this->config->getAppValue('theming', 'backgroundMime', ''),
 			'uploadLogoRoute' => $path,
+			'canThemeIcons'   => $this->themingDefaults->shouldReplaceIcons(),
+			'iconDocs'        => $this->urlGenerator->linkToDocs('admin-theming-icons')
 		];
 
 		return new TemplateResponse('theming', 'settings-admin', $parameters, '');
diff --git a/apps/theming/templates/settings-admin.php b/apps/theming/templates/settings-admin.php
index 717e2bdb83c..c7451e595d7 100644
--- a/apps/theming/templates/settings-admin.php
+++ b/apps/theming/templates/settings-admin.php
@@ -88,5 +88,16 @@ style('theming', 'settings-admin');
 	<div id="theming-preview">
 		<img src="<?php p($_['logo']); ?>" id="theming-preview-logo" />
 	</div>
+	<div class="theming-hints">
+		<?php if (!$_['canThemeIcons']) { ?>
+			<p class="info">
+				<a href="<?php p($_['iconDocs']); ?>">
+					<em>
+						<?php p($l->t('Install the Imagemagick PHP extension with support for SVG images to automatically generate favicons based on the uploaded logo and color.')); ?> ↗
+					</em>
+				</a>
+			</p>
+		<?php } ?>
+	</div>
 	<?php } ?>
 </div>
-- 
cgit v1.2.3


From 479966dce81593f8f2a49211566c4e71a4cbbbf7 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 9 Nov 2017 10:03:31 +0100
Subject: Fix unit tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---
 apps/theming/tests/Settings/AdminTest.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/theming/tests/Settings/AdminTest.php b/apps/theming/tests/Settings/AdminTest.php
index 4f3c9a9faaa..bb68651d143 100644
--- a/apps/theming/tests/Settings/AdminTest.php
+++ b/apps/theming/tests/Settings/AdminTest.php
@@ -101,6 +101,8 @@ class AdminTest extends TestCase {
 			'logoMime' => null,
 			'background' => null,
 			'backgroundMime' => null,
+			'canThemeIcons' => null,
+			'iconDocs' => null,
 		];
 
 		$expected = new TemplateResponse('theming', 'settings-admin', $params, '');
@@ -151,6 +153,8 @@ class AdminTest extends TestCase {
 			'logoMime' => null,
 			'background' => null,
 			'backgroundMime' => null,
+			'canThemeIcons' => null,
+			'iconDocs' => null,
 		];
 
 		$expected = new TemplateResponse('theming', 'settings-admin', $params, '');
-- 
cgit v1.2.3