From 5e1ce69b0521e1cfc56a5b3212697f850e9cacdc Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@karlitschek.de>
Date: Mon, 24 Apr 2017 13:09:30 -0400
Subject: adding some documentation hints and some smaller cleanup

---
 settings/css/settings.css                    | 5 +++++
 settings/templates/admin/additional-mail.php | 4 ++--
 settings/templates/admin/encryption.php      | 2 +-
 settings/templates/admin/server.php          | 4 +++-
 settings/templates/admin/sharing.php         | 1 +
 settings/templates/admin/tipstricks.php      | 1 +
 6 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'settings')

diff --git a/settings/css/settings.css b/settings/css/settings.css
index a046148dcc4..814592baa45 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -979,3 +979,8 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
 #warning {
 	color: red;
 }
+.settings-hint {
+	margin-top: -12px;
+	color: #AAAAAA;
+	font-size: 90%;
+}
diff --git a/settings/templates/admin/additional-mail.php b/settings/templates/admin/additional-mail.php
index 7f8706274f9..91f34fa8010 100644
--- a/settings/templates/admin/additional-mail.php
+++ b/settings/templates/admin/additional-mail.php
@@ -56,8 +56,8 @@ if ($_['mail_smtpmode'] === 'qmail') {
 		<a target="_blank" rel="noreferrer" class="icon-info"
 		   title="<?php p($l->t('Open documentation'));?>"
 		   href="<?php p(link_to_docs('admin-email')); ?>"></a>
-
-		<p><?php p($l->t('This is used for sending out notifications.')); ?> <span id="mail_settings_msg" class="msg"></span></p>
+		<p class="settings-hint"><?php p($l->t('It is important to setup this server to be able to send emails. This is for example used to send out notification.')); ?></p>
+		<p><span id="mail_settings_msg" class="msg"></span></p>
 
 		<p>
 			<label for="mail_smtpmode"><?php p($l->t('Send mode')); ?></label>
diff --git a/settings/templates/admin/encryption.php b/settings/templates/admin/encryption.php
index 4b6d9045689..b0869957927 100644
--- a/settings/templates/admin/encryption.php
+++ b/settings/templates/admin/encryption.php
@@ -31,7 +31,7 @@
 	<a target="_blank" rel="noreferrer" class="icon-info"
 	   title="<?php p($l->t('Open documentation'));?>"
 	   href="<?php p(link_to_docs('admin-encryption')); ?>"></a>
-
+	<p class="settings-hint"><?php p($l->t('Server-side encryption makes is possible to encrypt files that are uploaded to this server. This comes with limitation like a performance penalty. Enable only if needed.')); ?></p>
 	<p id="enable">
 		<input type="checkbox"
 			   id="enableEncryption" class="checkbox"
diff --git a/settings/templates/admin/server.php b/settings/templates/admin/server.php
index d0fc6378e9a..05720ac7c6e 100644
--- a/settings/templates/admin/server.php
+++ b/settings/templates/admin/server.php
@@ -28,6 +28,7 @@
 
 <div id="security-warning" class="section">
 	<h2><?php p($l->t('Security & setup warnings'));?></h2>
+	<p class="settings-hint"><?php p($l->t('It\'s important for the security and performance of your instance that everything is configured correctly. To help you with that we are doing some automatic checks. Please see the Tips & Ticks section and the documentation for more information.'));?></p>
 	<ul>
 		<?php
 		// is php setup properly to query system environment variables like getenv('PATH')
@@ -181,6 +182,7 @@
 	   title="<?php p($l->t('Open documentation'));?>"
 	   href="<?php p(link_to_docs('admin-background-jobs')); ?>"></a>
 
+	<p class="settings-hint"><?php p($l->t('For the optimal performance it\'s important to configure background jobs correctly. For bigger instances \'Cron\' is the recommended setting. Please see the documentation for more information.'));?></p>
 	<p>
 		<input type="radio" name="mode" value="ajax" class="radio"
 			   id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] === "ajax") {
@@ -223,5 +225,5 @@
 <div class="section">
 	<!-- should be the last part, so Updater can follow if enabled (it has no heading therefore). -->
 	<h2><?php p($l->t('Version'));?></h2>
-	<p><a href="<?php print_unescaped($theme->getBaseUrl()); ?>" rel="noreferrer" target="_blank"><?php p($theme->getTitle()); ?></a> <?php p(OC_Util::getHumanVersion()) ?></p>
+	<p><strong><a href="<?php print_unescaped($theme->getBaseUrl()); ?>" rel="noreferrer" target="_blank"><?php p($theme->getTitle()); ?></a> <?php p(OC_Util::getHumanVersion()) ?></strong></p>
 </div>
diff --git a/settings/templates/admin/sharing.php b/settings/templates/admin/sharing.php
index 9de71c58990..efb4c0f5cc8 100644
--- a/settings/templates/admin/sharing.php
+++ b/settings/templates/admin/sharing.php
@@ -31,6 +31,7 @@
 	<a target="_blank" rel="noreferrer" class="icon-info"
 	   title="<?php p($l->t('Open documentation'));?>"
 	   href="<?php p(link_to_docs('admin-sharing')); ?>"></a>
+        <p class="settings-hint"><?php p($l->t('As Admin you can fine tune the sharing behavior. Please see the documentation for more information.'));?></p>
 	<p id="enable">
 		<input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled" class="checkbox"
 			   value="1" <?php if ($_['shareAPIEnabled'] === 'yes') print_unescaped('checked="checked"'); ?> />
diff --git a/settings/templates/admin/tipstricks.php b/settings/templates/admin/tipstricks.php
index cee5cd8032d..c18c7f25f39 100644
--- a/settings/templates/admin/tipstricks.php
+++ b/settings/templates/admin/tipstricks.php
@@ -28,6 +28,7 @@
 
 <div class="section" id="admin-tips">
 	<h2><?php p($l->t('Tips & tricks'));?></h2>
+	<p class="settings-hint"><?php p($l->t('There are a lot of features and config switches available to optimally customize and use this instance. Here are some pointers for more information.')); ?></p>
 	<ul>
 		<?php
 		// SQLite database performance issue
-- 
cgit v1.2.3


From 4e537b5d6bf95a49a4aa7b3ccd66a6ad92185cea Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Tue, 25 Apr 2017 15:57:02 +0200
Subject: Small layout fixes to settings hints

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
---
 apps/federation/css/settings-admin.css  | 4 ++--
 apps/sharebymail/css/settings-admin.css | 2 +-
 settings/css/settings.css               | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'settings')

diff --git a/apps/federation/css/settings-admin.css b/apps/federation/css/settings-admin.css
index 97a50785f82..3fd5f5aea6d 100644
--- a/apps/federation/css/settings-admin.css
+++ b/apps/federation/css/settings-admin.css
@@ -1,9 +1,9 @@
 #ocFederationSettings p {
-	padding-top: 10px;
+	padding-bottom: 10px;
 }
 
 #listOfTrustedServers li {
-	padding-top: 10px;
+	padding-bottom: 10px;
 }
 
 .removeTrustedServer {
diff --git a/apps/sharebymail/css/settings-admin.css b/apps/sharebymail/css/settings-admin.css
index c7bfb122f3e..fc6093ad525 100644
--- a/apps/sharebymail/css/settings-admin.css
+++ b/apps/sharebymail/css/settings-admin.css
@@ -1,3 +1,3 @@
 #ncShareByMailSettings p {
-	padding-top: 10px;
+	padding-bottom: 10px;
 }
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 814592baa45..fe7be86d6e8 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -979,8 +979,8 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
 #warning {
 	color: red;
 }
+
 .settings-hint {
-	margin-top: -12px;
-	color: #AAAAAA;
-	font-size: 90%;
+	margin-bottom: 12px;
+	opacity: .7;
 }
-- 
cgit v1.2.3


From bbb58625fee3127208c968c0f81cd5f9f86d97eb Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Tue, 25 Apr 2017 17:45:02 +0200
Subject: Wording fixes

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
---
 apps/federation/templates/settings-admin.php  | 3 +--
 apps/sharebymail/templates/settings-admin.php | 3 +--
 apps/systemtags/templates/admin.php           | 4 ++--
 settings/templates/admin/additional-mail.php  | 3 +--
 settings/templates/admin/encryption.php       | 2 +-
 settings/templates/admin/server.php           | 2 +-
 settings/templates/admin/sharing.php          | 2 +-
 7 files changed, 8 insertions(+), 11 deletions(-)

(limited to 'settings')

diff --git a/apps/federation/templates/settings-admin.php b/apps/federation/templates/settings-admin.php
index 572fefc08bb..f0c2db81961 100644
--- a/apps/federation/templates/settings-admin.php
+++ b/apps/federation/templates/settings-admin.php
@@ -7,7 +7,7 @@ script('federation', 'settings-admin');
 style('federation', 'settings-admin')
 ?>
 <div id="ocFederationSettings" class="section">
-	<h2><?php p($l->t('Trusted Servers')); ?></h2>
+	<h2><?php p($l->t('Trusted servers')); ?></h2>
 	<p class="settings-hint"><?php p($l->t('Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.')); ?></p>
 
 	<p>
@@ -42,4 +42,3 @@ style('federation', 'settings-admin')
 	</p>
 
 </div>
-
diff --git a/apps/sharebymail/templates/settings-admin.php b/apps/sharebymail/templates/settings-admin.php
index d3a9dbacaf3..50fede86685 100644
--- a/apps/sharebymail/templates/settings-admin.php
+++ b/apps/sharebymail/templates/settings-admin.php
@@ -8,7 +8,7 @@ style('sharebymail', 'settings-admin');
 ?>
 <div id="ncShareByMailSettings" class="section">
 	<h2><?php p($l->t('Share by mail')); ?></h2>
-	<p class="settings-hint"><?php p($l->t('Send a personalized link to a file or folder by mail.')); ?></p>
+	<p class="settings-hint"><?php p($l->t('Allows users to share a personalized link to a file or folder by putting in an email address.')); ?></p>
 
 	<p>
 		<input id="sendPasswordMail" type="checkbox" class="checkbox" <?php if($_['sendPasswordMail']) p('checked'); ?> />
@@ -18,4 +18,3 @@ style('sharebymail', 'settings-admin');
 	</p>
 
 </div>
-
diff --git a/apps/systemtags/templates/admin.php b/apps/systemtags/templates/admin.php
index 8cd6b282dfc..e964f610ca1 100644
--- a/apps/systemtags/templates/admin.php
+++ b/apps/systemtags/templates/admin.php
@@ -33,9 +33,9 @@ script('systemtags', 'admin');
 
 <form id="systemtags" class="section" data-systemtag-id="">
 	<h2><?php p($l->t('Collaborative tags')); ?></h2>
-	<p class="settings-hint"><?php p($l->t('Make it possible to create and edit collaborative tags. This tags effect all users.')); ?></p>
+	<p class="settings-hint"><?php p($l->t('Create and edit collaborative tags. These tags affect all users.')); ?></p>
 
-	<input type="hidden" name="systemtag" id="systemtag" placeholder="<?php p($l->t('Select tag…')); ?>" style="width: 400px;" />
+	<input type="hidden" name="systemtag" id="systemtag" placeholder="<?php p($l->t('Select tag …')); ?>" style="width: 400px;" />
 
 	<br><br>
 
diff --git a/settings/templates/admin/additional-mail.php b/settings/templates/admin/additional-mail.php
index 91f34fa8010..249252dc694 100644
--- a/settings/templates/admin/additional-mail.php
+++ b/settings/templates/admin/additional-mail.php
@@ -56,7 +56,7 @@ if ($_['mail_smtpmode'] === 'qmail') {
 		<a target="_blank" rel="noreferrer" class="icon-info"
 		   title="<?php p($l->t('Open documentation'));?>"
 		   href="<?php p(link_to_docs('admin-email')); ?>"></a>
-		<p class="settings-hint"><?php p($l->t('It is important to setup this server to be able to send emails. This is for example used to send out notification.')); ?></p>
+		<p class="settings-hint"><?php p($l->t('It is important to set up this server to be able to send emails, like for password reset and notifications.')); ?></p>
 		<p><span id="mail_settings_msg" class="msg"></span></p>
 
 		<p>
@@ -137,4 +137,3 @@ if ($_['mail_smtpmode'] === 'qmail') {
 	<input type="submit" name="sendtestemail" id="sendtestemail" value="<?php p($l->t('Send email')); ?>"/>
 	<span id="sendtestmail_msg" class="msg"></span>
 </div>
-
diff --git a/settings/templates/admin/encryption.php b/settings/templates/admin/encryption.php
index b0869957927..1d956a8f7c1 100644
--- a/settings/templates/admin/encryption.php
+++ b/settings/templates/admin/encryption.php
@@ -31,7 +31,7 @@
 	<a target="_blank" rel="noreferrer" class="icon-info"
 	   title="<?php p($l->t('Open documentation'));?>"
 	   href="<?php p(link_to_docs('admin-encryption')); ?>"></a>
-	<p class="settings-hint"><?php p($l->t('Server-side encryption makes is possible to encrypt files that are uploaded to this server. This comes with limitation like a performance penalty. Enable only if needed.')); ?></p>
+	<p class="settings-hint"><?php p($l->t('Server-side encryption makes it possible to encrypt files which are uploaded to this server. This comes with limitations like a performance penalty, so enable this only if needed.')); ?></p>
 	<p id="enable">
 		<input type="checkbox"
 			   id="enableEncryption" class="checkbox"
diff --git a/settings/templates/admin/server.php b/settings/templates/admin/server.php
index 05720ac7c6e..391d100dcf7 100644
--- a/settings/templates/admin/server.php
+++ b/settings/templates/admin/server.php
@@ -182,7 +182,7 @@
 	   title="<?php p($l->t('Open documentation'));?>"
 	   href="<?php p(link_to_docs('admin-background-jobs')); ?>"></a>
 
-	<p class="settings-hint"><?php p($l->t('For the optimal performance it\'s important to configure background jobs correctly. For bigger instances \'Cron\' is the recommended setting. Please see the documentation for more information.'));?></p>
+	<p class="settings-hint"><?php p($l->t('For optimal performance it\'s important to configure background jobs correctly. For bigger instances \'Cron\' is the recommended setting. Please see the documentation for more information.'));?></p>
 	<p>
 		<input type="radio" name="mode" value="ajax" class="radio"
 			   id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] === "ajax") {
diff --git a/settings/templates/admin/sharing.php b/settings/templates/admin/sharing.php
index efb4c0f5cc8..38071a4bee9 100644
--- a/settings/templates/admin/sharing.php
+++ b/settings/templates/admin/sharing.php
@@ -31,7 +31,7 @@
 	<a target="_blank" rel="noreferrer" class="icon-info"
 	   title="<?php p($l->t('Open documentation'));?>"
 	   href="<?php p(link_to_docs('admin-sharing')); ?>"></a>
-        <p class="settings-hint"><?php p($l->t('As Admin you can fine tune the sharing behavior. Please see the documentation for more information.'));?></p>
+        <p class="settings-hint"><?php p($l->t('As admin you can fine-tune the sharing behavior. Please see the documentation for more information.'));?></p>
 	<p id="enable">
 		<input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled" class="checkbox"
 			   value="1" <?php if ($_['shareAPIEnabled'] === 'yes') print_unescaped('checked="checked"'); ?> />
-- 
cgit v1.2.3


From 3bb41f414448ae116e8c36a72f8724b374119f53 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Tue, 25 Apr 2017 17:47:23 +0200
Subject: Move h2 and settings-hint together

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
---
 settings/css/settings.css | 1 +
 1 file changed, 1 insertion(+)

(limited to 'settings')

diff --git a/settings/css/settings.css b/settings/css/settings.css
index fe7be86d6e8..7e91877773e 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -981,6 +981,7 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
 }
 
 .settings-hint {
+	margin-top: -12px;
 	margin-bottom: 12px;
 	opacity: .7;
 }
-- 
cgit v1.2.3