From cb1689244342088c506921943151f98bbd05fd9a Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed, 26 Apr 2017 22:43:58 +0200
Subject: [PATCH] Add more hints to settings

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
---
 apps/federatedfilesharing/templates/settings-admin.php    | 2 ++
 apps/federatedfilesharing/templates/settings-personal.php | 3 ++-
 apps/files_external/appinfo/app.php                       | 2 +-
 apps/files_external/css/settings.css                      | 1 -
 apps/workflowengine/templates/admin.php                   | 5 ++++-
 settings/templates/personal.php                           | 4 ++--
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/apps/federatedfilesharing/templates/settings-admin.php b/apps/federatedfilesharing/templates/settings-admin.php
index 7343a867d5..ff5cb0084e 100644
--- a/apps/federatedfilesharing/templates/settings-admin.php
+++ b/apps/federatedfilesharing/templates/settings-admin.php
@@ -9,6 +9,8 @@ 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 class="settings-hint"><?php p($l->t('Adjust how people can share between servers.')); ?></p>
+
 	<p>
 		<input type="checkbox" name="outgoing_server2server_share_enabled" id="outgoingServer2serverShareEnabled" class="checkbox"
 			   value="1" <?php if ($_['outgoingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> />
diff --git a/apps/federatedfilesharing/templates/settings-personal.php b/apps/federatedfilesharing/templates/settings-personal.php
index 98a1cd7f75..126daae27d 100644
--- a/apps/federatedfilesharing/templates/settings-personal.php
+++ b/apps/federatedfilesharing/templates/settings-personal.php
@@ -8,6 +8,7 @@ style('federatedfilesharing', 'settings-personal');
 <?php if ($_['outgoingServer2serverShareEnabled']): ?>
 	<div id="fileSharingSettings" class="section">
 		<h2><?php p($l->t('Federated Cloud')); ?></h2>
+		<p class="settings-hint"><?php p($l->t('You can share with anyone who uses Nextcloud, ownCloud or Pydio! Just put their Federated Cloud ID in the share dialog. It looks like person@cloud.example.com')); ?></p>
 
 		<p>
 			<?php p($l->t('Your Federated Cloud ID:')); ?>
@@ -19,7 +20,7 @@ style('federatedfilesharing', 'settings-personal');
 
 		<?php if ($_['showShareIT']) {?>
 		<p>
-			<?php p($l->t('Share it:')); ?><br>
+			<?php p($l->t('Share it so your friends can share files with you:')); ?><br>
 			<button class="social-facebook pop-up"
 					data-url='https://www.facebook.com/sharer/sharer.php?u=<?php p(urlencode($_['reference'])); ?>'>
 				Facebook
diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
index 925596198c..ddf609129f 100644
--- a/apps/files_external/appinfo/app.php
+++ b/apps/files_external/appinfo/app.php
@@ -44,7 +44,7 @@ $appContainer = \OC_Mount_Config::$app->getContainer();
 		'appname' => 'files_external',
 		'script' => 'list.php',
 		'order' => 30,
-		'name' => $l->t('External storage'),
+		'name' => $l->t('External storages'),
 	];
 });
 
diff --git a/apps/files_external/css/settings.css b/apps/files_external/css/settings.css
index 38e497eebe..610bc2f0e6 100644
--- a/apps/files_external/css/settings.css
+++ b/apps/files_external/css/settings.css
@@ -1,6 +1,5 @@
 #global_credentials {
 	padding: 0 30px;
-	margin-bottom: 0px;
 }
 
 #files_external {
diff --git a/apps/workflowengine/templates/admin.php b/apps/workflowengine/templates/admin.php
index 500300f93b..4f4dab4043 100644
--- a/apps/workflowengine/templates/admin.php
+++ b/apps/workflowengine/templates/admin.php
@@ -24,7 +24,6 @@
 ?>
 <div id="<?php p($_['appid']); ?>" class="section workflowengine">
 	<h2 class="inlineblock"><?php p($_['heading']); ?></h2>
-
 	<?php if (!empty($_['docs'])): ?>
 		<a target="_blank" rel="noreferrer" class="icon-info svg"
 		   title="<?php p($l->t('Open documentation'));?>"
@@ -32,6 +31,10 @@
 		</a>
 	<?php endif; ?>
 
+	<?php if (!empty($_['settings-hint'])): ?>
+		<p class="settings-hint"><?php p($_['settings-hint']); ?></p>
+	<?php endif; ?>
+
 	<?php if (!empty($_['description'])): ?>
 		<p><?php p($_['description']); ?></p>
 	<?php endif; ?>
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 20475290df..7854ea3172 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -273,7 +273,7 @@ if($_['passwordChangeSupported']) {
 
 <div id="sessions" class="section">
 	<h2><?php p($l->t('Sessions'));?></h2>
-	<span class="hidden-when-empty"><?php p($l->t('Web, desktop and mobile clients currently logged in to your account.'));?></span>
+	<p class="settings-hint hidden-when-empty"><?php p($l->t('Web, desktop and mobile clients currently logged in to your account.'));?></span>
 	<table class="icon-loading">
 		<thead class="token-list-header">
 			<tr>
@@ -289,7 +289,7 @@ if($_['passwordChangeSupported']) {
 
 <div id="apppasswords" class="section">
 	<h2><?php p($l->t('App passwords'));?></h2>
-	<p><?php p($l->t('Passcodes that give an app or device permissions to access your account.'));?></p>
+	<p class="settings-hint"><?php p($l->t('Here you can generate individual passwords for apps so you don’t have to give out your password. You can revoke them individually too.'));?></p>
 	<table class="icon-loading">
 		<thead class="hidden-when-empty">
 			<tr>