From 5e1ce69b0521e1cfc56a5b3212697f850e9cacdc Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Mon, 24 Apr 2017 13:09:30 -0400 Subject: [PATCH 1/6] adding some documentation hints and some smaller cleanup --- .../templates/settings-admin.php | 1 - apps/federation/templates/settings-admin.php | 16 ++++++++-------- apps/sharebymail/templates/settings-admin.php | 2 +- apps/theming/templates/settings-admin.php | 1 + apps/updatenotification/templates/admin.php | 2 +- settings/css/settings.css | 5 +++++ settings/templates/admin/additional-mail.php | 4 ++-- settings/templates/admin/encryption.php | 2 +- settings/templates/admin/server.php | 4 +++- settings/templates/admin/sharing.php | 1 + settings/templates/admin/tipstricks.php | 1 + 11 files changed, 24 insertions(+), 15 deletions(-) diff --git a/apps/federatedfilesharing/templates/settings-admin.php b/apps/federatedfilesharing/templates/settings-admin.php index b60ff1083b..7343a867d5 100644 --- a/apps/federatedfilesharing/templates/settings-admin.php +++ b/apps/federatedfilesharing/templates/settings-admin.php @@ -9,7 +9,6 @@ script('federatedfilesharing', 'settings-admin'); -

/> diff --git a/apps/federation/templates/settings-admin.php b/apps/federation/templates/settings-admin.php index dbcb4a54e6..effc7dc640 100644 --- a/apps/federation/templates/settings-admin.php +++ b/apps/federation/templates/settings-admin.php @@ -8,20 +8,14 @@ style('federation', 'settings-admin') ?>

t('Federation')); ?>

- 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.')); ?> +

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.')); ?>

/>

-

t('Trusted servers')); ?>

-

- - - - -

+

0) p($l->t('Trusted servers')); ?>

+

+ + + + +

diff --git a/apps/sharebymail/templates/settings-admin.php b/apps/sharebymail/templates/settings-admin.php index 3af98741e5..d3a9dbacaf 100644 --- a/apps/sharebymail/templates/settings-admin.php +++ b/apps/sharebymail/templates/settings-admin.php @@ -8,7 +8,7 @@ style('sharebymail', 'settings-admin'); ?>

t('Share by mail')); ?>

- t('Send a personalized link to a file or folder by mail.')); ?> +

t('Send a personalized link to a file or folder by mail.')); ?>

/> diff --git a/apps/theming/templates/settings-admin.php b/apps/theming/templates/settings-admin.php index 920b4a007d..61fe57c3c7 100644 --- a/apps/theming/templates/settings-admin.php +++ b/apps/theming/templates/settings-admin.php @@ -28,6 +28,7 @@ style('theming', 'settings-admin'); ?>

t('Theming')); ?>

+

t('Theming makes it possible to easily customize the look and feel of your instance. This will be visible for all users.')); ?>

diff --git a/apps/updatenotification/templates/admin.php b/apps/updatenotification/templates/admin.php index 28a4799241..dcea7cf3e6 100644 --- a/apps/updatenotification/templates/admin.php +++ b/apps/updatenotification/templates/admin.php @@ -23,7 +23,7 @@ t('Download now')) ?> - t('Your version is up to date.')); ?> + t('Your version is up to date.')); ?> diff --git a/settings/css/settings.css b/settings/css/settings.css index a046148dcc..814592baa4 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 7f8706274f..91f34fa801 100644 --- a/settings/templates/admin/additional-mail.php +++ b/settings/templates/admin/additional-mail.php @@ -56,8 +56,8 @@ if ($_['mail_smtpmode'] === 'qmail') { - -

t('This is used for sending out notifications.')); ?>

+

t('It is important to setup this server to be able to send emails. This is for example used to send out notification.')); ?>

+

diff --git a/settings/templates/admin/encryption.php b/settings/templates/admin/encryption.php index 4b6d904568..b086995792 100644 --- a/settings/templates/admin/encryption.php +++ b/settings/templates/admin/encryption.php @@ -31,7 +31,7 @@ - +

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.')); ?>

t('Security & setup warnings'));?>

+

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.'));?>

    t('Open documentation'));?>" href=""> +

    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.'));?>

    t('Version'));?>

    -

    getTitle()); ?>

    +

    getTitle()); ?>

diff --git a/settings/templates/admin/sharing.php b/settings/templates/admin/sharing.php index 9de71c5899..efb4c0f5cc 100644 --- a/settings/templates/admin/sharing.php +++ b/settings/templates/admin/sharing.php @@ -31,6 +31,7 @@ +

t('As Admin you can fine tune the sharing behavior. Please see the documentation for more information.'));?>

/> diff --git a/settings/templates/admin/tipstricks.php b/settings/templates/admin/tipstricks.php index cee5cd8032..c18c7f25f3 100644 --- a/settings/templates/admin/tipstricks.php +++ b/settings/templates/admin/tipstricks.php @@ -28,6 +28,7 @@

t('Tips & tricks'));?>

+

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.')); ?>

    Date: Mon, 24 Apr 2017 13:25:50 -0400 Subject: [PATCH 2/6] one more hint --- apps/systemtags/templates/admin.php | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/systemtags/templates/admin.php b/apps/systemtags/templates/admin.php index de97b283d0..8cd6b282df 100644 --- a/apps/systemtags/templates/admin.php +++ b/apps/systemtags/templates/admin.php @@ -33,6 +33,7 @@ script('systemtags', 'admin');

    t('Collaborative tags')); ?>

    +

    t('Make it possible to create and edit collaborative tags. This tags effect all users.')); ?>

    From f62b75b2b828f1561c6486e49ef8f688fb2abf3e Mon Sep 17 00:00:00 2001 From: Frank Karlitschek Date: Tue, 25 Apr 2017 04:55:38 -0400 Subject: [PATCH 3/6] change the headline as suggested --- apps/federation/templates/settings-admin.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/federation/templates/settings-admin.php b/apps/federation/templates/settings-admin.php index effc7dc640..572fefc08b 100644 --- a/apps/federation/templates/settings-admin.php +++ b/apps/federation/templates/settings-admin.php @@ -7,7 +7,7 @@ script('federation', 'settings-admin'); style('federation', 'settings-admin') ?>
    -

    t('Federation')); ?>

    +

    t('Trusted Servers')); ?>

    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.')); ?>

    @@ -15,7 +15,6 @@ style('federation', 'settings-admin')

    -

    0) p($l->t('Trusted servers')); ?>

    • From 4e537b5d6bf95a49a4aa7b3ccd66a6ad92185cea Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 25 Apr 2017 15:57:02 +0200 Subject: [PATCH 4/6] Small layout fixes to settings hints Signed-off-by: Jan-Christoph Borchardt --- apps/federation/css/settings-admin.css | 4 ++-- apps/sharebymail/css/settings-admin.css | 2 +- settings/css/settings.css | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/federation/css/settings-admin.css b/apps/federation/css/settings-admin.css index 97a50785f8..3fd5f5aea6 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/sharebymail/css/settings-admin.css b/apps/sharebymail/css/settings-admin.css index c7bfb122f3..fc6093ad52 100644 --- a/apps/sharebymail/css/settings-admin.css +++ b/apps/sharebymail/css/settings-admin.css @@ -1,3 +1,3 @@ #ncShareByMailSettings p { - padding-top: 10px; + padding-bottom: 10px; } diff --git a/settings/css/settings.css b/settings/css/settings.css index 814592baa4..fe7be86d6e 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -979,8 +979,8 @@ doesnotexist:-o-prefocus, .strengthify-wrapper { #warning { color: red; } + .settings-hint { - margin-top: -12px; - color: #AAAAAA; - font-size: 90%; + margin-bottom: 12px; + opacity: .7; } From bbb58625fee3127208c968c0f81cd5f9f86d97eb Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 25 Apr 2017 17:45:02 +0200 Subject: [PATCH 5/6] Wording fixes Signed-off-by: Jan-Christoph Borchardt --- apps/federation/templates/settings-admin.php | 3 +-- apps/sharebymail/templates/settings-admin.php | 3 +-- apps/systemtags/templates/admin.php | 4 ++-- settings/templates/admin/additional-mail.php | 3 +-- settings/templates/admin/encryption.php | 2 +- settings/templates/admin/server.php | 2 +- settings/templates/admin/sharing.php | 2 +- 7 files changed, 8 insertions(+), 11 deletions(-) diff --git a/apps/federation/templates/settings-admin.php b/apps/federation/templates/settings-admin.php index 572fefc08b..f0c2db8196 100644 --- a/apps/federation/templates/settings-admin.php +++ b/apps/federation/templates/settings-admin.php @@ -7,7 +7,7 @@ script('federation', 'settings-admin'); style('federation', 'settings-admin') ?>
      -

      t('Trusted Servers')); ?>

      +

      t('Trusted servers')); ?>

      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.')); ?>

      @@ -42,4 +42,3 @@ style('federation', 'settings-admin')

      - diff --git a/apps/sharebymail/templates/settings-admin.php b/apps/sharebymail/templates/settings-admin.php index d3a9dbacaf..50fede8668 100644 --- a/apps/sharebymail/templates/settings-admin.php +++ b/apps/sharebymail/templates/settings-admin.php @@ -8,7 +8,7 @@ style('sharebymail', 'settings-admin'); ?>

      t('Share by mail')); ?>

      -

      t('Send a personalized link to a file or folder by mail.')); ?>

      +

      t('Allows users to share a personalized link to a file or folder by putting in an email address.')); ?>

      /> @@ -18,4 +18,3 @@ style('sharebymail', 'settings-admin');

      - diff --git a/apps/systemtags/templates/admin.php b/apps/systemtags/templates/admin.php index 8cd6b282df..e964f610ca 100644 --- a/apps/systemtags/templates/admin.php +++ b/apps/systemtags/templates/admin.php @@ -33,9 +33,9 @@ script('systemtags', 'admin');

      t('Collaborative tags')); ?>

      -

      t('Make it possible to create and edit collaborative tags. This tags effect all users.')); ?>

      +

      t('Create and edit collaborative tags. These tags affect all users.')); ?>

      - +

      diff --git a/settings/templates/admin/additional-mail.php b/settings/templates/admin/additional-mail.php index 91f34fa801..249252dc69 100644 --- a/settings/templates/admin/additional-mail.php +++ b/settings/templates/admin/additional-mail.php @@ -56,7 +56,7 @@ if ($_['mail_smtpmode'] === 'qmail') { -

      t('It is important to setup this server to be able to send emails. This is for example used to send out notification.')); ?>

      +

      t('It is important to set up this server to be able to send emails, like for password reset and notifications.')); ?>

      @@ -137,4 +137,3 @@ if ($_['mail_smtpmode'] === 'qmail') {

    - diff --git a/settings/templates/admin/encryption.php b/settings/templates/admin/encryption.php index b086995792..1d956a8f7c 100644 --- a/settings/templates/admin/encryption.php +++ b/settings/templates/admin/encryption.php @@ -31,7 +31,7 @@ -

    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.')); ?>

    +

    t('Server-side encryption makes it possible to encrypt files which are uploaded to this server. This comes with limitations like a performance penalty, so enable this only if needed.')); ?>

    -

    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.'));?>

    +

    t('For 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.'));?>

    -

    t('As Admin you can fine tune the sharing behavior. Please see the documentation for more information.'));?>

    +

    t('As admin you can fine-tune the sharing behavior. Please see the documentation for more information.'));?>

    /> From 3bb41f414448ae116e8c36a72f8724b374119f53 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 25 Apr 2017 17:47:23 +0200 Subject: [PATCH 6/6] Move h2 and settings-hint together Signed-off-by: Jan-Christoph Borchardt --- settings/css/settings.css | 1 + 1 file changed, 1 insertion(+) diff --git a/settings/css/settings.css b/settings/css/settings.css index fe7be86d6e..7e91877773 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -981,6 +981,7 @@ doesnotexist:-o-prefocus, .strengthify-wrapper { } .settings-hint { + margin-top: -12px; margin-bottom: 12px; opacity: .7; }