summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorFrank Karlitschek <frank@karlitschek.de>2017-04-24 13:09:30 -0400
committerJan-Christoph Borchardt <hey@jancborchardt.net>2017-04-25 17:45:35 +0200
commit5e1ce69b0521e1cfc56a5b3212697f850e9cacdc (patch)
tree1fc02e35ebd9c2224c57b06ebf85d09421581b6d /settings
parent8ef25a7628d44465d4777686227407f9a2067700 (diff)
downloadnextcloud-server-5e1ce69b0521e1cfc56a5b3212697f850e9cacdc.tar.gz
nextcloud-server-5e1ce69b0521e1cfc56a5b3212697f850e9cacdc.zip
adding some documentation hints and some smaller cleanup
Diffstat (limited to 'settings')
-rw-r--r--settings/css/settings.css5
-rw-r--r--settings/templates/admin/additional-mail.php4
-rw-r--r--settings/templates/admin/encryption.php2
-rw-r--r--settings/templates/admin/server.php4
-rw-r--r--settings/templates/admin/sharing.php1
-rw-r--r--settings/templates/admin/tipstricks.php1
6 files changed, 13 insertions, 4 deletions
diff --git a/settings/css/settings.css b/settings/css/settings.css
index a046148dcc4..814592baa45 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -979,3 +979,8 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
#warning {
color: red;
}
+.settings-hint {
+ margin-top: -12px;
+ color: #AAAAAA;
+ font-size: 90%;
+}
diff --git a/settings/templates/admin/additional-mail.php b/settings/templates/admin/additional-mail.php
index 7f8706274f9..91f34fa8010 100644
--- a/settings/templates/admin/additional-mail.php
+++ b/settings/templates/admin/additional-mail.php
@@ -56,8 +56,8 @@ if ($_['mail_smtpmode'] === 'qmail') {
<a target="_blank" rel="noreferrer" class="icon-info"
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>
+ <p class="settings-hint"><?php p($l->t('It is important to setup this server to be able to send emails. This is for example used to send out notification.')); ?></p>
+ <p><span id="mail_settings_msg" class="msg"></span></p>
<p>
<label for="mail_smtpmode"><?php p($l->t('Send mode')); ?></label>
diff --git a/settings/templates/admin/encryption.php b/settings/templates/admin/encryption.php
index 4b6d9045689..b0869957927 100644
--- a/settings/templates/admin/encryption.php
+++ b/settings/templates/admin/encryption.php
@@ -31,7 +31,7 @@
<a target="_blank" rel="noreferrer" class="icon-info"
title="<?php p($l->t('Open documentation'));?>"
href="<?php p(link_to_docs('admin-encryption')); ?>"></a>
-
+ <p class="settings-hint"><?php p($l->t('Server-side encryption makes is possible to encrypt files that are uploaded to this server. This comes with limitation like a performance penalty. Enable only if needed.')); ?></p>
<p id="enable">
<input type="checkbox"
id="enableEncryption" class="checkbox"
diff --git a/settings/templates/admin/server.php b/settings/templates/admin/server.php
index d0fc6378e9a..05720ac7c6e 100644
--- a/settings/templates/admin/server.php
+++ b/settings/templates/admin/server.php
@@ -28,6 +28,7 @@
<div id="security-warning" class="section">
<h2><?php p($l->t('Security & setup warnings'));?></h2>
+ <p class="settings-hint"><?php p($l->t('It\'s important for the security and performance of your instance that everything is configured correctly. To help you with that we are doing some automatic checks. Please see the Tips & Ticks section and the documentation for more information.'));?></p>
<ul>
<?php
// is php setup properly to query system environment variables like getenv('PATH')
@@ -181,6 +182,7 @@
title="<?php p($l->t('Open documentation'));?>"
href="<?php p(link_to_docs('admin-background-jobs')); ?>"></a>
+ <p class="settings-hint"><?php p($l->t('For the optimal performance it\'s important to configure background jobs correctly. For bigger instances \'Cron\' is the recommended setting. Please see the documentation for more information.'));?></p>
<p>
<input type="radio" name="mode" value="ajax" class="radio"
id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] === "ajax") {
@@ -223,5 +225,5 @@
<div class="section">
<!-- should be the last part, so Updater can follow if enabled (it has no heading therefore). -->
<h2><?php p($l->t('Version'));?></h2>
- <p><a href="<?php print_unescaped($theme->getBaseUrl()); ?>" rel="noreferrer" target="_blank"><?php p($theme->getTitle()); ?></a> <?php p(OC_Util::getHumanVersion()) ?></p>
+ <p><strong><a href="<?php print_unescaped($theme->getBaseUrl()); ?>" rel="noreferrer" target="_blank"><?php p($theme->getTitle()); ?></a> <?php p(OC_Util::getHumanVersion()) ?></strong></p>
</div>
diff --git a/settings/templates/admin/sharing.php b/settings/templates/admin/sharing.php
index 9de71c58990..efb4c0f5cc8 100644
--- a/settings/templates/admin/sharing.php
+++ b/settings/templates/admin/sharing.php
@@ -31,6 +31,7 @@
<a target="_blank" rel="noreferrer" class="icon-info"
title="<?php p($l->t('Open documentation'));?>"
href="<?php p(link_to_docs('admin-sharing')); ?>"></a>
+ <p class="settings-hint"><?php p($l->t('As Admin you can fine tune the sharing behavior. Please see the documentation for more information.'));?></p>
<p id="enable">
<input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled" class="checkbox"
value="1" <?php if ($_['shareAPIEnabled'] === 'yes') print_unescaped('checked="checked"'); ?> />
diff --git a/settings/templates/admin/tipstricks.php b/settings/templates/admin/tipstricks.php
index cee5cd8032d..c18c7f25f39 100644
--- a/settings/templates/admin/tipstricks.php
+++ b/settings/templates/admin/tipstricks.php
@@ -28,6 +28,7 @@
<div class="section" id="admin-tips">
<h2><?php p($l->t('Tips & tricks'));?></h2>
+ <p class="settings-hint"><?php p($l->t('There are a lot of features and config switches available to optimally customize and use this instance. Here are some pointers for more information.')); ?></p>
<ul>
<?php
// SQLite database performance issue