svn commit: r1393183 - in /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js: archiva/proxy-connectors-rules.js templates/archiva/modal.html templates/archiva/repositories.html

[olamy]

Author: olamy
Date: Tue Oct  2 21:11:44 2012
New Revision: 1393183

URL: http://svn.apache.org/viewvc?rev=1393183&view=rev
Log:
open a confirm modial dialog to ask confirmation for deletion

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors-rules.js
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/modal.html
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors-rules.js
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors-rules.js?rev=1393183&r1=1393182&r2=1393183&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors-rules.js
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors-rules.js
 Tue Oct  2 21:11:44 2012
@@ -104,9 +104,7 @@ define("archiva.proxy-connectors-rules",
       );
     }
 
-    removeProxyConnectorRule=function(proxyConnectorRule){
-
-      //FIXME modal dialog to confirm
+    this.deleteProxyConnectorRule=function(proxyConnectorRule){
       //$("#proxy-connector-rule-delete-btn" ).button("loading");
       $("#user-messages" ).html(mediumSpinnerImg());
       
$.ajax("restServices/archivaServices/proxyConnectorRuleService/deleteProxyConnectorRule",
@@ -132,6 +130,15 @@ define("archiva.proxy-connectors-rules",
       );
     }
 
+    removeProxyConnectorRule=function(proxyConnectorRule){
+
+      openDialogConfirm(
+          
function(){self.deleteProxyConnectorRule(proxyConnectorRule);window.modalConfirmDialog.modal('hide')},
+          $.i18n.prop('ok'), $.i18n.prop('cancel'),
+          
$.i18n.prop('proxy-connector-rule.delete.confirm',proxyConnectorRule.pattern()),"");
+
+    }
+
     editProxyConnectorRule=function(proxyConnectorRule){
       var proxyConnectorRuleViewModel=new 
ProxyConnectorRuleViewModel(proxyConnectorRule,self,true);
       
ko.applyBindings(proxyConnectorRuleViewModel,$("#main-content").find("#proxy-connector-rules-edit"
 ).get(0));

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/modal.html
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/modal.html?rev=1393183&r1=1393182&r2=1393183&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/modal.html
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/modal.html
 Tue Oct  2 21:11:44 2012
@@ -25,8 +25,8 @@
    <p id="dialog-confirm-modal-body-text"></p>
   </div>
   <div class="modal-footer">
-    <a class="btn btn-secondary" id="dialog-confirm-modal-cancel" 
href="#">${$.i18n.prop('cancel')}</a>
-    <a class="btn btn-primary" id="dialog-confirm-modal-ok" 
href="#">${$.i18n.prop('ok')}</a>
+    <a class="btn btn-secondary" 
id="dialog-confirm-modal-cancel">${$.i18n.prop('cancel')}</a>
+    <a class="btn btn-primary" 
id="dialog-confirm-modal-ok">${$.i18n.prop('ok')}</a>
   </div>
 </div>
 

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html?rev=1393183&r1=1393182&r2=1393183&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
 Tue Oct  2 21:11:44 2012
@@ -1303,7 +1303,7 @@
               </a>
           </td>
           <td>
-              <a href="#" data-bind="click: function(){ 
removeProxyConnectorRule(row) }" 
data-loading-text="${$.i18n.prop('common.loading')}">
+              <a data-bind="click: function(){ removeProxyConnectorRule(row) 
}" data-loading-text="${$.i18n.prop('common.loading')}">
                 <span class="btn btn-danger">
                   <i class="icon-trash icon-white"/>
                 </span>