Merge pull request #10485 from nextcloud/update-triangle

Fix design of update error page
This commit is contained in:
Roeland Jago Douma 2018-08-06 15:38:43 +02:00 committed by GitHub
commit 49662f3def
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 17 deletions

View File

@ -522,6 +522,7 @@ form #selectDbType label.ui-state-active {
background-color: rgba(0,0,0,.3); background-color: rgba(0,0,0,.3);
color: #fff; color: #fff;
text-align: left; text-align: left;
word-wrap: break-word;
border-radius: 3px; border-radius: 3px;
cursor: default; cursor: default;
-moz-user-select: text; -moz-user-select: text;
@ -619,22 +620,34 @@ p.info {
} }
#update-progress-detailed { #update-progress-detailed {
text-align: left; text-align: left;
margin-bottom: 12px;
} }
.update-show-detailed { .update-show-detailed {
padding: 13px; padding: 12px;
display: block; display: block;
opacity: .75; opacity: .75;
} }
.update-show-detailed .icon-caret-white {
display: inline-block;
vertical-align: middle;
}
#update-progress-icon { #update-progress-icon {
height: 32px; height: 32px;
margin: 10px; margin: 10px;
background-size: 32px; background-size: 32px;
} }
/* Icons */ /* Icons */
.icon-info-white { .icon-info-white {
background-image: url('../img/actions/info-white.svg?v=2'); 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 { .icon-confirm {
background-image: url('../img/actions/confirm.svg?v=2'); background-image: url('../img/actions/confirm.svg?v=2');
} }

View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 16 16" width="16" height="16"><path d="M5.516 2L2 5.516v4.968L5.516 14h4.968L14 10.484V5.516L10.484 2H5.516zM7 4h2v5H7V4zm0 6h2v2H7v-2z" fill="#fff"/></svg>

After

Width:  |  Height:  |  Size: 224 B

View File

@ -58,7 +58,7 @@
$(window).off('beforeunload.inprogress'); $(window).off('beforeunload.inprogress');
self.setErrorMessage(message); self.setErrorMessage(message);
message = t('core', 'Please reload the page.'); 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.close();
}); });
updateEventSource.listen('failure', function(message) { updateEventSource.listen('failure', function(message) {
@ -69,16 +69,15 @@
.removeClass('icon-loading-dark'); .removeClass('icon-loading-dark');
self.setErrorMessage(message); self.setErrorMessage(message);
var span = $('<span>') var updateUnsuccessful = $('<p>');
.addClass('bold');
if(message === 'Exception: Updates between multiple major versions and downgrades are unsupported.') { 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 { } else {
span.append(t('core', 'The update was unsuccessful. ' + updateUnsuccessful.append(t('core', 'The update was unsuccessful. ' +
'Please report this issue to the ' + 'Please report this issue to the ' +
'<a href="https://github.com/nextcloud/server/issues" target="_blank">Nextcloud community</a>.')); '<a href="https://github.com/nextcloud/server/issues" target="_blank">Nextcloud community</a>.'));
} }
span.appendTo($el); updateUnsuccessful.appendTo($el);
}); });
updateEventSource.listen('done', function() { updateEventSource.listen('done', function() {
$(window).off('beforeunload.inprogress'); $(window).off('beforeunload.inprogress');
@ -123,9 +122,7 @@
setMessage: function(message) { setMessage: function(message) {
$('#update-progress-message').html(message); $('#update-progress-message').html(message);
$('#update-progress-detailed') $('#update-progress-detailed')
.append($('<span>')) .append('<p>' + message + '</p>');
.append(message)
.append($('<br>'));
}, },
setPermanentMessage: function(message) { setPermanentMessage: function(message) {
@ -134,9 +131,7 @@
.show() .show()
.append($('<ul>').append(message)); .append($('<ul>').append(message));
$('#update-progress-detailed') $('#update-progress-detailed')
.append($('<span>')) .append('<p>' + message + '</p>');
.append(message)
.append($('<br>'));
}, },
setErrorMessage: function (message) { setErrorMessage: function (message) {
@ -144,9 +139,7 @@
.show() .show()
.html(message); .html(message);
$('#update-progress-detailed') $('#update-progress-detailed')
.append($('<span>')) .append('<p>' + message + '</p>');
.append(message)
.append($('<br>'));
} }
}; };

View File

@ -49,7 +49,7 @@
<p id="update-progress-message-error" class="hidden"></p> <p id="update-progress-message-error" class="hidden"></p>
<ul id="update-progress-message-warnings" class="hidden"></ul> <ul id="update-progress-message-warnings" class="hidden"></ul>
<p id="update-progress-message"></p> <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 id="update-progress-detailed" class="hidden"></div>
</div> </div>
</div> </div>