From 81dc12a77bb88340baae1e05011e1b96b8df6536 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Wed, 1 Aug 2018 13:30:31 +0200 Subject: [PATCH 1/7] Fix triangle on update page Signed-off-by: Jan-Christoph Borchardt --- core/templates/update.admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/templates/update.admin.php b/core/templates/update.admin.php index aaeacea993..fecb53bee8 100644 --- a/core/templates/update.admin.php +++ b/core/templates/update.admin.php @@ -49,7 +49,7 @@

- t( 'Detailed logs' )); ?> + t( 'Detailed logs' )); ?> ⏷ From d64a9f3d0d71ee8c7974932b7faf14faf5150980 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Wed, 1 Aug 2018 13:36:44 +0200 Subject: [PATCH 2/7] Fix text overflow on update page Signed-off-by: Jan-Christoph Borchardt --- core/css/guest.css | 1 + 1 file changed, 1 insertion(+) diff --git a/core/css/guest.css b/core/css/guest.css index 422ceace5b..f6700315b7 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -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; From ede469a240f328ce46a238f94850b6950ada2b40 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Wed, 1 Aug 2018 13:51:23 +0200 Subject: [PATCH 3/7] Inline error svg icon because there is no SCSS on guest page Signed-off-by: Jan-Christoph Borchardt --- core/css/guest.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/css/guest.css b/core/css/guest.css index f6700315b7..626fb67718 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -631,6 +631,9 @@ p.info { margin: 10px; background-size: 32px; } +#update-progress-icon.icon-error-white { + background-image: url('data:image/svg+xml;utf8,'); +} /* Icons */ .icon-info-white { From 4574698443fd38ef4e31ce126838474369c7a30a Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Wed, 1 Aug 2018 18:54:48 +0200 Subject: [PATCH 4/7] Fix double container on 'Possible CSRF attack' page Signed-off-by: Jan-Christoph Borchardt --- core/js/update.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/js/update.js b/core/js/update.js index cd5ee8b080..b2a2579558 100644 --- a/core/js/update.js +++ b/core/js/update.js @@ -58,7 +58,7 @@ $(window).off('beforeunload.inprogress'); self.setErrorMessage(message); message = t('core', 'Please reload the page.'); - $('').addClass('error').append(''+message+'
').appendTo($el); + $('

').append(''+message+'').appendTo($el); updateEventSource.close(); }); updateEventSource.listen('failure', function(message) { From 2fb6799ad6159f434c594260c8f90acc906d0d75 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Fri, 3 Aug 2018 13:20:45 +0200 Subject: [PATCH 5/7] Use images instead of inline SVG and unicode Signed-off-by: Jan-Christoph Borchardt --- core/css/guest.css | 14 +++++++++++--- core/img/actions/error-white.svg | 1 + core/templates/update.admin.php | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 core/img/actions/error-white.svg diff --git a/core/css/guest.css b/core/css/guest.css index 626fb67718..ca7676c00f 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -626,19 +626,27 @@ p.info { 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; } -#update-progress-icon.icon-error-white { - background-image: url('data:image/svg+xml;utf8,'); -} + /* 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'); } diff --git a/core/img/actions/error-white.svg b/core/img/actions/error-white.svg new file mode 100644 index 0000000000..9558c998c3 --- /dev/null +++ b/core/img/actions/error-white.svg @@ -0,0 +1 @@ + diff --git a/core/templates/update.admin.php b/core/templates/update.admin.php index fecb53bee8..2ad1511732 100644 --- a/core/templates/update.admin.php +++ b/core/templates/update.admin.php @@ -49,7 +49,7 @@

- t( 'Detailed logs' )); ?> ⏷ + t( 'Detailed logs' )); ?> From 49cbd8cd9507992c40e9acbb732721bcb72f1cba Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Fri, 3 Aug 2018 13:30:36 +0200 Subject: [PATCH 6/7] Add margin below detailed logs Signed-off-by: Jan-Christoph Borchardt --- core/css/guest.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/css/guest.css b/core/css/guest.css index ca7676c00f..512fd6c9d4 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -620,9 +620,10 @@ p.info { } #update-progress-detailed { text-align: left; + margin-bottom: 12px; } .update-show-detailed { - padding: 13px; + padding: 12px; display: block; opacity: .75; } From 6d7bf8142155e40bc65c63d9d2200b251435c92c Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Fri, 3 Aug 2018 13:30:49 +0200 Subject: [PATCH 7/7] Fix HTML on update error page Signed-off-by: Jan-Christoph Borchardt --- core/js/update.js | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/core/js/update.js b/core/js/update.js index b2a2579558..9562c7b2e4 100644 --- a/core/js/update.js +++ b/core/js/update.js @@ -69,16 +69,15 @@ .removeClass('icon-loading-dark'); self.setErrorMessage(message); - var span = $('') - .addClass('bold'); + var updateUnsuccessful = $('

'); if(message === 'Exception: Updates between multiple major versions and downgrades are unsupported.') { - span.append(t('core', 'The update was unsuccessful. For more information check our forum post 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 check our forum post 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 ' + 'Nextcloud community.')); } - span.appendTo($el); + updateUnsuccessful.appendTo($el); }); updateEventSource.listen('done', function() { $(window).off('beforeunload.inprogress'); @@ -123,9 +122,7 @@ setMessage: function(message) { $('#update-progress-message').html(message); $('#update-progress-detailed') - .append($('')) - .append(message) - .append($('
')); + .append('

' + message + '

'); }, setPermanentMessage: function(message) { @@ -134,9 +131,7 @@ .show() .append($('
    ').append(message)); $('#update-progress-detailed') - .append($('')) - .append(message) - .append($('
    ')); + .append('

    ' + message + '

    '); }, setErrorMessage: function (message) { @@ -144,9 +139,7 @@ .show() .html(message); $('#update-progress-detailed') - .append($('')) - .append(message) - .append($('
    ')); + .append('

    ' + message + '

    '); } };