Skip to content
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

Jump to bottom

Fix design of update error page #10485

Merged
merged 7 commits into from
Aug 6, 2018
Merged

Fix design of update error page #10485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
81dc12a
Fix triangle on update page
jancborchardt Aug 1, 2018
d64a9f3
Fix text overflow on update page
jancborchardt Aug 1, 2018
ede469a
Inline error svg icon because there is no SCSS on guest page
jancborchardt Aug 1, 2018
4574698
Fix double container on 'Possible CSRF attack' page
jancborchardt Aug 1, 2018
2fb6799
Use images instead of inline SVG and unicode
jancborchardt Aug 3, 2018
49cbd8c
Add margin below detailed logs
jancborchardt Aug 3, 2018
6d7bf81
Fix HTML on update error page
jancborchardt Aug 3, 2018
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
15 changes: 14 additions & 1 deletion core/css/guest.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,7 @@ form #selectDbType label.ui-state-active {
background-color: rgba(0,0,0,.3);
color: #fff;
text-align: left;
word-wrap: break-word;
border-radius: 3px;
cursor: default;
-moz-user-select: text;
Expand Down Expand Up @@ -619,22 +620,34 @@ p.info {
}
#update-progress-detailed {
text-align: left;
margin-bottom: 12px;
}
.update-show-detailed {
padding: 13px;
padding: 12px;
display: block;
opacity: .75;
}
.update-show-detailed .icon-caret-white {
display: inline-block;
vertical-align: middle;
}
#update-progress-icon {
height: 32px;
margin: 10px;
background-size: 32px;
}


/* Icons */
.icon-info-white {
background-image: url('../img/actions/info-white.svg?v=2');
}
.icon-error-white {
background-image: url('../img/actions/error-white.svg?v=1');
}
.icon-caret-white {
background-image: url('../img/actions/caret-white.svg?v=1');
}
.icon-confirm {
background-image: url('../img/actions/confirm.svg?v=2');
}
Expand Down
1 change: 1 addition & 0 deletions core/img/actions/error-white.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 8 additions & 15 deletions core/js/update.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
$(window).off('beforeunload.inprogress');
self.setErrorMessage(message);
message = t('core', 'Please reload the page.');
$('<span>').addClass('error').append('<a href=".">'+message+'</a><br />').appendTo($el);
$('<p>').append('<a href=".">'+message+'</a>').appendTo($el);
updateEventSource.close();
});
updateEventSource.listen('failure', function(message) {
Expand All @@ -69,16 +69,15 @@
.removeClass('icon-loading-dark');

self.setErrorMessage(message);
var span = $('<span>')
.addClass('bold');
var updateUnsuccessful = $('<p>');
if(message === 'Exception: Updates between multiple major versions and downgrades are unsupported.') {
span.append(t('core', 'The update was unsuccessful. For more information <a href="{url}">check our forum post</a> covering this issue.', {'url': 'https://help.nextcloud.com/t/updates-between-multiple-major-versions-are-unsupported/7094'}));
updateUnsuccessful.append(t('core', 'The update was unsuccessful. For more information <a href="{url}">check our forum post</a> covering this issue.', {'url': 'https://help.nextcloud.com/t/updates-between-multiple-major-versions-are-unsupported/7094'}));
} else {
span.append(t('core', 'The update was unsuccessful. ' +
updateUnsuccessful.append(t('core', 'The update was unsuccessful. ' +
'Please report this issue to the ' +
'<a href="https://github.com/nextcloud/server/issues" target="_blank">Nextcloud community</a>.'));
}
span.appendTo($el);
updateUnsuccessful.appendTo($el);
});
updateEventSource.listen('done', function() {
$(window).off('beforeunload.inprogress');
Expand Down Expand Up @@ -123,9 +122,7 @@
setMessage: function(message) {
$('#update-progress-message').html(message);
$('#update-progress-detailed')
.append($('<span>'))
.append(message)
.append($('<br>'));
.append('<p>' + message + '</p>');
},

setPermanentMessage: function(message) {
Expand All @@ -134,19 +131,15 @@
.show()
.append($('<ul>').append(message));
$('#update-progress-detailed')
.append($('<span>'))
.append(message)
.append($('<br>'));
.append('<p>' + message + '</p>');
},

setErrorMessage: function (message) {
$('#update-progress-message-error')
.show()
.html(message);
$('#update-progress-detailed')
.append($('<span>'))
.append(message)
.append($('<br>'));
.append('<p>' + message + '</p>');
}
};

Expand Down
2 changes: 1 addition & 1 deletion core/templates/update.admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<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>
<a class="update-show-detailed"><?php p($l->t( 'Detailed logs' )); ?> <span class="icon-caret-white"></span></a>
<div id="update-progress-detailed" class="hidden"></div>
</div>
</div>