Merge pull request #728 from nextcloud/update-styling

Design fixes for updates

6 files changed, 27 insertions, 19 deletions

diff --git a/core/css/apps.css b/core/css/apps.css
index 3ffa7d87098..0ccdb8a0398 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -550,6 +550,7 @@ h2 {
 	font-size: 20px;
 	font-weight: 300;
 	margin-bottom: 12px;
+	line-height: 140%;
 }
 h3 {
 	font-size: 15px;
diff --git a/core/css/styles.css b/core/css/styles.css
index a8e632c5944..7f4f7896c94 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -242,7 +242,7 @@ a.two-factor-cancel {
 }
 
 #body-login .update h2 {
-	margin: 12px 0 20px;
+	margin: 0 0 20px;
 }
 
 #body-login .update a {
diff --git a/core/css/update.css b/core/css/update.css
index b1e086af3fd..12cda3d5bbd 100644
--- a/core/css/update.css
+++ b/core/css/update.css
@@ -4,6 +4,12 @@
 	background-size: 32px;
 }
 
+#update-progress-message-error,
+#update-progress-message-warnings {
+	font-weight: 600;
+	margin-bottom: 10px;
+}
+
 #update-progress-message {
 	margin-bottom: 10px;
 }
@@ -11,6 +17,7 @@
 .update-show-detailed {
 	padding: 13px;
 	display: block;
+	opacity: .75;
 }
 
 #body-login .update a.update-show-detailed {
@@ -23,4 +30,4 @@
 
 #body-login .warning.hidden {
 	display: none;
-}
\ No newline at end of file
+}
diff --git a/core/js/update.js b/core/js/update.js
index e692a7312b8..32cf2ce5ecc 100644
--- a/core/js/update.js
+++ b/core/js/update.js
@@ -13,7 +13,7 @@
 		_started : false,
 
 		/**
-		 * Start the upgrade process.
+		 * Start the update process.
 		 *
 		 * @param $el progress list element
 		 */
@@ -31,12 +31,12 @@
 			var self = this;
 
 			$(window).on('beforeunload.inprogress', function () {
-				return t('core', 'The upgrade is in progress, leaving this page might interrupt the process in some environments.');
+				return t('core', 'The update is in progress, leaving this page might interrupt the process in some environments.');
 			});
 
 			$('#update-progress-title').html(t(
 				'core',
-				'Updating to {version}', {
+				'Update to {version}', {
 					version: options.version
 				})
 			);
@@ -91,17 +91,15 @@
 
 				if (hasWarnings) {
 					$el.find('.update-show-detailed').before(
-						$('<span>')
-							.append('<br />')
-							.append(t('core', 'The update was successful. There were warnings.'))
+						$('<input type="button" class="update-continue" value="'+t('core', 'Continue to Nextcloud')+'">').on('click', function() {
+							window.location.reload();
+						})
 					);
-					var message = t('core', 'Please reload the page.');
-					$('<span>').append(message).append('<br />').appendTo($el);
 				} else {
 					// FIXME: use product name
-					$('<span>')
-						.append(t('core', 'The update was successful. Redirecting you to Nextcloud now.'))
-						.appendTo($el);
+					$el.find('.update-show-detailed').before(
+						$('<p>'+t('core', 'The update was successful. Redirecting you to Nextcloud now.')+'</p>')
+					);
 					setTimeout(function () {
 						OC.redirect(OC.webroot + '/');
 					}, 3000);
@@ -127,7 +125,7 @@
 				.append(message)
 				.append($('<br>'));
 		},
-		
+
 		setErrorMessage: function (message) {
 			$('#update-progress-message-error')
 				.show()
diff --git a/core/templates/update.admin.php b/core/templates/update.admin.php
index 87f93967d91..aaeacea993b 100644
--- a/core/templates/update.admin.php
+++ b/core/templates/update.admin.php
@@ -36,18 +36,20 @@
 		</div>
 		<input class="updateButton" type="button" value="<?php p($l->t('Start update')) ?>">
 		<div class="infogroup">
+			<em>
 			<?php p($l->t('To avoid timeouts with larger installations, you can instead run the following command from your installation directory:')) ?>
 			<pre>./occ upgrade</pre>
+			</em>
 		</div>
 	</div>
 
 	<div class="update-progress hidden">
 		<h2 id="update-progress-title"></h2>
 		<div id="update-progress-icon" class="icon-loading-dark"></div>
-		<p id="update-progress-message-error" class="warning hidden"></p>
-		<ul id="update-progress-message-warnings" class="warning hidden"></ul>
+		<p id="update-progress-message-error" class="hidden"></p>
+		<ul id="update-progress-message-warnings" class="hidden"></ul>
 		<p id="update-progress-message"></p>
 		<a class="update-show-detailed"><?php p($l->t( 'Detailed logs' )); ?> <img src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /></a>
-		<div id="update-progress-detailed" class="hidden warning"></div>
+		<div id="update-progress-detailed" class="hidden"></div>
 	</div>
 </div>
diff --git a/lib/base.php b/lib/base.php
index d22490ca5dc..4bb7052aa5d 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -359,7 +359,7 @@ class OC {
 
 			// render error page
 			$template = new OC_Template('', 'update.use-cli', 'guest');
-			$template->assign('productName', 'owncloud'); // for now
+			$template->assign('productName', 'nextcloud'); // for now
 			$template->assign('version', OC_Util::getVersionString());
 			$template->assign('tooBig', $tooBig);
 
@@ -390,7 +390,7 @@ class OC {
 		$ocVersion = \OCP\Util::getVersion();
 		$tmpl->assign('appsToUpgrade', $appManager->getAppsNeedingUpgrade($ocVersion));
 		$tmpl->assign('incompatibleAppsList', $appManager->getIncompatibleApps($ocVersion));
-		$tmpl->assign('productName', 'ownCloud'); // for now
+		$tmpl->assign('productName', 'Nextcloud'); // for now
 		$tmpl->assign('oldTheme', $oldTheme);
 		$tmpl->printPage();
 	}