summaryrefslogtreecommitdiffstats
path: root/archiva-modules
diff options
context:
space:
mode:
authorEric Barboni <skygo@apache.org>2014-10-03 02:05:01 +0200
committerEric Barboni <skygo@apache.org>2014-10-03 02:05:01 +0200
commit70acb56d0c3a50835bf98f5c83c5793e8459cadd (patch)
tree13a4622fdf25bb7efb39f63cdb84236c19c03a38 /archiva-modules
parent25db694b6f84af2698abf768a6635f43e74208ea (diff)
downloadarchiva-70acb56d0c3a50835bf98f5c83c5793e8459cadd.tar.gz
archiva-70acb56d0c3a50835bf98f5c83c5793e8459cadd.zip
MRM-770 Related. Display classifier (use table because of messy alignment with lot of information)
Diffstat (limited to 'archiva-modules')
-rw-r--r--archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties4
-rw-r--r--archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/search.html70
2 files changed, 46 insertions, 28 deletions
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 783fc4435..6609be99d 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
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 f65af0ecb..c0a4529bd 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>
- &nbsp;
- <a href="${row.url}">
- <img src="images/drive-removable-media-16-16.png" title="${$.i18n.prop('browse.artifact.content.download.tooltip')}"/>
- </a>
- &nbsp;
- <span class="text-info">${row.packaging}:${row.version}&nbsp;-&nbsp;${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>
- &nbsp;
- <span class="text-info">${row.packaging}:${row.version}&nbsp;-&nbsp;${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>&nbsp;</th>
+ {{if deleteKarma}}<th>&nbsp;</th>{{/if}}
+ <th>&nbsp;</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>&nbsp;</td>
+ {{/if}}
+ <td>${row.size}</td>
+ </tr>
+ {{/each}}
+ </tbody>
+ </table>
</div>
<div class="span7">
<div id="artifact_content_tree">