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/12/20 16:35:09 UTC
svn commit: r1424535 - in /archiva/trunk/archiva-modules/archiva-web:
archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
Author: olamy
Date: Thu Dec 20 15:35:09 2012
New Revision: 1424535
URL: http://svn.apache.org/viewvc?rev=1424535&view=rev
Log:
more tooltip on form content
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/templates/archiva/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=1424535&r1=1424534&r2=1424535&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 Thu Dec 20 15:35:09 2012
@@ -152,7 +152,7 @@ downloadRemoteIndex=Download Remote Inde
remoteIndexUrl=Remote Index Url
remoteDownloadNetworkProxyId=Proxy for Remote Download Index
downloadRemoteIndexOnStartup=Download Remote Index on Startup
-remoteDownloadTimeout=Download Remote Timeout
+remoteDownloadTimeout=Download Remote Index Timeout
remoterepository.added=Remote Repository added.
remoterepositories.bulk.save.confirm=Are you sure to update {0} Remote Repository(ies)
remoterepositories.bulk.save.confirm.title=Remote Repositories Bulk Save
@@ -165,6 +165,30 @@ remoterepository.delete.confirm=Are you
remoterepository.deleted=Remote repository {0}Â deleted.
remoteRepository.extraParametersEntries=Additionnal url parameters
remoteRepository.extraHeadersEntries=Additionnal Http Headers
+remoteRepository.timeout.help.title=Download Timeout
+remoteRepository.timeout.help.content=Timeout in secondes for downloading files from remote repository.
+remoteRepository.userName.help.title=Username
+remoteRepository.userName.help.content=If connecting to this repository need a username
+remoteRepository.password.help.title=Password
+remoteRepository.password.help.content=If connecting to this repository need a password
+remoteRepository.downloadRemoteIndex.help.title=Download Remote Index
+remoteRepository.downloadRemoteIndex.help.content=To activate Download Remote Index
+remoteRepository.remoteIndexUrl.help.title=Remote Index URL
+remoteRepository.remoteIndexUrl.help.content=URL of the Remote Index can full or relative to the repository URL
+remoteRepository.indexDirectory.help.title=Index Directory
+remoteRepository.indexDirectory.help.content=Directory to store remote Index can be full path or relative to the repository path
+remoteRepository.remoteDownloadTimeout.help.title=Remote Download Index Timeout
+remoteRepository.remoteDownloadTimeout.help.content=Timeout in secondes to download Remote Index.
+remoteRepository.remoteDownloadNetworkProxyId.help.title=Proxy ID
+remoteRepository.remoteDownloadNetworkProxyId.help.content=Proxy to User for downloading remote Index
+remoteRepository.description.help.title=Description
+remoteRepository.description.help.content=Free text to describe your repository
+remoteRepository.extraParametersEntries.help.title=Extra Url Parameters
+remoteRepository.extraParametersEntries.help.content=Key/Value pair you want to add to the url when asking the remote repository.
+remoteRepository.extraHeadersEntries.help.title=Extra HTTP Headers
+remoteRepository.extraHeadersEntries.help.content=Key/Value pair HTTP headers you want to add when asking the remote repository.
+
+
#network proxy
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html?rev=1424535&r1=1424534&r2=1424535&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/repositories.html Thu Dec 20 15:35:09 2012
@@ -577,14 +577,23 @@
<div class="controls">
<input type="text" class="input-xlarge" id="userName" name="userName" size="50"
data-bind="value: remoteRepository.userName"/>
+ <a class="btn btn-warning btn-mini popover-doc" id="remoteRepository-userName-info-button"
+ data-original-title="${$.i18n.prop('remoteRepository.userName.help.title')}"
+ data-content="${$.i18n.prop('remoteRepository.userName.help.content')}">
+ <i class="icon-question-sign icon-white"></i>
+ </a>
</div>
</div>
<div class="control-group">
<label class="control-label" for="password">${$.i18n.prop('password')}</label>
-
<div class="controls">
<input type="password" class="input-xlarge" id="password" name="password" size="50"
data-bind="value: remoteRepository.password"/>
+ <a class="btn btn-warning btn-mini popover-doc" id="remoteRepository-password-info-button"
+ data-original-title="${$.i18n.prop('remoteRepository.password.help.title')}"
+ data-content="${$.i18n.prop('remoteRepository.password.help.content')}">
+ <i class="icon-question-sign icon-white"></i>
+ </a>
</div>
</div>
<div class="control-group">
@@ -593,6 +602,11 @@
<div class="controls">
<input type="text" id="timeout" class="digits" name="daysOlder" size="5"
data-bind="value: remoteRepository.timeout"/>
+ <a class="btn btn-warning btn-mini popover-doc" id="remoteRepository-timeout-info-button"
+ data-original-title="${$.i18n.prop('remoteRepository.timeout.help.title')}"
+ data-content="${$.i18n.prop('remoteRepository.timeout.help.content')}">
+ <i class="icon-question-sign icon-white"></i>
+ </a>
</div>
</div>
@@ -610,6 +624,11 @@
<div class="controls">
<input type="checkbox" id="downloadRemoteIndex" name="downloadRemoteIndex" size="5"
data-bind="checked: remoteRepository.downloadRemoteIndex"/>
+ <a class="btn btn-warning btn-mini popover-doc" id="remoteRepository-downloadRemoteIndex-info-button"
+ data-original-title="${$.i18n.prop('remoteRepository.downloadRemoteIndex.help.title')}"
+ data-content="${$.i18n.prop('remoteRepository.downloadRemoteIndex.help.content')}">
+ <i class="icon-question-sign icon-white"></i>
+ </a>
</div>
</div>
@@ -619,6 +638,11 @@
<div class="controls">
<input type="text" class="input-xxlarge" id="remoteIndexUrl" name="remoteIndexUrl" size="5"
data-bind="value: remoteRepository.remoteIndexUrl"/>
+ <a class="btn btn-warning btn-mini popover-doc" id="remoteRepository-remoteIndexUrl-info-button"
+ data-original-title="${$.i18n.prop('remoteRepository.remoteIndexUrl.help.title')}"
+ data-content="${$.i18n.prop('remoteRepository.remoteIndexUrl.help.content')}">
+ <i class="icon-question-sign icon-white"></i>
+ </a>
</div>
</div>
<div class="control-group">
@@ -640,6 +664,11 @@
<div class="controls">
<input type="text" class="input-xlarge" id="indexDirectory" name="indexDirectory" size="50"
data-bind="value: remoteRepository.indexDirectory"/>
+ <a class="btn btn-warning btn-mini popover-doc" id="remoteRepository-indexDirectory-info-button"
+ data-original-title="${$.i18n.prop('remoteRepository.indexDirectory.help.title')}"
+ data-content="${$.i18n.prop('remoteRepository.indexDirectory.help.content')}">
+ <i class="icon-question-sign icon-white"></i>
+ </a>
</div>
</div>
<div class="control-group">
@@ -648,6 +677,11 @@
<div class="controls">
<input type="text" id="remoteDownloadTimeout" class="digits" name="remoteDownloadTimeout" size="5"
data-bind="value: remoteRepository.remoteDownloadTimeout"/>
+ <a class="btn btn-warning btn-mini popover-doc" id="remoteRepository-remoteDownloadTimeout-info-button"
+ data-original-title="${$.i18n.prop('remoteRepository.remoteDownloadTimeout.help.title')}"
+ data-content="${$.i18n.prop('remoteRepository.remoteDownloadTimeout.help.content')}">
+ <i class="icon-question-sign icon-white"></i>
+ </a>
</div>
</div>
@@ -658,6 +692,11 @@
<div class="controls">
<select id="remoteDownloadNetworkProxyId"
data-bind="options: networkProxies, optionsText: 'id',optionsValue:'id', value: remoteRepository.remoteDownloadNetworkProxyId, optionsCaption: 'Choose...'"></select>
+ <a class="btn btn-warning btn-mini popover-doc" id="remoteRepository-remoteDownloadNetworkProxyId-info-button"
+ data-original-title="${$.i18n.prop('remoteRepository.remoteDownloadNetworkProxyId.help.title')}"
+ data-content="${$.i18n.prop('remoteRepository.remoteDownloadNetworkProxyId.help.content')}">
+ <i class="icon-question-sign icon-white"></i>
+ </a>
</div>
</div>
@@ -668,22 +707,37 @@
<div class="controls">
<input type="checkbox" id="downloadRemoteIndexOnStartup" name="downloadRemoteIndexOnStartup"
data-bind="checked: remoteRepository.downloadRemoteIndexOnStartup"/>
+ <a class="btn btn-warning btn-mini popover-doc" id="remoteRepository-remoteDownloadNetworkProxyId-info-button"
+ data-original-title="${$.i18n.prop('remoteRepository.remoteDownloadNetworkProxyId.help.title')}"
+ data-content="${$.i18n.prop('remoteRepository.remoteDownloadNetworkProxyId.help.content')}">
+ <i class="icon-question-sign icon-white"></i>
+ </a>
</div>
</div>
<div class="control-group">
- <label class="control-label" for="daysOlder">${$.i18n.prop('description')}</label>
+ <label class="control-label" for="description">${$.i18n.prop('description')}</label>
<div class="controls">
<textarea rows="3" id="description" name="description"
data-bind="value: remoteRepository.description"></textarea>
+ <a class="btn btn-warning btn-mini popover-doc" id="remoteRepository-description-info-button"
+ data-original-title="${$.i18n.prop('remoteRepository.description.help.title')}"
+ data-content="${$.i18n.prop('remoteRepository.description.help.content')}">
+ <i class="icon-question-sign icon-white"></i>
+ </a>
</div>
</div>
<div class="row-fluid">
<div class="control-group span6">
- <h4>${$.i18n.prop('remoteRepository.extraParametersEntries')}</h4>
-
+ <h4>${$.i18n.prop('remoteRepository.extraParametersEntries')}
+ </h4>
+ <a class="btn btn-warning btn-mini popover-doc" id="remoteRepository-extraParametersEntries-info-button"
+ data-original-title="${$.i18n.prop('remoteRepository.extraParametersEntries.help.title')}"
+ data-content="${$.i18n.prop('remoteRepository.extraParametersEntries.help.content')}">
+ <i class="icon-question-sign icon-white"></i>
+ </a>
<div id="extra-parameters-error"></div>
<table class="table">
<thead>
@@ -707,8 +761,13 @@
<div class="row-fluid">
<div class="control-group span6">
- <h4>${$.i18n.prop('remoteRepository.extraHeadersEntries')}</h4>
-
+ <h4>${$.i18n.prop('remoteRepository.extraHeadersEntries')}
+ </h4>
+ <a class="btn btn-warning btn-mini popover-doc" id="remoteRepository-extraHeadersEntries-info-button"
+ data-original-title="${$.i18n.prop('remoteRepository.extraHeadersEntries.help.title')}"
+ data-content="${$.i18n.prop('remoteRepository.extraHeadersEntries.help.content')}">
+ <i class="icon-question-sign icon-white"></i>
+ </a>
<div id="extra-headers-error"></div>
<table class="table">
<thead>