From 53f479e409b750b2c0c5c883ddd94b9bf0ba72bd Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 17 Feb 2012 11:35:50 +0000 Subject: [PATCH] fix mimize js/css cleanup on browse git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1245403 13f79535-47bb-0310-9956-ffa450edef68 --- .../rest/services/DefaultBrowseService.java | 1 - .../apache/archiva/i18n/default.properties | 3 +++ .../archiva-web/archiva-webapp-js/pom.xml | 4 ++-- .../src/main/webapp/js/archiva/search.js | 6 +++--- .../webapp/js/archiva/templates/search.html | 21 ++++++------------- 5 files changed, 14 insertions(+), 21 deletions(-) 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 @@ jquery-ui-1.8.16.custom.css jquery.ui.1.8.16.ie.css - bootstrap.css - archiva.2.0.1.css + bootstrap.2.0.1.css + archiva.css apache-archiva-${project.version}.css js 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 @@ +
- -- 2.39.5