Skip to content

Design fixes for updates #728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LukasReschke merged 2 commits into from
Aug 8, 2016
Merged

Design fixes for updates #728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f97254
switch nested containers in update to semibold style
jancborchardt Aug 3, 2016
835dc59
reduce info on update screens, introduce button to refresh
jancborchardt Aug 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/css/apps.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,7 @@ h2 {
font-size: 20px;
font-weight: 300;
margin-bottom: 12px;
line-height: 140%;
}
h3 {
font-size: 15px;
Expand Down
2 changes: 1 addition & 1 deletion core/css/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ a.two-factor-cancel {
}

#body-login .update h2 {
margin: 12px 0 20px;
margin: 0 0 20px;
}

#body-login .update a {
Expand Down
9 changes: 8 additions & 1 deletion core/css/update.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,20 @@
background-size: 32px;
}

#update-progress-message-error,
#update-progress-message-warnings {
font-weight: 600;
margin-bottom: 10px;
}

#update-progress-message {
margin-bottom: 10px;
}

.update-show-detailed {
padding: 13px;
display: block;
opacity: .75;
}

#body-login .update a.update-show-detailed {
Expand All @@ -23,4 +30,4 @@

#body-login .warning.hidden {
display: none;
}
}
22 changes: 10 additions & 12 deletions core/js/update.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
_started : false,

/**
* Start the upgrade process.
* Start the update process.
*
* @param $el progress list element
*/
Expand All @@ -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
})
);
Expand Down Expand Up @@ -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);
Expand All @@ -127,7 +125,7 @@
.append(message)
.append($('<br>'));
},

setErrorMessage: function (message) {
$('#update-progress-message-error')
.show()
Expand Down
8 changes: 5 additions & 3 deletions core/templates/update.admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
4 changes: 2 additions & 2 deletions lib/base.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ private static function printUpgradePage() {

// 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);

Expand Down Expand Up @@ -390,7 +390,7 @@ private static function printUpgradePage() {
$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();
}
Expand Down