merge template files together

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1308284 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 861a04cc6f73a30d3ab9afd455aa7c735ebb1d39..c9f30681326e3ac8b00d3a858685d8282cc3a3e6 100644 (file)
--- 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 (file)
index 0f94a83..0000000
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/grids-generics.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
--->
-<script id="ko_simpleGrid_pageLinks" type="text/html">
-  <div class="pagination">
-      <ul>
-      {{each(i) ko.utils.range(1, maxPageIndex)}}
-          <li data-bind="css: { active: i == currentPageIndex() }">
-            <a href="#" data-bind="click: function() { currentPageIndex(i) }">
-              ${ i + 1 }
-            </a>
-          </li>
-      {{/each}}
-      </ul>
-  </div>
-</script>
\ 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 44cf4da9962ae48e41335d50440d02c06fef78ee..a0fad0e4556b49f010c1216b793751ec7cb39a5d 100644 (file)
--- 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 @@
   </div>
 </script>
 
+<script id="ko_simpleGrid_pageLinks" type="text/html">
+  <div class="pagination">
+      <ul>
+      {{each(i) ko.utils.range(1, maxPageIndex)}}
+          <li data-bind="css: { active: i == currentPageIndex() }">
+            <a href="#" data-bind="click: function() { currentPageIndex(i) }">
+              ${ i + 1 }
+            </a>
+          </li>
+      {{/each}}
+      </ul>
+  </div>
+</script>
+