diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-05-01 00:15:06 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-05-01 00:15:06 +0200 |
| commit | 8f117cb89b90a87dcfd934358b43376569be13d9 (patch) | |
| tree | 020626cf284ad557d8aaf0af746e3e61f6758243 | |
| parent | ca8b6f24cb307455c549bae68e1c04b82e00468e (diff) | |
| parent | 9ec80377e6b4ff6cff56bb91ba2d2f27fa0fb847 (diff) | |
| download | nextcloud-server-8f117cb89b90a87dcfd934358b43376569be13d9.tar.gz nextcloud-server-8f117cb89b90a87dcfd934358b43376569be13d9.zip | |
Merge pull request #15993 from owncloud/admin-documentation
add admin documentation links for Sharing, Encryption and Email server
| -rw-r--r-- | settings/css/settings.css | 7 | ||||
| -rw-r--r-- | settings/templates/admin.php | 11 |
2 files changed, 17 insertions, 1 deletions
diff --git a/settings/css/settings.css b/settings/css/settings.css index f610e96eea8..583e8804951 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -368,8 +368,15 @@ table.grid td.date{ display: inline-block; } +/* correctly display help icons next to headings */ .icon-info { padding: 11px 20px; + vertical-align: text-bottom; +} +#shareAPI h2, +#encryptionAPI h2, +#mail_general_settings h2 { + display: inline-block; } .mail_settings p label:first-child { diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 587a3b6c66b..5edf4e2a9c7 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -180,6 +180,9 @@ if ($_['cronErrors']) { <div class="section" id="shareAPI"> <h2><?php p($l->t('Sharing'));?></h2> + <a target="_blank" class="icon-info svg" + title="<?php p($l->t('Open documentation'));?>" + href="<?php p(link_to_docs('admin-sharing')); ?>"></a> <p id="enable"> <input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled" value="1" <?php if ($_['shareAPIEnabled'] === 'yes') print_unescaped('checked="checked"'); ?> /> @@ -310,7 +313,10 @@ if ($_['cronErrors']) { </div> <div class="section" id='encryptionAPI'> - <h2><?php p($l->t('Server-side encryption')); ?> </h2> + <h2><?php p($l->t('Server-side encryption')); ?></h2> + <a target="_blank" class="icon-info svg" + title="<?php p($l->t('Open documentation'));?>" + href="<?php p(link_to_docs('admin-encryption')); ?>"></a> <p id="enable"> <input type="checkbox" name="encryption_enabled" @@ -359,6 +365,9 @@ if ($_['cronErrors']) { <div class="section" id="mail_general_settings"> <form id="mail_general_settings_form" class="mail_settings"> <h2><?php p($l->t('Email server'));?></h2> + <a target="_blank" class="icon-info svg" + 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> |