From 3e554184c44d88962365594ecb8e8adff1e7556a Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Fri, 13 Jan 2012 17:00:51 +0000
Subject: [PATCH] start adding various files for repositories management: html
 templates js

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1231182 13f79535-47bb-0310-9956-ffa450edef68
---
 .../archiva/admin/model/beans/AbstractRepository.java      | 2 --
 .../archiva-webapp-js/src/main/webapp/index.html           | 1 +
 .../src/main/webapp/js/archiva/main-tmpl.js                | 5 +++--
 .../archiva-webapp-js/src/main/webapp/js/archiva/main.js   | 7 ++++---
 .../src/main/webapp/js/archiva/templates/menu.html         | 3 +++
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/AbstractRepository.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/AbstractRepository.java
index 7fd190c04..772841d3a 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/AbstractRepository.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/AbstractRepository.java
@@ -34,8 +34,6 @@ public class AbstractRepository
 
     private String layout = "default";
 
-
-
     private String indexDirectory;
 
     public AbstractRepository()
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
index 0f1e97cee..eb5ccde2c 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/index.html
@@ -55,6 +55,7 @@
        .script("jquery.validate.js").wait()
        .script("jquery.json-2.3.min.js").wait()
        .script("archiva/main-tmpl.js").wait()
+       .script("archiva/repositories.js").wait()
        .script("redback/operation.js").wait()
        .script("redback/redback-tmpl.js").wait()
        .script("bootstrap-tabs.js").wait()
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 a7dbda3cf..bdcd037fd 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,8 +17,8 @@
  * under the License.
  */
 require(["text!archiva/templates/menu.html","text!archiva/templates/topbar.html","text!archiva/templates/message.html",
-          "text!archiva/templates/modal.html","text!archiva/templates/grids-generics.html"],
-  function(menu,topbar,message,modal,grids_generics) {
+          "text!archiva/templates/modal.html","text!archiva/templates/grids-generics.html","text!archiva/templates/repositories.html"],
+  function(menu,topbar,message,modal,grids_generics,repositories) {
 
     // template loading
     $.tmpl( menu, $.i18n.map ).appendTo("#html-fragments");
@@ -26,6 +26,7 @@ require(["text!archiva/templates/menu.html","text!archiva/templates/topbar.html"
     $.tmpl( modal, $.i18n.map ).appendTo("#html-fragments");
     $("#html-fragments").append(message);
     $("#html-fragments").append(grids_generics);
+    $("#html-fragments").append(repositories);
     $.log("main-tmpl.js menu loaded");
   }
 );
\ No newline at end of file
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
index f1743db1d..ece51f552 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
@@ -21,9 +21,11 @@ function($) {
 
 $(function() {
 
+  // no cache for ajax queries
+  jQuery.ajaxSetup( {
+    cache: false
+  } );
 
-
-  $.log("main karma");
   customShowError=function(validator, errorMap, errorList) {
     $( "div.clearfix" ).removeClass( "error" );
     $( "span.help-inline" ).remove();
@@ -153,7 +155,6 @@ $(function() {
     }
   });
 
-  $.log("main.js dom ready");
   $('#topbar-menu-container').html($("#topbar-menu"));
   $('#sidebar-content').html($("#main-menu"));
   checkCreateAdminLink();
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/archiva/templates/menu.html
index 3fd59794e..05cc03a35 100644
--- 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/archiva/templates/menu.html
@@ -7,5 +7,8 @@
       <li style="display: none" redback-permissions="{permissions: ['archiva-manage-users']}">
         <a href="#" id="menu-roles-list-a" onclick="displayRolesGrid()">${$.i18n.prop('roles.list')}</a>
       </li>
+      <li style="display: none" redback-permissions="{permissions: ['archiva-manage-configuration']}">
+        <a href="#" id="menu-repositories-list-a" onclick="displayRepositoriesGrid()">${$.i18n.prop('repositories.list')}</a>
+      </li>
     </ul>
   </div>
-- 
2.39.5