Merge pull request #15500 from owncloud/installation-hint

add link to installation documentation to setup page

5 files changed, 41 insertions, 8 deletions

diff --git a/core/css/icons.css b/core/css/icons.css
index ecf6b17995d..0f602515883 100644
--- a/core/css/icons.css
+++ b/core/css/icons.css
@@ -79,6 +79,9 @@
 .icon-info {
 	background-image: url('../img/actions/info.svg');
 }
+.icon-info-white {
+	background-image: url('../img/actions/info-white.svg');
+}
 
 .icon-logout {
 	background-image: url('../img/actions/logout.svg');
diff --git a/core/css/styles.css b/core/css/styles.css
index b1df8d1a8a2..3df2abd49d6 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -409,7 +409,9 @@ input[type="submit"].enabled {
 	padding: 5px;
 }
 
-#body-login div.buttons { text-align:center; }
+#body-login div.buttons {
+	text-align: center;
+}
 #body-login p.info {
 	width: 22em;
 	margin: 0 auto;
@@ -420,14 +422,26 @@ input[type="submit"].enabled {
 	padding: 13px;
 	margin: -13px;
 }
-#body-login #submit.login { margin-right:7px; } /* quick fix for log in button not being aligned with input fields, should be properly fixed by input field width later */
-
-#body-login form { width:22em; margin:2em auto 2em; padding:0; }
+/* quick fix for log in button not being aligned with input fields, should be properly fixed by input field width later */
+#body-login #submit.login {
+	margin-right: 7px;
+}
+#body-login form {
+	width: 22em;
+	margin: 2em auto 2em;
+	padding: 0;
+}
 #body-login form fieldset {
 	margin-bottom: 20px;
 	text-align: left;
 }
-#body-login form #adminaccount { margin-bottom:15px; }
+#body-login form #sqliteInformation {
+	margin-top: -20px;
+	margin-bottom: 20px;
+}
+#body-login form #adminaccount {
+	margin-bottom: 15px;
+}
 #body-login form fieldset legend, #datadirContent label {
 	width: 100%;
 }
@@ -445,6 +459,9 @@ input[type="submit"].enabled {
 	vertical-align: bottom; /* adjust position of Advanced dropdown arrow */
 	margin-left: -4px;
 }
+#body-login .icon-info-white {
+	padding: 10px;
+}
 
 /* strengthify wrapper */
 #body-login .strengthify-wrapper {
@@ -618,7 +635,9 @@ label.infield {
 
 
 /* Warnings and errors are the same */
-#body-login .warning, #body-login .update, #body-login .error {
+#body-login .warning,
+#body-login .update,
+#body-login .error {
 	display: block;
 	padding: 10px;
 	background-color: rgba(0,0,0,.3);
diff --git a/core/img/actions/info-white.png b/core/img/actions/info-white.png
new file mode 100644
index 00000000000..670d7309c4e
--- /dev/null
+++ b/core/img/actions/info-white.png
diff --git a/core/img/actions/info-white.svg b/core/img/actions/info-white.svg
new file mode 100644
index 00000000000..d1f9ddb78cf
--- /dev/null
+++ b/core/img/actions/info-white.svg
@@ -0,0 +1,5 @@
+<?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/">
+ <rect style="color:#000000" fill-opacity="0" height="97.986" width="163.31" y="-32.993" x="-62.897"/>
+ <path d="m4.9999 7.4745c0.1553 0.3811 0.3254 0.6881 0.6445 0.2459 0.4066-0.2685 1.7587-1.4279 1.6616-0.3421-0.3681 2.0169-0.8342 4.0167-1.1711 6.0387-0.3916 1.115 0.635 2.068 1.6379 1.312 1.0779-0.503 1.9915-1.288 2.9275-2.012-0.144-0.322-0.25-0.789-0.596-0.346-0.4687 0.239-1.4695 1.317-1.6967 0.471 0.3154-2.181 0.9755-4.2953 1.3654-6.4616 0.3973-1.0049-0.3645-2.2233-1.3997-1.3634-1.2565 0.6173-2.2895 1.5844-3.3734 2.4575zm4.4593-7.4718c-1.3075-0.017336-1.9056 2.1455-0.6427 2.6795 1.0224 0.378 2.0768-0.7138 1.7898-1.7504-0.098-0.54186-0.598-0.96979-1.1471-0.92912h-0.000001z" fill="#fff"/>
+</svg>
diff --git a/core/templates/installation.php b/core/templates/installation.php
index 96e6119cad3..911bc05069f 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -28,7 +28,7 @@ script('core', [
 	<?php endif; ?>
 	<?php if(!$_['htaccessWorking']): ?>
 	<fieldset class="warning">
-		<legend><strong><?php p($l->t('Security Warning'));?></strong></legend>
+		<legend><strong><?php p($l->t('Security warning'));?></strong></legend>
 		<p><?php p($l->t('Your data directory and files are probably accessible from the internet because the .htaccess file does not work.'));?><br>
 		<?php print_unescaped($l->t(
 			'For information how to properly configure your server, please see the <a href="%s" target="_blank">documentation</a>.',
@@ -150,7 +150,7 @@ script('core', [
 
 	<?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?>
 		<fieldset id="sqliteInformation" class="warning">
-			<legend><?php p($l->t('Performance Warning'));?></legend>
+			<legend><?php p($l->t('Performance warning'));?></legend>
 			<p><?php p($l->t('SQLite will be used as database.'));?></p>
 			<p><?php p($l->t('For larger installations we recommend to choose a different database backend.'));?></p>
 			<p><?php p($l->t('Especially when using the desktop client for file syncing the use of SQLite is discouraged.')); ?></p>
@@ -158,4 +158,10 @@ script('core', [
 	<?php endif ?>
 
 	<div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" data-finishing="<?php p($l->t( 'Finishing …' )); ?>"></div>
+
+	<p class="info">
+		<span class="icon-info-white svg"></span>
+		<?php p($l->t('Need help?'));?>
+		<a target="_blank" href="<?php p(link_to_docs('admin-install')); ?>"><?php p($l->t('See the documentation'));?> ↗</a>
+	</p>
 </form>