svn commit: r1293955 - in /archiva/trunk/archiva-modules/archiva-web: archiva-web-common/src/main/resources/org/apache/archiva/i18n/ archiva-webapp-js/src/main/webapp/js/archiva/ archiva-webapp-js/src/main/webapp/js/archiva/templates/

[ol...@apache.org]

Author: olamy
Date: Sun Feb 26 23:06:50 2012
New Revision: 1293955

URL: http://svn.apache.org/viewvc?rev=1293955&view=rev
Log:
use warning label for modal confirn delete repositories

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties?rev=1293955&r1=1293954&r2=1293955&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties Sun Feb 26 23:06:50 2012
@@ -99,6 +99,7 @@ remoterepository.download.remote.confirm
 remoterepository.download.remote.now=Immediate Download ?
 remoterepository.download.remote.full=Full download ?
 remoterepository.download.remote.scheduled=Download Remote Index of repository {0} scheduled.
+remoterepository.delete.confirm=Are you sure to delete Remote Repository {0} ?
 
 
 #network proxy

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js?rev=1293955&r1=1293954&r2=1293955&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js Sun Feb 26 23:06:50 2012
@@ -705,7 +705,8 @@ $(function() {
                   }
                 )}, $.i18n.prop('ok'),
                 $.i18n.prop('cancel'),
-                $.i18n.prop('remoterepository.delete.confirm',remoteRepository.id()),null);
+                $.i18n.prop('remoterepository.delete.confirm',remoteRepository.id()),
+                $("#remote-repository-delete-modal-tmpl").tmpl(remoteRepository));
 
     }
 

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html?rev=1293955&r1=1293954&r2=1293955&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html Sun Feb 26 23:06:50 2012
@@ -252,12 +252,7 @@
 
 <script id="managed-repository-delete-warning-tmpl" type='text/x-jquery-tmpl'>
   <div>
-    <a class="close" href="#">&#215;</a>
-    <div class="alert-message warning">
-      <p>
-        <strong>${$.i18n.prop('warning.not.undone.operation')}</strong>
-      </p>
-    </div>
+    <span class="label label-warning">${$.i18n.prop('warning.not.undone.operation')}</span>
     <div>
       <span><strong>${$.i18n.prop('managedrepository.delete.warning.message')}</strong>.</span>
       <div>${$.i18n.prop('id')}: ${id()}</div>
@@ -269,14 +264,15 @@
   </div>
 </script>
 
+<script type="text/html" id="remote-repository-delete-modal-tmpl">
+    <div>
+      <span class="label label-warning">${$.i18n.prop('warning.not.undone.operation')}</span>
+    </div>
+</script>
+
 <script id="managed-repository-location-warning-tmpl" type='text/x-jquery-tmpl'>
   <div>
-    <a class="close" href="#">&#215;</a>
-    <div class="alert-message warning">
-      <p>
-        <strong>${$.i18n.prop('managedrepository.location.already.exists')}</strong>
-      </p>
-    </div>
+    <span class="label label-warning">${$.i18n.prop('managedrepository.location.already.exists')}</span>
     <div>
       <span><strong>${$.i18n.prop('managedrepository.location.already.exists.warning.message')}</strong>.</span>
       <div>${$.i18n.prop('id')}: ${id()}</div>