wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reduce info on update screens, introduce button to refresh

Browse source
This commit is contained in:
Jan-Christoph Borchardt 2016-08-04 12:48:25 +02:00
parent 2f9725469d
commit 835dc59d6a
6 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/css/apps.css
View file

@ -550,6 +550,7 @@ h2 {
font-size: 20px;
font-weight: 300;
margin-bottom: 12px;
line-height: 140%;
}
h3 {
font-size: 15px;

2
core/css/styles.css
View file

@ -242,7 +242,7 @@ a.two-factor-cancel {
}
#body-login .update h2 {
margin: 12px 0 20px;
margin: 0 0 20px;
}
#body-login .update a {

2
core/css/update.css
View file

@ -7,6 +7,7 @@
#update-progress-message-error,
#update-progress-message-warnings {
font-weight: 600;
margin-bottom: 10px;
}
#update-progress-message {
@ -16,6 +17,7 @@
.update-show-detailed {
padding: 13px;
display: block;
opacity: .75;
}
#body-login .update a.update-show-detailed {

22
core/js/update.js
View file

@ -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()

4
core/templates/update.admin.php
View file

@ -36,8 +36,10 @@
</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>
@ -48,6 +50,6 @@
<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
lib/base.php
View file

@ -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();
}