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/01/24 10:18:25 UTC
svn commit: r1235178 - in /archiva/trunk/archiva-modules/archiva-web:
archiva-web-common/src/main/resources/org/apache/archiva/i18n/
archiva-webapp-js/src/main/webapp/js/archiva/
archiva-webapp-js/src/main/webapp/js/archiva/templates/
Author: olamy
Date: Tue Jan 24 09:18:24 2012
New Revision: 1235178
URL: http://svn.apache.org/viewvc?rev=1235178&view=rev
Log:
[MRM-1574] remote repositories grid view
display url too.
Modified:
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/src/main/webapp/js/archiva/repositories.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
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=1235178&r1=1235177&r2=1235178&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 Tue Jan 24 09:18:24 2012
@@ -39,4 +39,8 @@ managedrepository.scanned=Managed Reposi
managedrepository.stats.endTime=Last Scanned
managedrepository.stats.duration=Duration
managedrepository.stats.totalFileCount=Total File Count
-managedrepository.stats.newFileCount=New Files Found
\ No newline at end of file
+managedrepository.stats.newFileCount=New Files Found
+
+
+# remote repositories screen
+remoterepository.downloadremoteindex.now=Download Remote Index Now
\ No newline at end of file
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js?rev=1235178&r1=1235177&r2=1235178&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js Tue Jan 24 09:18:24 2012
@@ -535,8 +535,8 @@ $(function() {
$.log("removeRemoteRepository");
}
- downloadRemoteIndex=function(remoteRepository){
- $.log("downloadRemoteIndex");
+ scheduleDownloadRemoteIndex=function(remoteRepository){
+ $.log("scheduleDownloadRemoteIndex");
}
}
@@ -610,6 +610,10 @@ $(function() {
rowText: "name"
},
{
+ headerText: $.i18n.prop('url'),
+ rowText: "url"
+ },
+ {
headerText: $.i18n.prop('type'),
rowText: "getTypeLabel",
// FIXME i18n
@@ -625,7 +629,6 @@ $(function() {
$("#main-content #remote-repositories-pills").pills();
$("#remote-repositories-view").addClass("active");
removeMediumSpinnerImg("#main-content #remote-repositories-content");
- //activateManagedRepositoriesGridTab();
}
}
);
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html?rev=1235178&r1=1235177&r2=1235178&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/repositories.html Tue Jan 24 09:18:24 2012
@@ -309,16 +309,17 @@
{{each(j, columnDefinition) columns}}
<td>${ typeof columnDefinition.rowText == 'function' ? columnDefinition.rowText(row) : row[columnDefinition.rowText] }</td>
{{/each}}
- <td><a href="#" data-bind="click: function(){ editRemoteRepository(row) }">${$.i18n.prop('edit')}</a></td>
+ <td>
+ <a href="#" data-bind="click: function(){ editRemoteRepository(row) }">${$.i18n.prop('edit')}</a>
+ </td>
<td>
<a href="#" data-bind="click: function(){ removeRemoteRepository(row) }">
<img src="images/edit-cut.png" title="${$.i18n.prop('delete')}"/>
</a>
</td>
<td>
- <a href="#" data-bind="click: function(){ downloadRemoteIndex(row) }">
- <img src="images/view-refresh.png" data-bind="click: function(){ downloadRemoteIndex(row) }"
- title="${$.i18n.prop('remoterepository.downloadremoteindex.now')}"/>
+ <a href="#" data-bind="click: function(){ scheduleDownloadRemoteIndex(row) }">
+ <img src="images/view-refresh.png" title="${$.i18n.prop('remoterepository.downloadremoteindex.now')}"/>
</a>
</td>
</tr>