From 8fe3395e39e92a949e0eabea54cb7f21e7f5a4c4 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 26 Mar 2012 22:51:55 +0000 Subject: [PATCH] move all templates to a dedicated directory git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1305653 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/webapp/js/archiva/main-tmpl.js | 20 +++++++++---------- .../main/webapp/js/redback/redback-tmpl.js | 14 ++++++------- .../archiva}/general-admin.html | 0 .../archiva}/grids-generics.html | 0 .../templates => templates/archiva}/menu.html | 0 .../archiva}/message.html | 0 .../archiva}/modal.html | 0 .../archiva}/network-proxies.html | 0 .../archiva}/proxy-connectors.html | 0 .../archiva}/repositories.html | 0 .../archiva}/repository-groups.html | 0 .../archiva}/search.html | 0 .../redback}/login.html | 0 .../redback}/password-change-form.html | 0 .../redback}/register-form.html | 0 .../redback}/roles-tmpl.html | 0 .../redback}/user-edit-form.html | 0 .../redback}/user-edit.html | 0 .../redback}/user-grids.html | 0 19 files changed, 17 insertions(+), 17 deletions(-) rename archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/{archiva/templates => templates/archiva}/general-admin.html (100%) rename archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/{archiva/templates => templates/archiva}/grids-generics.html (100%) rename archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/{archiva/templates => templates/archiva}/menu.html (100%) rename archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/{archiva/templates => templates/archiva}/message.html (100%) rename archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/{archiva/templates => templates/archiva}/modal.html (100%) rename archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/{archiva/templates => templates/archiva}/network-proxies.html (100%) rename archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/{archiva/templates => templates/archiva}/proxy-connectors.html (100%) rename archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/{archiva/templates => templates/archiva}/repositories.html (100%) rename archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/{archiva/templates => templates/archiva}/repository-groups.html (100%) rename archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/{archiva/templates => templates/archiva}/search.html (100%) rename archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/{redback/templates => templates/redback}/login.html (100%) rename archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/{redback/templates => templates/redback}/password-change-form.html (100%) rename archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/{redback/templates => templates/redback}/register-form.html (100%) rename archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/{redback/templates => templates/redback}/roles-tmpl.html (100%) rename archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/{redback/templates => templates/redback}/user-edit-form.html (100%) rename archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/{redback/templates => templates/redback}/user-edit.html (100%) rename archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/{redback/templates => templates/redback}/user-grids.html (100%) 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 6dafd15c8..121eacaac 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 @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -define("main-templates",["text!archiva/templates/menu.html", - "text!archiva/templates/message.html", - "text!archiva/templates/modal.html", - "text!archiva/templates/grids-generics.html", - "text!archiva/templates/repositories.html", - "text!archiva/templates/network-proxies.html", - "text!archiva/templates/proxy-connectors.html", - "text!archiva/templates/repository-groups.html", - "text!archiva/templates/search.html", - "text!archiva/templates/general-admin.html", +define("main-templates",["text!templates/archiva/menu.html", + "text!templates/archiva/message.html", + "text!templates/archiva/modal.html", + "text!templates/archiva/grids-generics.html", + "text!templates/archiva/repositories.html", + "text!templates/archiva/network-proxies.html", + "text!templates/archiva/proxy-connectors.html", + "text!templates/archiva/repository-groups.html", + "text!templates/archiva/search.html", + "text!templates/archiva/general-admin.html", "jquery_tmpl","utils"], function(menu,message,modal,grids_generics,repositories,network_proxies,proxies_connectors, repository_groups,search,general_admin) { diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js index 91ce0feb0..e08ab110e 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback-tmpl.js @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -define("redback-templates",["text!redback/templates/user-edit.html", - "text!redback/templates/user-grids.html", - "text!redback/templates/login.html", - "text!redback/templates/register-form.html", - "text!redback/templates/password-change-form.html", - "text!redback/templates/user-edit-form.html", - "text!redback/templates/roles-tmpl.html", +define("redback-templates",["text!templates/redback/user-edit.html", + "text!templates/redback/user-grids.html", + "text!templates/redback/login.html", + "text!templates/redback/register-form.html", + "text!templates/redback/password-change-form.html", + "text!templates/redback/user-edit-form.html", + "text!templates/redback/roles-tmpl.html", "jquery_tmpl","utils"], function(useredit, usergrids, login,register,passwordchange,usereditform,roles) { diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/general-admin.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/general-admin.html rename to archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/grids-generics.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/grids-generics.html similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/grids-generics.html rename to archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/grids-generics.html diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/menu.html similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/menu.html rename to archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/menu.html diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/message.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/message.html similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/message.html rename to archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/message.html diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/modal.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/modal.html similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/modal.html rename to archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/modal.html diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/network-proxies.html similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/network-proxies.html rename to archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/network-proxies.html diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/proxy-connectors.html similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html rename to 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/templates/repositories.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html rename to archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repository-groups.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repository-groups.html similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repository-groups.html rename to archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repository-groups.html diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html rename to archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/login.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/login.html similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/login.html rename to archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/login.html diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/password-change-form.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/password-change-form.html similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/password-change-form.html rename to archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/password-change-form.html diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/register-form.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/register-form.html similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/register-form.html rename to archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/register-form.html diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/roles-tmpl.html similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/roles-tmpl.html rename to archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/roles-tmpl.html diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit-form.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/user-edit-form.html similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit-form.html rename to archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/user-edit-form.html diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/user-edit.html similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-edit.html rename to archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/user-edit.html diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/user-grids.html similarity index 100% rename from archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/templates/user-grids.html rename to archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/user-grids.html -- 2.39.5