diff options
| author | Olivier Lamy <olamy@apache.org> | 2012-12-08 15:53:22 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2012-12-08 15:53:22 +0000 |
| commit | 6cd69cb1280d958ea218417b8d0ba5f811806786 (patch) | |
| tree | 64256864bb18116704d901f7ae4e8afa0b30574c /archiva-modules | |
| parent | 12da6dd0b636d23e79e30974a715bc9876f8293b (diff) | |
| download | archiva-6cd69cb1280d958ea218417b8d0ba5f811806786.tar.gz archiva-6cd69cb1280d958ea218417b8d0ba5f811806786.zip | |
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
Diffstat (limited to 'archiva-modules')
2 files changed, 9 insertions, 8 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 d8fab5692..0720c33f6 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 @@ -548,7 +548,8 @@ menu.docs=Documentation #runtime configuration runtime-configuration.title=Archiva Runtime Configuration 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.jdo=Database User Manager +redback.runtime.properties.help.title=Property Description diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html index f02cdfcad..cd1925f53 100644 --- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html +++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/archiva/general-admin.html @@ -930,7 +930,7 @@ ${$.i18n.prop('redback.runtime.ldap.host.label')} </label> <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"/> </div> </div> @@ -939,7 +939,7 @@ ${$.i18n.prop('redback.runtime.ldap.port.label')} </label> <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"/> </div> </div> @@ -948,7 +948,7 @@ ${$.i18n.prop('redback.runtime.ldap.baseDn.label')} </label> <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"/> </div> </div> @@ -966,7 +966,7 @@ ${$.i18n.prop('redback.runtime.ldap.password.label')} </label> <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"/> </div> </div> @@ -975,7 +975,7 @@ ${$.i18n.prop('redback.runtime.ldap.contextFactory.label')} </label> <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"/> </div> </div> @@ -984,7 +984,7 @@ ${$.i18n.prop('redback.runtime.ldap.authenticationMethod.label')} </label> <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"/> </div> </div> @@ -1010,7 +1010,7 @@ <td> {{var key = property.key}} <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')}"> <span class="btn btn-info"><i class="icon-question-sign icon-white"></i></span> </a> |