From 7da60c31ddb2b1e877c3684ec69433625e21864a Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Sun, 26 Feb 2012 23:06:50 +0000
Subject: [PATCH] use warning label for modal confirn delete repositories

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1293955 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/archiva/i18n/default.properties    |  1 +
 .../main/webapp/js/archiva/repositories.js    |  3 ++-
 .../js/archiva/templates/repositories.html    | 20 ++++++++-----------
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
index b6443366c..84a3b948c 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
@@ -99,6 +99,7 @@ remoterepository.download.remote.confirm=Are you sure to download Remote Index ?
 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
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
index eee15776d..83e96ca6b 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
@@ -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));
 
     }
 
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
index 9341a8bc7..f512431e0 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
@@ -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>
-- 
2.39.5