Author: olamy
Date: Tue Aug 28 09:07:49 2012
New Revision: 1378029
URL: http://svn.apache.org/viewvc?rev=1378029&view=rev
Log:
make browsing artifact content navigable.
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
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/templates/archiva/search.html
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css?rev=1378029&r1=1378028&r2=1378029&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/css/archiva.css
Tue Aug 28 09:07:49 2012
@@ -81,7 +81,10 @@
}
.browse-list-project{
list-style-image: url("../images/folder-saved-search.png");
+}
+.package-list{
+ list-style-image: url("../images/package-x-generic.png");
}
.force-upper-case{
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js?rev=1378029&r1=1378028&r2=1378029&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
Tue Aug 28 09:07:49 2012
@@ -311,10 +311,11 @@ function(jquery,ui,sammy,tmpl) {
var
checkArtifactDetailContent=function(groupId,artifactId,version,repositoryId,tabToActivate,idContentToCheck,contentDisplayFn){
// no need to recalculate all stuff just activate the tab
var htmlId =
idContentToCheck?idContentToCheck:"browse_artifact_detail";
- var htmlIdSelect = $("#main-content #"+htmlId );
+ var htmlIdSelect = $("#main-content").find("#"+htmlId );
if(htmlIdSelect.html()!=null){
if( $.trim(htmlIdSelect.html().length)>0){
$("#main-content #"+tabToActivate).tab('show');
+ $.log("checkArtifactDetailContent " + htmlId + " html not empty
no calculation");
return;
}
}
@@ -365,6 +366,33 @@ function(jquery,ui,sammy,tmpl) {
checkArtifactDetailContent(groupId,artifactId,version,repositoryId,"artifact-details-dependencies-content-a");
});
+
this.get('#artifact-details-files-content/:groupId/:artifactId/:version',function(context){
+
+ var repositoryId = this.params.repositoryId;
+ var groupId= this.params.groupId;
+ var artifactId= this.params.artifactId;
+ var version= this.params.version;
+
+
checkArtifactDetailContent(groupId,artifactId,version,null,"artifact-details-files-content-a","artifact-details-files-content",
+
function(groupId,artifactId,version,artifactVersionDetailViewModel){
+
displayArtifactFilesContent(artifactVersionDetailViewModel);
+ });
+
+ });
+
+
this.get('#artifact-details-files-content~:repositoryId/:groupId/:artifactId/:version',function(context){
+
+ var repositoryId = this.params.repositoryId;
+ var groupId= this.params.groupId;
+ var artifactId= this.params.artifactId;
+ var version= this.params.version;
+
checkArtifactDetailContent(groupId,artifactId,version,repositoryId,"artifact-details-files-content-a","artifact-details-files-content",
+
function(groupId,artifactId,version,artifactVersionDetailViewModel){
+
displayArtifactFilesContent(artifactVersionDetailViewModel);
+ });
+ });
+
+
this.get('#artifact-dependency-tree/:groupId/:artifactId/:version',function(context){
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=1378029&r1=1378028&r2=1378029&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
Tue Aug 28 09:07:49 2012
@@ -341,7 +341,15 @@ define("archiva.search",["jquery","i18n"
return;
}
if
($(e.target).attr("href")=="#artifact-details-files-content") {
- displayArtifactFilesContent(self);
+ //displayArtifactFilesContent(self);
+ var location ="#artifact-details-files-content";
+ if (self.repositoryId){
+ location+="~"+self.repositoryId;
+ }
+
location+="/"+self.groupId+"/"+self.artifactId+"/"+self.version;
+
+ window.sammyArchivaApplication.setLocation(location);
+ return;
}
});
if(afterCallbackFn){
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html?rev=1378029&r1=1378028&r2=1378029&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/search.html
Tue Aug 28 09:07:49 2012
@@ -638,14 +638,11 @@
</table>
</div>
- <div id="artifact-details-dependency-tree-content" class="tab-pane">
- </div>
+ <div id="artifact-details-dependency-tree-content"
class="tab-pane"></div>
- <div id="artifact-details-files-content" class="tab-pane">
- </div>
+ <div id="artifact-details-files-content" class="tab-pane"></div>
- <div id="artifact-details-download-content" class="tab-pane">
- </div>
+ <div id="artifact-details-download-content" class="tab-pane"></div>
<div id="artifact-details-used-by-content" class="tab-pane"></div>
@@ -825,7 +822,7 @@
<script id="artifact-details-files-content_tmpl" type="text/html">
<div class="row-fluid">
<div class="span5">
- <ul id="artifact-content-list-files">
+ <ul id="artifact-content-list-files" class="package-list">
{{each artifactDownloadInfos}}
<li
id="${$value.classifier}:${$value.version}:${$value.packaging}">
<a
href="#">${$value.packaging}:${$value.version} - ${$value.size}</a>
