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

Add detailed logs hidden and show them on request

Browse source
This commit is contained in:
Morris Jobke 2016-03-31 14:27:01 +02:00 committed by Thomas Müller
parent 15339efd60
commit 1f7e02e4d4
4 changed files with 42 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/ajax/update.php
View file

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

17
core/css/update.css
View file

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

30
core/js/update.js
View file

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

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

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