diff options
| -rw-r--r-- | core/ajax/update.php | 3 | ||||
| -rw-r--r-- | core/css/update.css | 17 | ||||
| -rw-r--r-- | core/js/update.js | 30 | ||||
| -rw-r--r-- | core/templates/update.admin.php | 2 |
4 files changed, 42 insertions, 10 deletions
diff --git a/core/ajax/update.php b/core/ajax/update.php index bb4738c83a6..8ed0fad57e9 100644 --- a/core/ajax/update.php +++ b/core/ajax/update.php @@ -141,9 +141,6 @@ if (OC::checkUpgrade(false)) { $disabledApps[$app] = (string) $l->t('%s (incompatible)', [$app]); } - $disabledApps=[ - 'Contacts Plus (incompatible)' - ]; if (!empty($disabledApps)) { $eventSource->send('notice', (string)$l->t('Following apps have been disabled: %s', implode(', ', $disabledApps))); diff --git a/core/css/update.css b/core/css/update.css index 34b78a4fa98..b1e086af3fd 100644 --- a/core/css/update.css +++ b/core/css/update.css @@ -6,4 +6,21 @@ #update-progress-message { margin-bottom: 10px; +} + +.update-show-detailed { + padding: 13px; + display: block; +} + +#body-login .update a.update-show-detailed { + border-bottom: inherit; +} + +#update-progress-detailed { + text-align: left; +} + +#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 d15609ad471..31b97c56894 100644 --- a/core/js/update.js +++ b/core/js/update.js @@ -90,16 +90,16 @@ .removeClass('icon-loading-dark'); if (hasWarnings) { - $('<span>') - .append('<br />') - .append(t('core', 'The update was successful. There were warnings.')) - .appendTo($el); + $el.find('.update-show-detailed').before( + $('<span>') + .append('<br />') + .append(t('core', 'The update was successful. There were warnings.')) + ); var message = t('core', 'Please reload the page.'); - $('<span>').append('<br />').append(message).append('<br />').appendTo($el); + $('<span>').append(message).append('<br />').appendTo($el); } else { // FIXME: use product name $('<span>') - .append('<br />') .append(t('core', 'The update was successful. Redirecting you to ownCloud now.')) .appendTo($el); setTimeout(function () { @@ -111,19 +111,31 @@ setMessage: function(message) { $('#update-progress-message').html(message); + $('#update-progress-detailed') + .append($('<span>')) + .append(message) + .append($('<br>')); }, setPermanentMessage: function(message) { $('#update-progress-message').html(message); $('#update-progress-message-warnings') .show() - .append($('<ul>').append(message)) + .append($('<ul>').append(message)); + $('#update-progress-detailed') + .append($('<span>')) + .append(message) + .append($('<br>')); }, setErrorMessage: function (message) { $('#update-progress-message-error') .show() .html(message); + $('#update-progress-detailed') + .append($('<span>')) + .append(message) + .append($('<br>')); } }; @@ -143,4 +155,8 @@ $(document).ready(function() { }); return false; }); + $('.update-show-detailed').on('click', function() { + $('#update-progress-detailed').toggleClass('hidden'); + return false; + }); }); diff --git a/core/templates/update.admin.php b/core/templates/update.admin.php index 31b81207641..24b2beec6da 100644 --- a/core/templates/update.admin.php +++ b/core/templates/update.admin.php @@ -47,5 +47,7 @@ <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"></p> + <a class="update-show-detailed"><?php p($l->t( 'Detailed logs' )); ?> <img class="svg" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /></a> + <div id="update-progress-detailed" class="hidden warning"></div> </div> </div> |