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 d30463ea451019cc68450b683a57653032d7586c..5545add340abcf945cd686a1ed2ed3a78fc4021f 100644 (file)
--- 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 4caaa684ac64ed1f4db3e5c0cb87c1ef042c37af..de07b451a971e62193a228eb30df0b41c668c74a 100644 (file)
--- 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 a2c25f4436239807b4d853e7d3fcc7a9720b20ac..2224e2f7fcfe6106e8bd6ff7dbdd418630226224 100644 (file)
--- 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 cdcb8ac43094af87c61d706834d0071c7dca9b10..d3c03ddf0e3a50d1fac2deba1e5c0bbc6017b636 100644 (file)
--- 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 e065450fc14654b09389a328f3f980b9d73bdf9d..119b2a49a4efbeb1b89d5af84762ec04780ce06f 100644 (file)
--- 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>