Author: olamy
Date: Fri Nov 23 09:34:25 2012
New Revision: 1412797
URL: http://svn.apache.org/viewvc?rev=1412797&view=rev
Log:
[MRM-1708] When using LDAP, users can still edit their details upon login.
finish ui part.
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/login.html
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/user-edit.html
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js?rev=1412797&r1=1412796&r2=1412797&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
Fri Nov 23 09:34:25 2012
@@ -693,7 +693,9 @@ function(jquery,utils,i18n,jqueryValidat
var editUserDetailViewModel=new EditUserDetailViewModel(currentUser);
ko.applyBindings(editUserDetailViewModel,$("#modal-user-edit-content").get(0));
-
//$("#modal-user-edit-content").html($("#modal-user-edit-tmpl").tmpl({user:
currentUser} ));
+ if(currentUser.readOnly){
+ $("#modal-user-edit-footer" ).hide();
+ }
window.modalEditUserBox.modal('show');
$("#user-edit-form").validate({
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/login.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/login.html?rev=1412797&r1=1412796&r2=1412797&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/login.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/login.html
Fri Nov 23 09:34:25 2012
@@ -138,51 +138,5 @@
</div>
</div>
-<script type="text/html" id="modal-user-edit-tmpl">
- <form id="user-edit-form" class="form-horizontal">
- <div id="modal-user-edit-err-message" class="alert-message error"
style="display:none"></div>
- <fieldset>
- <div class="control-group">
- <label class="control-label"
for="username">${$.i18n.prop('username')}</label>
- <div class="controls" id="username-div">
- <span class="uneditable-input" data-bind="text:
user.username"></span>
- </div>
- </div>
- <div class="control-group">
- <label class="control-label"
for="fullname">${$.i18n.prop('full.name')}</label>
- <div class="controls">
- <input type="text" id="fullname" name="fullname" size="30"
class="required" data-bind="value: user.fullName"/>
- </div>
- </div>
- <div class="control-group">
- <label class="control-label"
for="email">${$.i18n.prop('email.address')}</label>
- <div class="controls">
- <input type="text" id="email" name="email" size="30"
class="required email" data-bind="value: user.email"/>
- </div>
- </div>
- <div class="control-group" id="user-edit-form-current-password-div">
- <label class="control-label"
for="userEditFormCurrentPassword">${$.i18n.prop('password.existing')}</label>
- <div class="controls">
- <input type="password" id="userEditFormCurrentPassword"
name="userEditFormCurrentPassword" class="required" value=""/>
- </div>
- </div>
-
- <div class="control-group">
- <label class="control-label"
for="userEditFormNewPassword">${$.i18n.prop('password.new')}</label>
- <div class="controls">
- <input type="password" id="userEditFormNewPassword"
name="userEditFormNewPassword" class="" value=""/>
- </div>
- </div>
-
- <div class="control-group">
- <label class="control-label"
for="userEditFormNewPasswordConfirm">${$.i18n.prop('password.new.confirm')}</label>
- <div class="controls">
- <input type="password" id="userEditFormNewPasswordConfirm"
name="userEditFormNewPasswordConfirm" class="" value=""/>
- </div>
- </div>
- </fieldset>
- </form>
-
-</script>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/user-edit.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/user-edit.html?rev=1412797&r1=1412796&r2=1412797&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/user-edit.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/templates/redback/user-edit.html
Fri Nov 23 09:34:25 2012
@@ -480,5 +480,59 @@
</script>
+<script type="text/html" id="modal-user-edit-tmpl">
+ <form id="user-edit-form" class="form-horizontal">
+ <div id="modal-user-edit-err-message" class="alert-message error"
style="display:none"></div>
+ <fieldset>
+ <div class="control-group">
+ <label class="control-label"
for="username">${$.i18n.prop('username')}</label>
+ <div class="controls" id="username-div">
+ <span class="uneditable-input" data-bind="text:
user.username"></span>
+ </div>
+ </div>
+ <div class="control-group">
+ <label class="control-label"
for="fullname">${$.i18n.prop('full.name')}</label>
+ <div class="controls">
+ {{if user.readOnly}}
+ <span class="uneditable-input" data-bind="text:
user.fullName"></span>
+ {{else}}
+ <input type="text" id="fullname" name="fullname" size="30"
class="required" data-bind="value: user.fullName"/>
+ {{/if}}
+ </div>
+ </div>
+ <div class="control-group">
+ <label class="control-label"
for="email">${$.i18n.prop('email.address')}</label>
+ <div class="controls">
+ {{if user.readOnly}}
+ <span class="uneditable-input" data-bind="text:
user.email"></span>
+ {{else}}
+ <input type="text" id="email" name="email" size="30"
class="required email" data-bind="value: user.email"/>
+ {{/if}}
+ </div>
+ </div>
+ <div class="control-group" id="user-edit-form-current-password-div">
+ <label class="control-label"
for="userEditFormCurrentPassword">${$.i18n.prop('password.existing')}</label>
+ <div class="controls">
+ <input type="password" id="userEditFormCurrentPassword"
name="userEditFormCurrentPassword" class="required" value=""/>
+ </div>
+ </div>
+
+ <div class="control-group">
+ <label class="control-label"
for="userEditFormNewPassword">${$.i18n.prop('password.new')}</label>
+ <div class="controls">
+ <input type="password" id="userEditFormNewPassword"
name="userEditFormNewPassword" class="" value=""/>
+ </div>
+ </div>
+
+ <div class="control-group">
+ <label class="control-label"
for="userEditFormNewPasswordConfirm">${$.i18n.prop('password.new.confirm')}</label>
+ <div class="controls">
+ <input type="password" id="userEditFormNewPasswordConfirm"
name="userEditFormNewPasswordConfirm" class="" value=""/>
+ </div>
+ </div>
+ </fieldset>
+ </form>
+
+</script>
