summaryrefslogtreecommitdiffstats
path: root/apps/federatedfilesharing
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-04-27 12:09:01 -0300
committerGitHub <noreply@github.com>2017-04-27 12:09:01 -0300
commit31c762aebf5f086e3e4ed4e76c270ab4a1bf3812 (patch)
treef7704b7b460326188e697e37124c36d10290ddd4 /apps/federatedfilesharing
parent3e37a5f1c742eae03158a14f6dbb1fc3bb1e0a5a (diff)
parentcb1689244342088c506921943151f98bbd05fd9a (diff)
downloadnextcloud-server-31c762aebf5f086e3e4ed4e76c270ab4a1bf3812.tar.gz
nextcloud-server-31c762aebf5f086e3e4ed4e76c270ab4a1bf3812.zip
Merge pull request #4540 from nextcloud/settings-help
Add more hints to settings
Diffstat (limited to 'apps/federatedfilesharing')
-rw-r--r--apps/federatedfilesharing/templates/settings-admin.php2
-rw-r--r--apps/federatedfilesharing/templates/settings-personal.php3
2 files changed, 4 insertions, 1 deletions
diff --git a/apps/federatedfilesharing/templates/settings-admin.php b/apps/federatedfilesharing/templates/settings-admin.php
index 7343a867d53..ff5cb0084e5 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 98a1cd7f751..126daae27d0 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