diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-02-01 13:00:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-01 13:00:44 +0100 |
| commit | b249c16506279ab8eb4325c403f9d3c4e6193766 (patch) | |
| tree | 324fd00c66f7f300e465881e60ef1582dfda54b8 | |
| parent | 6d35597999cbca676b57d9c52b1b76761ee0f12f (diff) | |
| parent | ea1f6f6aef2c9bedada637836b54115f1a933802 (diff) | |
| download | nextcloud-server-b249c16506279ab8eb4325c403f9d3c4e6193766.tar.gz nextcloud-server-b249c16506279ab8eb4325c403f9d3c4e6193766.zip | |
Merge pull request #13796 from nextcloud/design/settings-caldav
Move calendar settings into basic settings
| -rw-r--r-- | apps/dav/templates/settings-admin-caldav.php | 29 | ||||
| -rw-r--r-- | core/css/inputs.scss | 9 |
2 files changed, 37 insertions, 1 deletions
diff --git a/apps/dav/templates/settings-admin-caldav.php b/apps/dav/templates/settings-admin-caldav.php index 919cb06802b..87b159923d2 100644 --- a/apps/dav/templates/settings-admin-caldav.php +++ b/apps/dav/templates/settings-admin-caldav.php @@ -30,12 +30,39 @@ script('dav', [ ?> <form id="CalDAV" class="section"> <h2><?php p($l->t('Calendar server')); ?></h2> + <p class="settings-hint"> + <?php print_unescaped(str_replace( + [ + '{calendarappstoreopen}', + '{calendardocopen}', + '{linkclose}', + ], + [ + '<a target="_blank" href="../apps/office/calendar">', + '<a target="_blank" href="' . link_to_docs('user-sync-calendars') . '" rel="noreferrer noopener">', + '</a>', + ], + $l->t('Also install the {calendarappstoreopen}Calendar app{linkclose}, or {calendardocopen}connect your desktop & mobile for syncing ↗{linkclose}.') + )); ?> + </p> <p> <input type="checkbox" name="caldav_send_invitations" id="caldavSendInvitations" class="checkbox" <?php ($_['send_invitations'] === 'yes') ? print_unescaped('checked="checked"') : null ?>/> <label for="caldavSendInvitations"><?php p($l->t('Send invitations to attendees')); ?></label> <br> - <em><?php p($l->t('Please make sure to properly set up the email settings above.')); ?></em> + <em> + <?php print_unescaped(str_replace( + [ + '{emailopen}', + '{linkclose}', + ], + [ + '<a href="../admin#mail_general_settings">', + '</a>', + ], + $l->t('Please make sure to properly set up {emailopen}the email server{linkclose}.') + )); ?> + </em> </p> <p> <input type="checkbox" name="caldav_generate_birthday_calendar" id="caldavGenerateBirthdayCalendar" class="checkbox" 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 { |