Author: olamy
Date: Fri Feb 10 10:21:51 2012
New Revision: 1242725
URL: http://svn.apache.org/viewvc?rev=1242725&view=rev
Log:
add missing i18n and fix popover title as attribute has changed in bootstrap 2.0
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/proxy-connectors.js
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/proxy-connectors.html
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=1242725&r1=1242724&r2=1242725&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 10 10:21:51 2012
@@ -91,10 +91,6 @@ remoteDownloadNetworkProxyId=Proxy for R
downloadRemoteIndexOnStartup=Download Remote Index on Startup
remoteDownloadTimeout=Download Remote Timeout
-#proxy connector
-proxy-connectors.grid.remoterepo.settings.popover.title=Settings
-proxy-connectors.remoterepo.settings.networkproxy=Network Proxy
-
#network proxy
networkproxy.updated=Network Proxy " {0} " updated.
networkproxy.added=Network Proxy " {0} " added.
@@ -140,4 +136,8 @@ proxy-connectors.grid.remoterepo.title=R
proxy-connectors.grid.managedrepo.title=Managed Repository
proxy-connector.blacklist=Black List
proxy-connector.whitelist=White List
+proxyconnector.removed=ProxyConnector removed.
+proxyconnector.added=ProxyConnector added.
+proxy-connectors.grid.remoterepo.settings.popover.title=Proxy Connector
Settings
+proxy-connectors.remoterepo.settings.networkproxy=Network Proxy
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js?rev=1242725&r1=1242724&r2=1242725&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
Fri Feb 10 10:21:51 2012
@@ -301,8 +301,7 @@ $(function() {
targetImg.popover(
{
placement: "left",
- html: true,
- title: "popover-title"
+ html: true
}
);
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=1242725&r1=1242724&r2=1242725&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
Fri Feb 10 10:21:51 2012
@@ -433,8 +433,7 @@ $(function() {
mainContent.find("#managedrepository-stats-img-"+curRepo.id()).popover(
{
placement: "left",
- html: true,
- title: "popover-title"
+ html: true
}
);
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html?rev=1242725&r1=1242724&r2=1242725&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
Fri Feb 10 10:21:51 2012
@@ -64,7 +64,7 @@
<td>${row.sourceRepoId()}</td>
<td>${row.targetRepoId()}-${row.order()}</td>
<td>
- <a
popover-title="${$.i18n.prop('proxy-connectors.grid.remoterepo.settings.popover.title')}"
+ <a
data-original-title="${$.i18n.prop('proxy-connectors.grid.remoterepo.settings.popover.title')}"
data-bind="event: { mouseover: function(){
showSettings(row)},},click: function(){ editProxyConnector(row)}"
id="proxy-connectors-grid-remoterepo-settings-edit-${row.sourceRepoId()}-${row.targetRepoId()}"
href="#">
${$.i18n.prop('edit')}
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=1242725&r1=1242724&r2=1242725&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
Fri Feb 10 10:21:51 2012
@@ -134,7 +134,7 @@
{{/if}}
<td><a href="#" data-bind="click: function(){ showPomSnippet(row)
}">${$.i18n.prop('managedrepository.pomsnippet')}</a></td>
<td id="managedrepository-stats-${row.id()}">
- <img src="images/utilities-system-monitor.png"
popover-title="${$.i18n.prop('managedrepository.stats')}"
+ <img src="images/utilities-system-monitor.png"
data-original-title="${$.i18n.prop('managedrepository.stats')}"
data-bind="event: { mouseover: function(){ showStats(row)
}, mouseout: function(){ hideStats(row) },}"
id="managedrepository-stats-img-${row.id()}"/>
</td>
