Modify remote option values reload button display [rundeck#284]

andrecloutier-pd · Jun 2, 2011 · de09bd1 · de09bd1
1 parent ac401a9
commit de09bd1
Show file tree

Hide file tree

Showing 7 changed files with 341 additions and 22 deletions.
diff --git a/graphics/refresh.svg b/graphics/refresh.svg
diff --git a/rundeckapp/grails-app/views/common/_css.gsp b/rundeckapp/grails-app/views/common/_css.gsp
@@ -224,4 +224,17 @@
         background: transparent url("${resource(dir:'images',file:'icon-small-folder.png')}") top left no-repeat;
     }
 
+    .remotestatus.ok {
+        width: 12px;
+        background: transparent url("${resource(dir:'images',file:'icon-tiny-ok.png')}") center left no-repeat;
+    }
+    .remotestatus.error {
+        width: 12px;
+        background: transparent url("${resource(dir:'images',file:'icon-tiny-warn.png')}") center left no-repeat;
+    }
+
+    .remoteoptionfield:hover .remotestatus {
+        width: 12px;
+        background: transparent url("${resource(dir:'images',file:'icon-tiny-refresh.png')}") center left no-repeat;
+    }
 </style>
diff --git a/rundeckapp/grails-app/views/framework/_commandOptions.gsp b/rundeckapp/grails-app/views/framework/_commandOptions.gsp
@@ -25,15 +25,16 @@ used by _editOptions.gsp template
             <g:set var="fieldName" value="${usePrefix+'option.'+optName}"/>
             <g:set var="optionHasValue" value="${optionSelect.defaultValue || selectedoptsmap && selectedoptsmap[optName]}"/>
             <g:set var="hasError" value="${jobexecOptionErrors?jobexecOptionErrors[optName]:null}"/>
+            <g:set var="fieldNamekey" value="${rkey+'_'+optName+'_label'}"/>
             <tr>
-                <td class="${hasError?'fieldError':''}">${optName}:</td>
+                <td class="${hasError?'fieldError':''} remoteoptionfield" id="${fieldNamekey}"><span style="display:none;" class="remotestatus"></span> ${optName}:</td>
                 <td>
                     <g:if test="${optionSelect.valuesUrl !=null}">
                         <g:set var="holder" value="${rkey+'_'+optName+'_hold'}"/>
                         <span id="${holder}" >
                         </span>
                         <g:javascript>
-                            _loadRemoteOptionValues("${holder}",'${scheduledExecutionId}','${optName}','${usePrefix}','${selectedoptsmap?selectedoptsmap[optName]:''}');
+                            _loadRemoteOptionValues("${holder}",'${scheduledExecutionId}','${optName}','${usePrefix}','${selectedoptsmap?selectedoptsmap[optName]:''}','${fieldNamekey}',true);
                         </g:javascript>
                     </g:if>
                     <g:else>

diff --git a/rundeckapp/grails-app/views/framework/_optionValuesSelect.gsp b/rundeckapp/grails-app/views/framework/_optionValuesSelect.gsp
@@ -149,5 +149,5 @@
     </span>
 </g:if>
 <g:elseif test="${values}">
-    <g:img file="icon-tiny-ok.png" title="Remote option values loaded from URL: ${srcUrl.encodeAsHTML()}"/>
+    %{--<g:img file="icon-tiny-ok.png" title="Remote option values loaded from URL: ${srcUrl.encodeAsHTML()}"/>--}%
 </g:elseif>
diff --git a/rundeckapp/grails-app/views/framework/_remoteOptionValuesJS.gsp b/rundeckapp/grails-app/views/framework/_remoteOptionValuesJS.gsp
@@ -24,30 +24,48 @@
 
 <script type="text/javascript">
         //add a reload button for remote option values
-        function _addReloadRemoteOptionValues(elem, schedId, optName, prefix, value) {
-            var btn = new Element('span');
+        function _addReloadRemoteOptionValues(elem, schedId, optName, prefix, value,reloader,obs) {
+            var btn;
+            var icn;
+            if($(reloader)){
+                btn=$(reloader);
+                icn=$(reloader).down('span.remotestatus');
+                icn.show();
+            }else{
+                btn= new Element('span');
+                icn= new Element('span');
+            }
             btn.addClassName('action');
             btn.addClassName('textbtn');
             if($(elem).innerHTML.indexOf("_error_detail")<0){
-                btn.addClassName('minor');
+                icn.removeClassName('error');
+                icn.addClassName('ok');
+            }else{
+                icn.removeClassName('ok');
+                icn.addClassName('error');
             }
 
             btn.setAttribute('title','Click to reload the remote option values for: '+optName);
-            Event.observe(btn,'click',function(e){
-                //look for selected value
-                var newvalue=value;
-                if ($(elem).down('input')) {
-                    newvalue = $(elem).down('input').value;
-                }else if ($(elem).down('select')) {
-                    newvalue = $(elem).down('select').value;
-                }
-                _loadRemoteOptionValues(elem,schedId,optName,prefix,newvalue);
-            });
-            btn.innerHTML='reload';
-            $(elem).insert({bottom:btn});
+            if(obs){
+                Event.observe(btn,'click',function(e){
+                    //look for selected value
+                    var newvalue=value;
+                    if ($(elem).down('input')) {
+                        newvalue = $(elem).down('input').value;
+                    }else if ($(elem).down('select')) {
+                        newvalue = $(elem).down('select').value;
+                    }
+                    _loadRemoteOptionValues(elem,schedId,optName,prefix,newvalue,reloader,false);
+                });
+            }
+            if(!$(reloader)){
+                btn.innerHTML='reload';
+                $(btn).insert({bottom:icn});
+                $(elem).insert({bottom:btn});
+            }
         }
         //load remote values
-        function _loadRemoteOptionValues(elem,schedId,optName,prefix,value){
+        function _loadRemoteOptionValues(elem,schedId,optName,prefix,value,reloader, obs){
             $(elem).loading('Loading option values&hellip;');
             new Ajax.Updater(
                 elem,
@@ -58,7 +76,7 @@
                     onComplete: function(transport) {
                         if (transport.request.success()) {
                             $(elem).show();
-                            _addReloadRemoteOptionValues(elem,schedId,optName,prefix,value);
+                            _addReloadRemoteOptionValues(elem,schedId,optName,prefix,value,reloader, obs);
                         }
                     }
                 }