Merge pull request #13796 from nextcloud/design/settings-caldav

Move calendar settings into basic settings

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"

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 {