From 05521e3aa1bf56fe9568e3051f4f030b3e2448ca Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 2 Apr 2012 10:10:23 +0000 Subject: [PATCH] merge template files together git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1308284 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/webapp/js/archiva/main-tmpl.js | 4 +-- .../js/templates/archiva/grids-generics.html | 31 ------------------- .../webapp/js/templates/archiva/message.html | 14 +++++++++ 3 files changed, 15 insertions(+), 34 deletions(-) delete mode 100644 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/main-tmpl.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main-tmpl.js index 861a04cc6..c9f306813 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 @@ -19,12 +19,11 @@ define("archiva.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/search.html", "text!templates/archiva/general-admin.html", "jquery.tmpl","utils"], - function(menu,message,modal,grids_generics,repositories, + function(menu,message,modal,repositories, search,general_admin) { var htmlFragment=$("#html-fragments"); @@ -32,7 +31,6 @@ define("archiva.templates",["text!templates/archiva/menu.html", htmlFragment.append(menu); htmlFragment.append(message); $.tmpl( modal ).appendTo(htmlFragment); - htmlFragment.append(grids_generics); htmlFragment.append(repositories); htmlFragment.append(search); htmlFragment.append(general_admin); diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/grids-generics.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/grids-generics.html deleted file mode 100644 index 0f94a831c..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/grids-generics.html +++ /dev/null @@ -1,31 +0,0 @@ - - \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/message.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/message.html index 44cf4da99..a0fad0e45 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/message.html +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/message.html @@ -50,3 +50,17 @@ + + -- 2.39.5