From: Olivier Lamy Date: Mon, 2 Apr 2012 10:08:20 +0000 (+0000) Subject: merge template files together X-Git-Tag: archiva-1.4-M3~880 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c948c8b4383bc0f81dddad04c6ba72371a79be48;p=archiva.git merge template files together git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1308281 13f79535-47bb-0310-9956-ffa450edef68 --- 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 38989cbd2..861a04cc6 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,11 @@ 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/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, - repository_groups,search,general_admin,artifacts_management) { + search,general_admin) { var htmlFragment=$("#html-fragments"); // template loading @@ -36,10 +34,8 @@ define("archiva.templates",["text!templates/archiva/menu.html", $.tmpl( modal ).appendTo(htmlFragment); htmlFragment.append(grids_generics); htmlFragment.append(repositories); - htmlFragment.append(repository_groups); htmlFragment.append(search); htmlFragment.append(general_admin); - htmlFragment.append(artifacts_management); $.log("main-tmpl.js loaded"); } ); \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/artifacts-management.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/artifacts-management.html deleted file mode 100644 index 3625ad8f1..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/artifacts-management.html +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html index eefae72c2..95218b890 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html @@ -513,3 +513,170 @@ + + + + + + + + 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 443a95f41..d0b15cc37 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 @@ -954,4 +954,154 @@
${$.i18n.prop('warning.not.undone.operation')}
+ + + + + + + + + + + \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repository-groups.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repository-groups.html deleted file mode 100644 index 263af3966..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repository-groups.html +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - - - - - \ No newline at end of file