adding some documentation hints and some smaller cleanup

apps/federatedfilesharing/templates/settings-admin.php

@@ -9,7 +9,6 @@ script('federatedfilesharing', 'settings-admin');
 	<a target="_blank" rel="noreferrer" class="icon-info svg"
 		title="<?php p($l->t('Open documentation'));?>"
 		href="<?php p(link_to_docs('admin-sharing-federated')); ?>"></a>
-
 	<p>
 		<input type="checkbox" name="outgoing_server2server_share_enabled" id="outgoingServer2serverShareEnabled" class="checkbox"
 			   value="1" <?php if ($_['outgoingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> />

apps/federation/templates/settings-admin.php

@@ -8,20 +8,14 @@ style('federation', 'settings-admin')
 ?>
 <div id="ocFederationSettings" class="section">
 	<h2><?php p($l->t('Federation')); ?></h2>
-	<em><?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.')); ?></em>
+	<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>
 		<input id="autoAddServers" type="checkbox" class="checkbox" <?php if($_['autoAddServers']) p('checked'); ?> />
 		<label for="autoAddServers"><?php p($l->t('Add server automatically once a federated share was created successfully')); ?></label>
 	</p>
 
-	<h3><?php p($l->t('Trusted servers')); ?></h3>
-	<p id="ocFederationAddServer">
-		<button id="ocFederationAddServerButton" class=""><?php p($l->t('+ Add trusted server')); ?></button>
-		<input id="serverUrl" class="hidden" type="text" value="" placeholder="<?php p($l->t('Trusted server')); ?>" name="server_url"/>
-		<button id="ocFederationSubmit" class="hidden"><?php p($l->t('Add')); ?></button>
-		<span class="msg"></span>
-	</p>
+	<h3><?php if(count($_['trustedServers'])>0) p($l->t('Trusted servers')); ?></h3>
 	<ul id="listOfTrustedServers">
 		<?php foreach($_['trustedServers'] as $trustedServer) { ?>
 			<li id="<?php p($trustedServer['id']); ?>">
@@ -41,6 +35,12 @@ style('federation', 'settings-admin')
 			</li>
 		<?php } ?>
 	</ul>
+	<p id="ocFederationAddServer">
+		<button id="ocFederationAddServerButton" class=""><?php p($l->t('+ Add trusted server')); ?></button>
+		<input id="serverUrl" class="hidden" type="text" value="" placeholder="<?php p($l->t('Trusted server')); ?>" name="server_url"/>
+		<button id="ocFederationSubmit" class="hidden"><?php p($l->t('Add')); ?></button>
+		<span class="msg"></span>
+	</p>
 
 </div>
 

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>
-	<em><?php p($l->t('Send a personalized link to a file or folder by mail.')); ?></em>
+	<p class="settings-hint"><?php p($l->t('Send a personalized link to a file or folder by mail.')); ?></p>
 
 	<p>
 		<input id="sendPasswordMail" type="checkbox" class="checkbox" <?php if($_['sendPasswordMail']) p('checked'); ?> />

apps/theming/templates/settings-admin.php

@@ -28,6 +28,7 @@ style('theming', 'settings-admin');
 ?>
 <div id="theming" class="section">
 	<h2 class="inlineblock"><?php p($l->t('Theming')); ?></h2>
+        <p class="settings-hint"><?php p($l->t('Theming makes it possible to easily customize the look and feel of your instance. This will be visible for all users.')); ?></p>
 		<div id="theming_settings_msg" class="msg success inlineblock" style="display: none;">Saved</div>
 	<?php if ($_['themable'] === false) { ?>
 	<p>

apps/updatenotification/templates/admin.php

@@ -23,7 +23,7 @@
 			<a href="<?php p($_['downloadLink']); ?>" class="button<?php if ($_['updaterEnabled']) { p(' hidden'); } ?>"><?php p($l->t('Download now')) ?></a>
 		<?php } ?>
 	<?php } else { ?>
-		<strong><?php p($l->t('Your version is up to date.')); ?></strong>
+		<?php p($l->t('Your version is up to date.')); ?>
 		<span class="icon-info svg" title="<?php p($l->t('Checked on %s', [$lastCheckedDate])) ?>"></span>
 	<?php } ?>
 

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%;
+}

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>

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"

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>

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"'); ?> />

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