From: Olivier Lamy <olamy@apache.org>
Date: Fri, 17 Feb 2012 11:35:50 +0000 (+0000)
Subject: fix mimize js/css cleanup on browse
X-Git-Tag: archiva-1.4-M3~1267
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=53f479e409b750b2c0c5c883ddd94b9bf0ba72bd;p=archiva.git

fix mimize js/css cleanup on browse

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1245403 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
index d30463ea4..5545add34 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
@@ -71,7 +71,6 @@ public class DefaultBrowseService
             {
                 namespacesToCollapse.addAll( metadataResolver.resolveRootNamespaces( repositorySession, repoId ) );
             }
-
             for ( String n : namespacesToCollapse )
             {
                 // TODO: check performance of this
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
index 4caaa684a..de07b451a 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
@@ -182,3 +182,6 @@ repository-groups.grid.tab.title=Repository Groups
 roles.bulk.save.confirm=Are you sure to update {0} Role(s)
 roles.bulk.save.confirm.title=Roles Bulk Save
 
+#browse
+browse.repository=Browse Repository
+
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
index a2c25f443..2224e2f7f 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
@@ -557,8 +557,8 @@
               <cssSourceFiles>
                 <cssSourceFile>jquery-ui-1.8.16.custom.css</cssSourceFile>
                 <cssSourceFile>jquery.ui.1.8.16.ie.css</cssSourceFile>
-                <cssSourceFile>bootstrap.css</cssSourceFile>
-                <cssSourceFile>archiva.2.0.1.css</cssSourceFile>
+                <cssSourceFile>bootstrap.2.0.1.css</cssSourceFile>
+                <cssSourceFile>archiva.css</cssSourceFile>
               </cssSourceFiles>
               <cssFinalFile>apache-archiva-${project.version}.css</cssFinalFile>
               <jsSourceDir>js</jsSourceDir>
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
index cdcb8ac43..d3c03ddf0 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
@@ -47,7 +47,7 @@ $(function() {
           $.log("size:"+browseIdEntries.length);
           var browseTopViewModel = new BrowseTopViewModel(browseIdEntries);
 
-          ko.applyBindings(browseTopViewModel,mainContent.find("#browse_result" ).get(0));
+          ko.applyBindings(browseTopViewModel,mainContent.get(0));
         }
     });
   }
@@ -65,10 +65,10 @@ $(function() {
           dataType: 'json',
           success: function(data) {
             var browseIdEntries = mapBrowseIdEntries(data);
-            browseResult.html($("#browse-groups-div-tmpl" ).tmpl());
+            //browseResult.html($("#browse-groups-div-tmpl" ).tmpl());
             var browseGroupsViewModel = new BrowseGroupsViewModel(browseIdEntries,parentGroupdId);
 
-            ko.applyBindings(browseGroupsViewModel,mainContent.find("#browse-groups-div" ).get(0));
+            ko.applyBindings(browseGroupsViewModel,mainContent.get(0));
           }
        });
       }
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
index e065450fc..119b2a49a 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
@@ -20,26 +20,17 @@
 <script id="browse-tmpl" type="text/html">
   <div>
     <div class="page-header">
-      <h2>${$.i18n.prop('browse.groups')}</h2>
+      <h2>${$.i18n.prop('browse.repository')}</h2>
     </div>
   </div>
   <div id="browse_breadcrumb">
-
-  </div>
-  <div id="browse_result" class="well" data-bind='template:{name:"browse-top-tmpl"}'>
-
+    <ul class="breadcrumb">
+      <li><a href="#"><i class="icon-home"/>&nbsp;</a>&nbsp;<span class="divider">/</span></li>
+      <li><a href="#">org</a>&nbsp;<span class="divider">/</span></li>
+    </ul>
   </div>
-</script>
+  <div id="browse_result" class="well" data-bind='template:{name:"browse-groups-tmpl"}'>
 
-<script id="browse-top-tmpl" type="text/html">
-  <div>
-    <ul>
-      {{each(i,browseIdEntry) browseIdEntries}}
-        <li class="browse-list">
-          <a href="#" data-bind="click: function(){displayGroupId(browseIdEntry.name)}">&nbsp;${browseIdEntry.name}</a>
-        </li>
-      {{/each}}
-    </ul>
   </div>
 </script>