From: Olivier Lamy <olamy@apache.org>
Date: Mon, 2 Apr 2012 10:11:12 +0000 (+0000)
Subject: use a better naming convention for template files
X-Git-Tag: archiva-1.4-M3~876
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=056ed30edcb00cbcf260098a2c88b94aac23782d;p=archiva.git

use a better naming convention for template files

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1308285 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 c9f306813..44a741e93 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
@@ -17,19 +17,19 @@
  * under the License.
  */
 define("archiva.templates",["text!templates/archiva/menu.html",
-          "text!templates/archiva/message.html",
+          "text!templates/archiva/generics.html",
           "text!templates/archiva/modal.html",
           "text!templates/archiva/repositories.html",
           "text!templates/archiva/search.html",
           "text!templates/archiva/general-admin.html",
           "jquery.tmpl","utils"],
-  function(menu,message,modal,repositories,
+  function(menu,generics,modal,repositories,
            search,general_admin) {
 
     var htmlFragment=$("#html-fragments");
     // template loading
     htmlFragment.append(menu);
-    htmlFragment.append(message);
+    htmlFragment.append(generics);
     $.tmpl( modal ).appendTo(htmlFragment);
     htmlFragment.append(repositories);
     htmlFragment.append(search);
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/generics.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/generics.html
new file mode 100644
index 000000000..a0fad0e45
--- /dev/null
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/generics.html
@@ -0,0 +1,66 @@
+<!--
+  ~ 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='alert-message-success' type='text/html'>
+  <div class="alert fade in alert-success" data-alert="alert">
+    <a class="close" data-dismiss="alert" href="#" id='alert-message-success-close-a'>&#215;</a>
+    ${message}
+  </div>
+</script>
+<script id='alert-message-error' type='text/html'>
+  <div class="alert fade in alert-error" data-alert="alert">
+    <a class="close" data-dismiss="alert" href="#" id='alert-message-error-close-a'>&#215;</a>
+    ${message}
+  </div>
+</script>
+<script id='alert-message-warning' type='text/html'>
+  <div class="alert fade in alert-heading" data-alert="alert">
+    <a class="close" data-dismiss="alert" href="#" id='alert-message-warning-close-a'>&#215;</a>
+    ${message}
+  </div>
+</script>
+<script id='alert-message-info' type='text/html'>
+  <div class="alert fade in alert-info" data-alert="alert">
+    <a class="close" data-dismiss="alert" href="#" id='alert-message-info-close-a'>&#215;</a>
+    ${message}
+  </div>
+</script>
+
+<script id='footer-tmpl' type='text/html'>
+  <div class="pull-left">
+    <a target="_blank" href="http://archiva.apache.org/">Apache Archiva&nbsp;-&nbsp;${version}</a>
+  </div>
+  <div class="pull-right">
+    Copyright &#169;  ${copyrightRange}  <a target="_blank" href="http://www.apache.org/">The Apache Software Foundation</a>
+  </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>
+
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
deleted file mode 100644
index a0fad0e45..000000000
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/message.html
+++ /dev/null
@@ -1,66 +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='alert-message-success' type='text/html'>
-  <div class="alert fade in alert-success" data-alert="alert">
-    <a class="close" data-dismiss="alert" href="#" id='alert-message-success-close-a'>&#215;</a>
-    ${message}
-  </div>
-</script>
-<script id='alert-message-error' type='text/html'>
-  <div class="alert fade in alert-error" data-alert="alert">
-    <a class="close" data-dismiss="alert" href="#" id='alert-message-error-close-a'>&#215;</a>
-    ${message}
-  </div>
-</script>
-<script id='alert-message-warning' type='text/html'>
-  <div class="alert fade in alert-heading" data-alert="alert">
-    <a class="close" data-dismiss="alert" href="#" id='alert-message-warning-close-a'>&#215;</a>
-    ${message}
-  </div>
-</script>
-<script id='alert-message-info' type='text/html'>
-  <div class="alert fade in alert-info" data-alert="alert">
-    <a class="close" data-dismiss="alert" href="#" id='alert-message-info-close-a'>&#215;</a>
-    ${message}
-  </div>
-</script>
-
-<script id='footer-tmpl' type='text/html'>
-  <div class="pull-left">
-    <a target="_blank" href="http://archiva.apache.org/">Apache Archiva&nbsp;-&nbsp;${version}</a>
-  </div>
-  <div class="pull-right">
-    Copyright &#169;  ${copyrightRange}  <a target="_blank" href="http://www.apache.org/">The Apache Software Foundation</a>
-  </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>
-