From 267659a5f5e6f0443c4f51d1003b8b87143c13d5 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 2 Apr 2012 10:07:35 +0000 Subject: [PATCH] merge template files together git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1308280 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/webapp/js/archiva/main-tmpl.js | 4 +- .../templates/archiva/proxy-connectors.html | 317 ------------------ .../js/templates/archiva/repositories.html | 299 +++++++++++++++++ 3 files changed, 300 insertions(+), 320 deletions(-) delete mode 100644 archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/proxy-connectors.html diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js index 907711d24..38989cbd2 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js @@ -21,13 +21,12 @@ define("archiva.templates",["text!templates/archiva/menu.html", "text!templates/archiva/modal.html", "text!templates/archiva/grids-generics.html", "text!templates/archiva/repositories.html", - "text!templates/archiva/proxy-connectors.html", "text!templates/archiva/repository-groups.html", "text!templates/archiva/search.html", "text!templates/archiva/general-admin.html", "text!templates/archiva/artifacts-management.html", "jquery.tmpl","utils"], - function(menu,message,modal,grids_generics,repositories,proxies_connectors, + function(menu,message,modal,grids_generics,repositories, repository_groups,search,general_admin,artifacts_management) { var htmlFragment=$("#html-fragments"); @@ -37,7 +36,6 @@ define("archiva.templates",["text!templates/archiva/menu.html", $.tmpl( modal ).appendTo(htmlFragment); htmlFragment.append(grids_generics); htmlFragment.append(repositories); - htmlFragment.append(proxies_connectors); htmlFragment.append(repository_groups); htmlFragment.append(search); htmlFragment.append(general_admin); diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/proxy-connectors.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/proxy-connectors.html deleted file mode 100644 index 557c3c8a4..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/proxy-connectors.html +++ /dev/null @@ -1,317 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html index aff72fbbd..443a95f41 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html @@ -655,4 +655,303 @@
${$.i18n.prop('warning.not.undone.operation')}
+ + + + + + + + + + + + + + + + \ No newline at end of file -- 2.39.5