From 19397059d608df4ea4bd634513f97f1b90fd6de9 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon, 13 Jan 2020 23:18:39 +0100
Subject: [PATCH 1/2] Add explanatory bit for recommended apps, fix #18631

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
---
 core/css/guest.css              | 5 +++++
 core/templates/installation.php | 1 +
 2 files changed, 6 insertions(+)

diff --git a/core/css/guest.css b/core/css/guest.css
index 26c8fbc9cc..cfe6d385cb 100644
--- a/core/css/guest.css
+++ b/core/css/guest.css
@@ -645,6 +645,11 @@ form #selectDbType label span {
 	box-shadow: none !important;
 }
 
+#install-recommended-apps + label span {
+	display: inline-block;
+	opacity: .7;
+}
+
 /* Errors */
 /* Warnings and errors are the same */
 .body-login-container,
diff --git a/core/templates/installation.php b/core/templates/installation.php
index eb22436484..4efcebec38 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -163,6 +163,7 @@ script('core', [
 			<input type="checkbox" id="install-recommended-apps" name="install-recommended-apps" class="checkbox checkbox--white" checked>
 			<label for="install-recommended-apps">
 				<?php p($l->t( 'Install recommended apps' )); ?>
+				<span><?php p($l->t( 'Calendar, Contacts, Talk & Mail' )); ?></span>
 			</label>
 		</p>
 	</fieldset>

From d873236d36294ed255e0b0184abd998f3887f4ea Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon, 13 Jan 2020 23:19:04 +0100
Subject: [PATCH 2/2] Remove outdated centering code for database switcher on
 install page

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
---
 core/js/setup.js | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/core/js/setup.js b/core/js/setup.js
index eb41795e42..7cf4c38071 100644
--- a/core/js/setup.js
+++ b/core/js/setup.js
@@ -123,18 +123,4 @@ $(document).ready(function() {
 		drawTitles: true,
 		nonce: btoa(OC.requestToken),
 	});
-
-	// centers the database chooser if it is too wide
-	if($('#databaseBackend').width() > 300) {
-		// this somehow needs to wait 250 milliseconds
-		// otherwise it gets overwritten
-		setTimeout(function(){
-			// calculate negative left margin
-			// half of the difference of width and default bix width of 300
-			// add 10 to clear left side padding of button group
-			var leftMargin = (($('#databaseBackend').width() - 300) / 2 + 10 ) * -1;
-
-			$('#databaseBackend').css('margin-left', Math.floor(leftMargin) + 'px');
-		}, 250);
-	}
 });