From b068809d9f2ac653a6c4b20316361a6ad73436ce Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 24 Jan 2019 15:42:02 +0100 Subject: [PATCH 1/7] Move calendar settings into basic settings Signed-off-by: Jan-Christoph Borchardt --- apps/dav/lib/Settings/CalDAVSettings.php | 2 +- apps/dav/tests/unit/Settings/CalDAVSettingsTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/dav/lib/Settings/CalDAVSettings.php b/apps/dav/lib/Settings/CalDAVSettings.php index f38143b5b4e..36ee07d9447 100644 --- a/apps/dav/lib/Settings/CalDAVSettings.php +++ b/apps/dav/lib/Settings/CalDAVSettings.php @@ -57,7 +57,7 @@ class CalDAVSettings implements ISettings { * @return string */ public function getSection() { - return 'groupware'; + return 'server'; } /** diff --git a/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php b/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php index a9df63a03ab..43d60038a23 100644 --- a/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php +++ b/apps/dav/tests/unit/Settings/CalDAVSettingsTest.php @@ -49,7 +49,7 @@ class CalDAVSettingsTest extends TestCase { } public function testGetSection() { - $this->assertEquals('groupware', $this->settings->getSection()); + $this->assertEquals('server', $this->settings->getSection()); } public function testGetPriority() { From c44c23a1c32da8c2faa5ff14895bc6558ceca2a2 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 24 Jan 2019 15:42:52 +0100 Subject: [PATCH 2/7] Improve design of description below label of checkbox or radio button Signed-off-by: Jan-Christoph Borchardt --- core/css/inputs.scss | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/core/css/inputs.scss b/core/css/inputs.scss index 3562372dbc9..37914365a77 100644 --- a/core/css/inputs.scss +++ b/core/css/inputs.scss @@ -354,6 +354,15 @@ input { &:checked:disabled + label:before { background-color: $color-checkbox-radio-disabled; } + + // Detail description below label of checkbox or radio button + & + label ~ em { + display: inline-block; + margin-left: 18px; + } + & + label ~ em:last-of-type { + margin-bottom: 12px; + } } &.checkbox { + label:before { From 280dce8dbcb5b09e4bd69696aa63027f95a8d1e5 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 24 Jan 2019 16:10:10 +0100 Subject: [PATCH 3/7] Calendar server: Link Calendar app and calendar sync docs Signed-off-by: Jan-Christoph Borchardt --- apps/dav/templates/settings-admin-caldav.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/dav/templates/settings-admin-caldav.php b/apps/dav/templates/settings-admin-caldav.php index 919cb06802b..0ed53f31bca 100644 --- a/apps/dav/templates/settings-admin-caldav.php +++ b/apps/dav/templates/settings-admin-caldav.php @@ -30,6 +30,8 @@ script('dav', [ ?>

t('Calendar server')); ?>

+

Also install the Calendar app, or + connect your desktop & mobile for syncing.

/> From 3508c2368f9e944dbfd4a70889351bdb4fb182a1 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 24 Jan 2019 16:15:24 +0100 Subject: [PATCH 4/7] Keep Calendar server settings in groupware but link mail server settings Signed-off-by: Jan-Christoph Borchardt --- apps/dav/lib/Settings/CalDAVSettings.php | 2 +- apps/dav/templates/settings-admin-caldav.php | 2 +- apps/dav/tests/unit/Settings/CalDAVSettingsTest.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/dav/lib/Settings/CalDAVSettings.php b/apps/dav/lib/Settings/CalDAVSettings.php index 36ee07d9447..f38143b5b4e 100644 --- a/apps/dav/lib/Settings/CalDAVSettings.php +++ b/apps/dav/lib/Settings/CalDAVSettings.php @@ -57,7 +57,7 @@ class CalDAVSettings implements ISettings { * @return string */ public function getSection() { - return 'server'; + return 'groupware'; } /** diff --git a/apps/dav/templates/settings-admin-caldav.php b/apps/dav/templates/settings-admin-caldav.php index 0ed53f31bca..a30d4acccf7 100644 --- a/apps/dav/templates/settings-admin-caldav.php +++ b/apps/dav/templates/settings-admin-caldav.php @@ -37,7 +37,7 @@ script('dav', [ />
- t('Please make sure to properly set up the email settings above.')); ?> + t('Please make sure to properly set up the email server.')); ?> ↗

assertEquals('server', $this->settings->getSection()); + $this->assertEquals('groupware', $this->settings->getSection()); } public function testGetPriority() { From 9cea13963499ea789d3e4d85be7b2dcc0f1e8a4e Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Thu, 24 Jan 2019 16:45:39 +0100 Subject: [PATCH 5/7] Turn "email server" in groupware settings to link to mail settings Signed-off-by: Georg Ehrke --- apps/dav/templates/settings-admin-caldav.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/apps/dav/templates/settings-admin-caldav.php b/apps/dav/templates/settings-admin-caldav.php index a30d4acccf7..775ec6abb66 100644 --- a/apps/dav/templates/settings-admin-caldav.php +++ b/apps/dav/templates/settings-admin-caldav.php @@ -37,7 +37,19 @@ script('dav', [ />
- t('Please make sure to properly set up the email server.')); ?> ↗ + + ', + '', + ], + $l->t('Please make sure to properly set up {emailopen}the email server↗{linkclose}.') + )); ?> +

Date: Thu, 24 Jan 2019 17:16:25 +0100 Subject: [PATCH 6/7] fix link to Calendar app in Groupware page Signed-off-by: Georg Ehrke --- apps/dav/templates/settings-admin-caldav.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dav/templates/settings-admin-caldav.php b/apps/dav/templates/settings-admin-caldav.php index 775ec6abb66..072633e54d3 100644 --- a/apps/dav/templates/settings-admin-caldav.php +++ b/apps/dav/templates/settings-admin-caldav.php @@ -30,7 +30,7 @@ script('dav', [ ?>

t('Calendar server')); ?>

-

Also install the Calendar app, or +

Also install the Calendar app, or connect your desktop & mobile for syncing.

Date: Sun, 27 Jan 2019 19:49:01 +0100 Subject: [PATCH 7/7] make text in Groupware Settings translateable Signed-off-by: Georg Ehrke --- apps/dav/templates/settings-admin-caldav.php | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/apps/dav/templates/settings-admin-caldav.php b/apps/dav/templates/settings-admin-caldav.php index 072633e54d3..87b159923d2 100644 --- a/apps/dav/templates/settings-admin-caldav.php +++ b/apps/dav/templates/settings-admin-caldav.php @@ -30,8 +30,21 @@ script('dav', [ ?>

t('Calendar server')); ?>

-

Also install the Calendar app, or - connect your desktop & mobile for syncing.

+

+ ', + '', + '', + ], + $l->t('Also install the {calendarappstoreopen}Calendar app{linkclose}, or {calendardocopen}connect your desktop & mobile for syncing ↗{linkclose}.') + )); ?> +

/> @@ -47,7 +60,7 @@ script('dav', [ '', '', ], - $l->t('Please make sure to properly set up {emailopen}the email server↗{linkclose}.') + $l->t('Please make sure to properly set up {emailopen}the email server{linkclose}.') )); ?>