diff --git a/webapp/web/css/account/account.css b/webapp/web/css/account/account.css index f9e4a45df..7aa32d239 100644 --- a/webapp/web/css/account/account.css +++ b/webapp/web/css/account/account.css @@ -470,4 +470,12 @@ h4.profile-editors { .proxy-item { margin-left: 20px; margin-top: 20px; +} +span[name=proxySelectorSearchStatus] { + color: red; +} +img.loading-relateEdior, +img.loading-relateProfile, +img.loading-addProfile { + padding-left: 10px; } \ No newline at end of file diff --git a/webapp/web/images/indicatorWhite.gif b/webapp/web/images/indicatorWhite.gif new file mode 100644 index 000000000..529e72f45 Binary files /dev/null and b/webapp/web/images/indicatorWhite.gif differ diff --git a/webapp/web/js/account/accountProxyItemsPanel.js b/webapp/web/js/account/accountProxyItemsPanel.js index 335d0c338..fc354bd25 100644 --- a/webapp/web/js/account/accountProxyItemsPanel.js +++ b/webapp/web/js/account/accountProxyItemsPanel.js @@ -185,4 +185,41 @@ $(document).ready(function() { } this["proxyItemsPanel"] = new proxyItemsPanel(this, context); }); + + //Add progress indicator for autocomplete input fields + + var inputClick; + + $('#selectProfileEditors').click(function(){ + inputClick = ".loading-relateEditor"; + }); + + $('#selectProfiles').click(function(){ + inputClick = ".loading-relateProfile"; + }); + + $('#addProfile').click(function(){ + inputClick = ".loading-addProfile"; + }); + + + $(document).ajaxStart(function(){ + if (inputClick = ".loading-relateProfile"){ + $('.loading-relateProfile').removeClass('hidden').css('display', 'inline-block'); + }else if (inputClick = ".loading-addProfile"){ + $('.loading-addProfile').removeClass('hidden').css('display', 'inline-block'); + }else if (inputClick = ".loading-relateEditor"){ + $('.loading-relateEditor').removeClass('hidden').css('display', 'inline-block'); + } + }); + + $(document).ajaxStop(function(){ + if (inputClick = ".loading-relateProfile"){ + $('.loading-relateProfile').hide().addClass('hidden');; + }else if (inputClick = ".loading-addProfile"){ + $('.loading-addProfile').hide().addClass('hidden');; + }else if (inputClick = ".loading-relateEditor"){ + $('.loading-relateEditor').hide().addClass('hidden');; + } + }); }); diff --git a/webapp/web/js/account/proxyUtils.js b/webapp/web/js/account/proxyUtils.js index ea5f58890..0e41e250e 100644 --- a/webapp/web/js/account/proxyUtils.js +++ b/webapp/web/js/account/proxyUtils.js @@ -4,6 +4,7 @@ $(document).ready(function(){ //Remove initial value of input text 'Select an existing last name' $('input[name="proxySelectorAC"]').click(function(){ $(this).val(''); + $("span[name='proxySelectorSearchStatus']").text('') }); //Alert when user doesn't select an editor and a profile after submitting from for relating proxy-profiles diff --git a/webapp/web/templates/freemarker/body/manageproxies/manageProxies-list.ftl b/webapp/web/templates/freemarker/body/manageproxies/manageProxies-list.ftl index 16a241e86..efe74bd6b 100644 --- a/webapp/web/templates/freemarker/body/manageproxies/manageProxies-list.ftl +++ b/webapp/web/templates/freemarker/body/manageproxies/manageProxies-list.ftl @@ -30,7 +30,7 @@
- +

 

<#-- Magic div that holds all of the proxy data and the template that shows how to display it. --> @@ -61,8 +61,8 @@ Select profiles
- - + +

 

@@ -140,7 +140,7 @@
- +

 

${r.proxyInfos[0].profileUri}