You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by sk...@apache.org on 2014/10/03 02:11:15 UTC
[1/2] git commit: ignore netbeans ide file
Repository: archiva
Updated Branches:
refs/heads/master cf16df693 -> 70acb56d0
ignore netbeans ide file
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/25db694b
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/25db694b
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/25db694b
Branch: refs/heads/master
Commit: 25db694b6f84af2698abf768a6635f43e74208ea
Parents: cf16df6
Author: Eric Barboni <sk...@apache.org>
Authored: Thu Oct 2 23:31:52 2014 +0200
Committer: Eric Barboni <sk...@apache.org>
Committed: Thu Oct 2 23:31:52 2014 +0200
----------------------------------------------------------------------
.gitignore | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/25db694b/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 926a9d4..0cf0b51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,6 @@ build
.project
.classpath
.settings/
+
+#netbeans file
+nbactions.xml
\ No newline at end of file
[2/2] git commit: MRM-770 Related. Display classifier (use table
because of messy alignment with lot of information)
Posted by sk...@apache.org.
MRM-770 Related. Display classifier (use table because of messy alignment with lot of information)
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/70acb56d
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/70acb56d
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/70acb56d
Branch: refs/heads/master
Commit: 70acb56d0c3a50835bf98f5c83c5793e8459cadd
Parents: 25db694
Author: Eric Barboni <sk...@apache.org>
Authored: Fri Oct 3 02:05:01 2014 +0200
Committer: Eric Barboni <sk...@apache.org>
Committed: Fri Oct 3 02:05:01 2014 +0200
----------------------------------------------------------------------
.../org/apache/archiva/i18n/default.properties | 4 +-
.../webapp/js/templates/archiva/search.html | 70 ++++++++++++--------
2 files changed, 46 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/70acb56d/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
----------------------------------------------------------------------
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 783fc44..6609be9 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
@@ -429,8 +429,8 @@ repository.selected.missing=You must select a repository
browse.artifact.content.view.tooltip=View Artifact Content
browse.artifact.content.delete.tooltip=Delete Artifact
browse.artifact.content.download.tooltip=Download Artifact
-
-
+browse.artifact.size=Size
+browse.artifact.classifier=Classifier
#login
login.username.placehoder=Username
login.password.placehoder=Password
http://git-wip-us.apache.org/repos/asf/archiva/blob/70acb56d/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/search.html
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/search.html b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/search.html
index f65af0e..c0a4529 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/search.html
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/search.html
@@ -953,32 +953,50 @@
<script id="artifact-details-download-content_tmpl" type="text/html">
<div class="row-fluid">
- <div class="span5">
- <ul id="artifact-download-list-files" class="package-list">
- {{each(i, row) artifacts()}}
- <li>
- <img src="images/system-search-16-16.png" class="cursor-hand" id="${row.classifier}:${row.version}:${row.packaging}"
- title="${$.i18n.prop('browse.artifact.content.view.tooltip')}"/>
- {{if deleteKarma}}
- <a href="#" data-bind="click: function(){deleteArtifact(row)}">
- <img src="images/trash.png" title="${$.i18n.prop('browse.artifact.content.delete.tooltip')}"/>
- </a>
-
- <a href="${row.url}">
- <img src="images/drive-removable-media-16-16.png" title="${$.i18n.prop('browse.artifact.content.download.tooltip')}"/>
- </a>
-
- <span class="text-info">${row.packaging}:${row.version} - ${row.size}</span>
- {{else}}
- <a href="${row.url}">
- <img src="images/drive-removable-media-16-16.png" title="${$.i18n.prop('browse.artifact.content.download.tooltip')}"/>
- </a>
-
- <span class="text-info">${row.packaging}:${row.version} - ${row.size}</span>
- {{/if}}
- </li>
- {{/each}}
- </ul>
+ <div class="span12">
+ <table id="artifact-download-list-files" class="table table-bordered table-striped">
+ <thead>
+ <tr>
+ <th> </th>
+ {{if deleteKarma}}<th> </th>{{/if}}
+ <th> </th>
+ <th>${$.i18n.prop('browse.artifact.version')}</th>
+ <th>${$.i18n.prop('browse.artifact.packaging')}</th>
+ <th>${$.i18n.prop('browse.artifact.classifier')}</th>
+ <th>${$.i18n.prop('browse.artifact.size')}</th>
+ </tr>
+ </thead>
+ <tbody>
+ {{each(i, row) artifacts()}}
+ <tr>
+ <td>
+ <img src="images/system-search-16-16.png" class="cursor-hand" id="${row.classifier}:${row.version}:${row.packaging}"
+ title="${$.i18n.prop('browse.artifact.content.view.tooltip')}"/>
+ </td>
+ {{if deleteKarma}}
+ <td>
+ <a href="#" data-bind="click: function(){deleteArtifact(row)}">
+ <img src="images/trash.png" title="${$.i18n.prop('browse.artifact.content.delete.tooltip')}"/>
+ </a>
+ </td>
+ {{/if}}
+ <td>
+ <a href="${row.url}">
+ <img src="images/drive-removable-media-16-16.png" title="${$.i18n.prop('browse.artifact.content.download.tooltip')}"/>
+ </a>
+ </td>
+ <td>${row.version}</td>
+ <td>${row.packaging}</td>
+ {{if row.classifier }}
+ <td>${row.classifier}</td>
+ {{else}}
+ <td> </td>
+ {{/if}}
+ <td>${row.size}</td>
+ </tr>
+ {{/each}}
+ </tbody>
+ </table>
</div>
<div class="span7">
<div id="artifact_content_tree">