mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changed config saving feedback design 

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ (skjnldsv) 2018-02-22 13:09:06 +01:00
parent 3d2b3a1309
commit 0cc520f3a0
No known key found for this signature in database
GPG Key ID: FB5ACEED51955BF8
4 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/files_external/css/settings.css → apps/files_external/css/settings.scss
View File

@ -18,9 +18,11 @@
#externalStorage td.status > span { #externalStorage td.status > span {
display: inline-block; display: inline-block;
height: 16px; height: 28px;
width: 16px; width: 28px;
vertical-align: text-bottom; vertical-align: text-bottom;
border-radius: 50%;
cursor: pointer;
} }
td.mountPoint, td.backend { width:160px; } td.mountPoint, td.backend { width:160px; }
@ -78,10 +80,6 @@ td.mountPoint, td.backend { width:160px; }
top: 3px; top: 3px;
} }
#externalStorage td.status .success {
border-radius: 50%;
}
#userMountingBackends { #userMountingBackends {
padding-left: 25px; padding-left: 25px;
} }

11
apps/files_external/js/settings.js
View File

@ -1230,22 +1230,23 @@ MountConfigListView.prototype = _.extend({
*/ */
updateStatus: function($tr, status, message) { updateStatus: function($tr, status, message) {
var $statusSpan = $tr.find('.status span'); var $statusSpan = $tr.find('.status span');
$statusSpan.removeClass('loading-small success indeterminate error'); $statusSpan.removeClass();
console.log($tr, status, message);
switch (status) { switch (status) {
case null: case null:
// remove status // remove status
break; break;
case StorageConfig.Status.IN_PROGRESS: case StorageConfig.Status.IN_PROGRESS:
$statusSpan.addClass('loading-small'); $statusSpan.attr('class', 'icon-loading-small');
break; break;
case StorageConfig.Status.SUCCESS: case StorageConfig.Status.SUCCESS:
$statusSpan.addClass('success'); $statusSpan.attr('class', 'success icon-checkmark-white');
break; break;
case StorageConfig.Status.INDETERMINATE: case StorageConfig.Status.INDETERMINATE:
$statusSpan.addClass('indeterminate'); $statusSpan.attr('class', 'indeterminate icon-info-white');
break; break;
default: default:
$statusSpan.addClass('error'); $statusSpan.attr('class', 'error icon-error-white');
} }
$statusSpan.attr('data-original-title', (typeof message === 'string') ? message : ''); $statusSpan.attr('data-original-title', (typeof message === 'string') ? message : '');
}, },

2
apps/files_external/templates/settings.php
View File

@ -110,7 +110,7 @@
<?php endif; ?> <?php endif; ?>
> >
<td class="status"> <td class="status">
<span></span> <span title="<?php p($l->t('Click to recheck the configuration')); ?>"></span>
</td> </td>
<td class="mountPoint"><input type="text" name="mountPoint" value="" <td class="mountPoint"><input type="text" name="mountPoint" value=""
placeholder="<?php p($l->t('Folder name')); ?>"> placeholder="<?php p($l->t('Folder name')); ?>">

6
settings/css/settings.scss
View File

@ -1105,14 +1105,14 @@ table.grid td.date {
span { span {
&.success { &.success {
background: #37ce02; background-color: $color-success;
border-radius: $border-radius; border-radius: $border-radius;
} }
&.error { &.error {
background: #ce3702; background-color: $color-error;
} }
&.indeterminate { &.indeterminate {
background: #e6db00; background-color: $color-warning;
border-radius: 40% 0; border-radius: 40% 0;
} }
} }