summaryrefslogtreecommitdiffstats
path: root/archiva-modules/archiva-web/archiva-webapp-js
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2012-02-26 23:06:50 +0000
committerOlivier Lamy <olamy@apache.org>2012-02-26 23:06:50 +0000
commit7da60c31ddb2b1e877c3684ec69433625e21864a (patch)
treef22a72fedb07e8ef5d621289b62e6638154ce100 /archiva-modules/archiva-web/archiva-webapp-js
parentc77fd573a8636ee1c48dc02f30f40398f8aaa5ea (diff)
downloadarchiva-7da60c31ddb2b1e877c3684ec69433625e21864a.tar.gz
archiva-7da60c31ddb2b1e877c3684ec69433625e21864a.zip
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
Diffstat (limited to 'archiva-modules/archiva-web/archiva-webapp-js')
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js3
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html20
2 files changed, 10 insertions, 13 deletions
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>