Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

some values cannot be required per default if userManager impl is not ldap 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1418696 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-12-08 15:53:22 +00:00
parent 12da6dd0b6
commit 6cd69cb128
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
View File

@ -548,7 +548,8 @@ menu.docs=Documentation
#runtime configuration #runtime configuration
runtime-configuration.title=Archiva Runtime Configuration runtime-configuration.title=Archiva Runtime Configuration
runtime-configuration.usermanager.label=User Manager Implementation runtime-configuration.usermanager.label=User Manager Implementation
archiva-runtime-configuration.updated=Archiva Runtime Configuration updated to {0} archiva-runtime-configuration.updated=Archiva Runtime Configuration updated.
archiva.redback.usermanager.ldap=LDAP User Manager archiva.redback.usermanager.ldap=LDAP User Manager
archiva.redback.usermanager.jdo=Database User Manager archiva.redback.usermanager.jdo=Database User Manager
redback.runtime.properties.help.title=Property Description

14
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html
View File

@ -930,7 +930,7 @@
${$.i18n.prop('redback.runtime.ldap.host.label')} ${$.i18n.prop('redback.runtime.ldap.host.label')}
</label> </label>
<div class="controls"> <div class="controls">
<input type="text" id="ldap-host" name="ldap-host" class="input-xlarge required" <input type="text" id="ldap-host" name="ldap-host" class="input-xlarge"
data-bind="value: archivaRuntimeConfiguration().ldapConfiguration().hostName"/> data-bind="value: archivaRuntimeConfiguration().ldapConfiguration().hostName"/>
</div> </div>
</div> </div>
@ -939,7 +939,7 @@
${$.i18n.prop('redback.runtime.ldap.port.label')} ${$.i18n.prop('redback.runtime.ldap.port.label')}
</label> </label>
<div class="controls"> <div class="controls">
<input type="text" id="ldap-port" name="ldap-port" class="input-large required" <input type="text" id="ldap-port" name="ldap-port" class="input-large"
data-bind="value: archivaRuntimeConfiguration().ldapConfiguration().port"/> data-bind="value: archivaRuntimeConfiguration().ldapConfiguration().port"/>
</div> </div>
</div> </div>
@ -948,7 +948,7 @@
${$.i18n.prop('redback.runtime.ldap.baseDn.label')} ${$.i18n.prop('redback.runtime.ldap.baseDn.label')}
</label> </label>
<div class="controls"> <div class="controls">
<input type="text" id="ldap-baseDn" name="ldap-baseDn" class="input-xxlarge required" <input type="text" id="ldap-baseDn" name="ldap-baseDn" class="input-xxlarge"
data-bind="value: archivaRuntimeConfiguration().ldapConfiguration().baseDn"/> data-bind="value: archivaRuntimeConfiguration().ldapConfiguration().baseDn"/>
</div> </div>
</div> </div>
@ -966,7 +966,7 @@
${$.i18n.prop('redback.runtime.ldap.password.label')} ${$.i18n.prop('redback.runtime.ldap.password.label')}
</label> </label>
<div class="controls"> <div class="controls">
<input type="text" id="ldap-password" name="ldap-password" class="input-xlarge required" <input type="text" id="ldap-password" name="ldap-password" class="input-xlarge"
data-bind="value: archivaRuntimeConfiguration().ldapConfiguration().password"/> data-bind="value: archivaRuntimeConfiguration().ldapConfiguration().password"/>
</div> </div>
</div> </div>
@ -975,7 +975,7 @@
${$.i18n.prop('redback.runtime.ldap.contextFactory.label')} ${$.i18n.prop('redback.runtime.ldap.contextFactory.label')}
</label> </label>
<div class="controls"> <div class="controls">
<input type="text" id="ldap-context-factory" name="ldap-context-factory" class="input-xlarge required" <input type="text" id="ldap-context-factory" name="ldap-context-factory" class="input-xlarge"
data-bind="value: archivaRuntimeConfiguration().ldapConfiguration().contextFactory"/> data-bind="value: archivaRuntimeConfiguration().ldapConfiguration().contextFactory"/>
</div> </div>
</div> </div>
@ -984,7 +984,7 @@
${$.i18n.prop('redback.runtime.ldap.authenticationMethod.label')} ${$.i18n.prop('redback.runtime.ldap.authenticationMethod.label')}
</label> </label>
<div class="controls"> <div class="controls">
<input type="text" id="ldap-authenticationMethod" name="ldap-authenticationMethod" class="input-xlarge required" <input type="text" id="ldap-authenticationMethod" name="ldap-authenticationMethod" class="input-xlarge"
data-bind="value: archivaRuntimeConfiguration().ldapConfiguration().authenticationMethod"/> data-bind="value: archivaRuntimeConfiguration().ldapConfiguration().authenticationMethod"/>
</div> </div>
</div> </div>
@ -1010,7 +1010,7 @@
<td> <td>
{{var key = property.key}} {{var key = property.key}}
<a class="popover-doc" <a class="popover-doc"
data-original-title="${$.i18n.prop(key+'.help.title')}" data-original-title="${$.i18n.prop('redback.runtime.properties.help.title')}"
data-content="${$.i18n.prop(key+'.help.content')}"> data-content="${$.i18n.prop(key+'.help.content')}">
<span class="btn btn-info"><i class="icon-question-sign icon-white"></i></span> <span class="btn btn-info"><i class="icon-question-sign icon-white"></i></span>
</a> </a>