You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/02/17 12:35:51 UTC
svn commit: r1245403 - in /archiva/trunk/archiva-modules/archiva-web:
archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/
archiva-web-common/src/main/resources/org/apache/archiva/i18n/
archiva-webapp-js/ archiva-webapp-js...
Author: olamy
Date: Fri Feb 17 11:35:50 2012
New Revision: 1245403
URL: http://svn.apache.org/viewvc?rev=1245403&view=rev
Log:
fix mimize js/css cleanup on browse
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java?rev=1245403&r1=1245402&r2=1245403&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultBrowseService.java Fri Feb 17 11:35:50 2012
@@ -71,7 +71,6 @@ public class DefaultBrowseService
{
namespacesToCollapse.addAll( metadataResolver.resolveRootNamespaces( repositorySession, repoId ) );
}
-
for ( String n : namespacesToCollapse )
{
// TODO: check performance of this
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties?rev=1245403&r1=1245402&r2=1245403&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties Fri Feb 17 11:35:50 2012
@@ -182,3 +182,6 @@ repository-groups.grid.tab.title=Reposit
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
+
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml?rev=1245403&r1=1245402&r2=1245403&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml Fri Feb 17 11:35:50 2012
@@ -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>
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js?rev=1245403&r1=1245402&r2=1245403&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js Fri Feb 17 11:35:50 2012
@@ -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));
}
});
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html?rev=1245403&r1=1245402&r2=1245403&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html Fri Feb 17 11:35:50 2012
@@ -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"/> </a> <span class="divider">/</span></li>
+ <li><a href="#">org</a> <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)}"> ${browseIdEntry.name}</a>
- </li>
- {{/each}}
- </ul>
</div>
</script>