AIRAVATA-2228 Success message when sharing updates Also switched from a spinner on the button to a blocking overlay for the whole modal so user can't cancel or change sharing or anything while Ajax is running.
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/20032602 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/20032602 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/20032602 Branch: refs/heads/develop Commit: 200326026dbb478110622e5e19b502cf85595883 Parents: f98e8f8 Author: Marcus Christie <[email protected]> Authored: Mon Nov 21 11:56:05 2016 -0500 Committer: Marcus Christie <[email protected]> Committed: Mon Nov 21 11:56:05 2016 -0500 ---------------------------------------------------------------------- app/views/partials/sharing-display-body.blade.php | 1 + public/css/bootstrap.min.css | 17 +++++++++++++++++ public/css/sharing.css | 4 ++++ public/js/sharing/share.js | 15 ++++++++++++--- 4 files changed, 34 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/20032602/app/views/partials/sharing-display-body.blade.php ---------------------------------------------------------------------- diff --git a/app/views/partials/sharing-display-body.blade.php b/app/views/partials/sharing-display-body.blade.php index a92fe69..a67c393 100644 --- a/app/views/partials/sharing-display-body.blade.php +++ b/app/views/partials/sharing-display-body.blade.php @@ -17,6 +17,7 @@ <option value="lastfirst">Last, First Name</option> <option value="email">Email</option> </select> +<div id="shared-users-updated-message"></div> <div id="shared-users"></div> @if($form) <input id="share-settings" name="share-settings" type="hidden" value="{}" /> http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/20032602/public/css/bootstrap.min.css ---------------------------------------------------------------------- diff --git a/public/css/bootstrap.min.css b/public/css/bootstrap.min.css index c2a9f00..69ea7f4 100644 --- a/public/css/bootstrap.min.css +++ b/public/css/bootstrap.min.css @@ -127,4 +127,21 @@ body{ /* center vertically */ top: 50%; margin-top: -10px; +} + +.modal-spinner { + position: relative; +} +.modal-spinner::after { + content: ''; + background-image: url(../assets/ajax-loader.gif); + background-repeat: no-repeat; + background-position: calc(50% - 17px) calc(50% - 17px); + background-color: rgba(0,0,0,0.4); + display: block; + position: absolute; + left: 0px; + top: 0px; + bottom: 0px; + right: 0px; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/20032602/public/css/sharing.css ---------------------------------------------------------------------- diff --git a/public/css/sharing.css b/public/css/sharing.css index 3c9c0b9..2feac9d 100755 --- a/public/css/sharing.css +++ b/public/css/sharing.css @@ -109,4 +109,8 @@ .modal-footer .alert { text-align: left; +} + +#shared-users-updated-message { + margin-top: 15px; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/20032602/public/js/sharing/share.js ---------------------------------------------------------------------- diff --git a/public/js/sharing/share.js b/public/js/sharing/share.js index 581b8c0..3b20f39 100755 --- a/public/js/sharing/share.js +++ b/public/js/sharing/share.js @@ -283,7 +283,7 @@ $(function() { }; var ajaxUpdateSharing = function(url, share_settings, callback) { - $('#share-box-button').addClass('btn-spinner').attr('disabled', 'disabled'); + $('#share-box .modal-dialog').addClass('modal-spinner'); $.ajax({ url: url, method: 'post', @@ -292,8 +292,17 @@ $(function() { dataType: "json", success: function(data, status, xhr) { if (data.success) { - // TODO: add success message on page callback(); + $( '<div class="alert alert-success fade in">' + + '<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>' + + 'Sharing settings updated successfully' + + '</div>' + ).appendTo('#shared-users-updated-message').alert().each(function(){ + var alert = this; + window.setTimeout(function(){ + $(alert).alert('close'); + }, 5000); + }); } else { $( '<div id="share-box-error-alert" class="alert alert-danger">' + data.error @@ -309,7 +318,7 @@ $(function() { ).appendTo('#share-box-error-message'); }, complete: function(xhr, status) { - $('#share-box-button').removeClass('btn-spinner').removeAttr('disabled'); + $('#share-box .modal-dialog').removeClass('modal-spinner'); } }); };
