Merge pull request #4540 from nextcloud/settings-help

Add more hints to settings
This commit is contained in:
Morris Jobke 2017-04-27 12:09:01 -03:00 committed by GitHub
commit 31c762aebf
6 changed files with 11 additions and 6 deletions

View File

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

View File

@ -8,6 +8,7 @@ style('federatedfilesharing', 'settings-personal');
<?php if ($_['outgoingServer2serverShareEnabled']): ?> <?php if ($_['outgoingServer2serverShareEnabled']): ?>
<div id="fileSharingSettings" class="section"> <div id="fileSharingSettings" class="section">
<h2><?php p($l->t('Federated Cloud')); ?></h2> <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> <p>
<?php p($l->t('Your Federated Cloud ID:')); ?> <?php p($l->t('Your Federated Cloud ID:')); ?>
@ -19,7 +20,7 @@ style('federatedfilesharing', 'settings-personal');
<?php if ($_['showShareIT']) {?> <?php if ($_['showShareIT']) {?>
<p> <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" <button class="social-facebook pop-up"
data-url='https://www.facebook.com/sharer/sharer.php?u=<?php p(urlencode($_['reference'])); ?>'> data-url='https://www.facebook.com/sharer/sharer.php?u=<?php p(urlencode($_['reference'])); ?>'>
Facebook Facebook

View File

@ -44,7 +44,7 @@ $appContainer = \OC_Mount_Config::$app->getContainer();
'appname' => 'files_external', 'appname' => 'files_external',
'script' => 'list.php', 'script' => 'list.php',
'order' => 30, 'order' => 30,
'name' => $l->t('External storage'), 'name' => $l->t('External storages'),
]; ];
}); });

View File

@ -1,6 +1,5 @@
#global_credentials { #global_credentials {
padding: 0 30px; padding: 0 30px;
margin-bottom: 0px;
} }
#files_external { #files_external {

View File

@ -24,7 +24,6 @@
?> ?>
<div id="<?php p($_['appid']); ?>" class="section workflowengine"> <div id="<?php p($_['appid']); ?>" class="section workflowengine">
<h2 class="inlineblock"><?php p($_['heading']); ?></h2> <h2 class="inlineblock"><?php p($_['heading']); ?></h2>
<?php if (!empty($_['docs'])): ?> <?php if (!empty($_['docs'])): ?>
<a target="_blank" rel="noreferrer" class="icon-info svg" <a target="_blank" rel="noreferrer" class="icon-info svg"
title="<?php p($l->t('Open documentation'));?>" title="<?php p($l->t('Open documentation'));?>"
@ -32,6 +31,10 @@
</a> </a>
<?php endif; ?> <?php endif; ?>
<?php if (!empty($_['settings-hint'])): ?>
<p class="settings-hint"><?php p($_['settings-hint']); ?></p>
<?php endif; ?>
<?php if (!empty($_['description'])): ?> <?php if (!empty($_['description'])): ?>
<p><?php p($_['description']); ?></p> <p><?php p($_['description']); ?></p>
<?php endif; ?> <?php endif; ?>

View File

@ -273,7 +273,7 @@ if($_['passwordChangeSupported']) {
<div id="sessions" class="section"> <div id="sessions" class="section">
<h2><?php p($l->t('Sessions'));?></h2> <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"> <table class="icon-loading">
<thead class="token-list-header"> <thead class="token-list-header">
<tr> <tr>
@ -289,7 +289,7 @@ if($_['passwordChangeSupported']) {
<div id="apppasswords" class="section"> <div id="apppasswords" class="section">
<h2><?php p($l->t('App passwords'));?></h2> <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 dont have to give out your password. You can revoke them individually too.'));?></p>
<table class="icon-loading"> <table class="icon-loading">
<thead class="hidden-when-empty"> <thead class="hidden-when-empty">
<tr> <tr>