diff options
| author | Joas Schilling <coding@schilljs.com> | 2017-04-26 09:45:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-26 09:45:01 +0200 |
| commit | bec9f18a0f88a60b687d97b279e371984663febc (patch) | |
| tree | b52cbfc8a2bdc4842980c268c2cc16133c6ca6ca /apps/federation | |
| parent | 7386bea23fc7bb95ec4073a33abc9069b587581e (diff) | |
| parent | 3bb41f414448ae116e8c36a72f8724b374119f53 (diff) | |
| download | nextcloud-server-bec9f18a0f88a60b687d97b279e371984663febc.tar.gz nextcloud-server-bec9f18a0f88a60b687d97b279e371984663febc.zip | |
Merge pull request #4478 from nextcloud/improve_settings_help
adding some documentation hints and some smaller cleanup
Diffstat (limited to 'apps/federation')
| -rw-r--r-- | apps/federation/css/settings-admin.css | 4 | ||||
| -rw-r--r-- | apps/federation/templates/settings-admin.php | 18 |
2 files changed, 10 insertions, 12 deletions
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/federation/templates/settings-admin.php b/apps/federation/templates/settings-admin.php index dbcb4a54e6a..f0c2db81961 100644 --- a/apps/federation/templates/settings-admin.php +++ b/apps/federation/templates/settings-admin.php @@ -7,21 +7,14 @@ script('federation', 'settings-admin'); 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> + <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> <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> <ul id="listOfTrustedServers"> <?php foreach($_['trustedServers'] as $trustedServer) { ?> <li id="<?php p($trustedServer['id']); ?>"> @@ -41,6 +34,11 @@ 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> - |