Commit 26ee364f authored by Robert Lyon's avatar Robert Lyon
Browse files

Bug 1874375: Allow the uploading spinner message not have success tick 



The tick should only appear after the file has finished uploading
- made alert-pending css class to handle this

Change-Id: I757a0e66fe5bc9ac8024f4082bf02dc5afe62db6
Signed-off-by: default avatarRobert Lyon <robertl@catalyst.net.nz>
parent 598ad69e

htdocs/artefact/file/js/filebrowser.js

+3 −3
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ var FileBrowser = (function($) { 


    this.add_upload_message = function (messageType, filename) {

        self.nextupload++;

        var message = $(makeMessage($('<span>').addClass('icon icon-spinner icon-pulse'), messageType));

        var message = $(makeMessage($('<span>'), messageType));

        message.append(' ' + get_string('uploadingfiletofolder', 'artefact.file', filename, self.foldername));

        message.prop('id', 'uploadstatusline' + self.nextupload);

        message.appendTo('#' + self.id + '_upload_messages');
@@ -132,7 +132,7 @@ var FileBrowser = (function($) { 


    this.upload_presubmit_dropzone = function (e) {

        // Display upload status

        self.add_upload_message('info', e.name);

        self.add_upload_message('pending', e.name);

        return true;

    };
@@ -141,7 +141,7 @@ var FileBrowser = (function($) { 
        if ($('#' + self.id + '_userfile').prop('files')) {

            for (var i = 0; i < $('#' + self.id + '_userfile').prop('files').length; ++ i) {

                var localname = $('#' + self.id + '_userfile').prop('files')[i].name;

                self.add_upload_message('ok', localname);

                self.add_upload_message('pending', localname);

            }

        }

        return true;

htdocs/js/mahara.js

+8 −2
Original line number Diff line number Diff line
@@ -228,6 +228,8 @@ function makeMessage(message, type, temp) { 
            return messageContainer.addClass('alert-danger').get(0);

        case 'warning':

            return messageContainer.addClass('alert-warning').get(0);

        case 'pending':

            return messageContainer.addClass('alert-pending').get(0);

        default:

            return messageContainer.addClass('alert-info').get(0);

    }
@@ -240,8 +242,12 @@ function displayMessage(message, type, hideprevmsg) { 
    if (message === undefined || message == '') {

        return;

    }

    // ensure we have type 'ok', 'error', or 'info' (the default)

    if (!type || (type != 'ok' && type != 'error')) {

    // ensure we have type of

    // 'ok'          - eg. on save success

    // 'pending'     - eg. on file uploading

    // 'error'       - on failed saving

    // 'info'        - helpful message (the default)

    if (!type || (type != 'ok' && type != 'error' && type != 'pending')) {

        type = 'info';

    }

htdocs/theme/raw/sass/form/_alert.scss

+10 −0
Original line number Diff line number Diff line
@@ -71,6 +71,16 @@ 
      color: scale-color($success, $lightness: -30%);

    }

}

.alert-pending {

    color: scale-color($info, $lightness: -30%);

    background-color: scale-color($info, $lightness: 70%);

    border-color: scale-color($info, $lightness: 50%);

    &:before {

      content: fa-content($fa-var-spinner);

      color: scale-color($info, $lightness: -30%);

      animation: fa-spin 1s infinite steps(8);

    }

}

.alert-info {

    color: scale-color($info, $lightness: -30%);

    background-color: scale-color($info, $lightness: 70%);