diff --git a/rhodecode/templates/admin/users/user_edit.html b/rhodecode/templates/admin/users/user_edit.html --- a/rhodecode/templates/admin/users/user_edit.html +++ b/rhodecode/templates/admin/users/user_edit.html @@ -2,7 +2,10 @@ <%inherit file="/base/base.html"/> <%def name="title()"> - ${_('Edit user')} ${c.user.username} · ${c.rhodecode_name} + ${_('%s user settings') % c.user.username} + %if c.rhodecode_name: + · ${c.rhodecode_name} + %endif <%def name="breadcrumbs_links()"> @@ -10,7 +13,7 @@ » ${h.link_to(_('Users'),h.url('users'))} » - ${_('Edit %s') % c.user.username} + ${c.user.username} <%def name="page_nav()"> @@ -18,235 +21,36 @@ <%def name="main()"> -
- +
${self.breadcrumbs()}
- - ${h.form(url('update_user', id=c.user.user_id),method='put')} -
-
-
-
gravatar
-

- %if c.use_gravatar: - ${_('Change your avatar at')} gravatar.com -
${_('Using')} ${c.user.email} - %else: -
${c.user.email} - %endif + + ##main +

+
    +
  • +
    +
    + gravatar +
    +
    + ${c.user.username} +
    -
-
-
- ${c.user.api_key} -
-
- ##show current ip just if we show ourself - %if c.rhodecode_user.username == c.user.username: -
-
- ${c.perm_user.ip_addr or "?"} -
-
- %endif -
-
-
- -
-
- %if c.ldap_dn: - ${h.text('username',class_='medium disabled', readonly="readonly")} - %else: - ${h.text('username',class_='medium')} - %endif: -
-
- -
-
- -
-
- ${h.text('ldap_dn',class_='medium disabled',readonly="readonly")} -
-
- -
-
- -
-
- ${h.password('new_password',class_='medium',autocomplete="off")} -
-
- -
-
- -
-
- ${h.password('password_confirmation',class_="medium",autocomplete="off")} -
-
- -
-
- -
-
- ${h.text('firstname',class_='medium')} -
-
- -
-
- -
-
- ${h.text('lastname',class_='medium')} -
-
- -
-
- -
-
- ${h.text('email',class_='medium')} -
-
- -
-
- -
-
- ${h.checkbox('active',value=True)} -
-
- -
-
- -
-
- ${h.checkbox('admin',value=True)} -
-
-
- ${h.submit('save',_('Save'),class_="ui-btn large")} - ${h.reset('reset',_('Reset'),class_="ui-btn large")} -
-
-
- ${h.end_form()} -
-
- -
-
${_('Permissions')}
-
- <%namespace name="dpb" file="/base/default_perms_box.html"/> - ${dpb.default_perms_box(url('user_perm', id=c.user.user_id))} - - ## permissions overview - <%namespace name="p" file="/base/perms_summary.html"/> - ${p.perms_summary(c.perm_user.permissions, show_all=True)} - -
-
- -
-
${_('Email addresses')}
+ +
  • ${_('Profile')}
    • +
  • ${_('API keys')}
    • +
  • ${_('Advanced')}
    • +
  • ${_('Default permissions')}
    • +
  • ${_('Emails')}
    • +
  • ${_('Ip whitelist')}
    • +
    -
    - - %for em in c.user_email_map: - - - - - - %endfor -
    gravatar
    		- ${h.form(url('user_emails_delete', id=c.user.user_id),method='delete')} - ${h.hidden('del_email',em.email_id)} - ${h.submit('remove_',_('delete'),id="remove_email_%s" % em.email_id, - class_="delete_icon action_button", onclick="return confirm('"+_('Confirm to delete this email: %s') % em.email+"');")} - ${h.end_form()} -
    +
    + <%include file="/admin/users/user_edit_${c.active}.html"/>
    - - ${h.form(url('user_emails', id=c.user.user_id),method='put')} -
    - -
    -
    -
    - -
    -
    - ${h.text('new_email', class_='medium')} -
    -
    -
    - ${h.submit('save',_('Add'),class_="ui-btn large")} - ${h.reset('reset',_('Reset'),class_="ui-btn large")} -
    -
    -
    - ${h.end_form()}
    -
    - -
    -
    ${_('Allowed IP addresses')}
    -
    -
    - - %if c.user_ip_map: - %for ip in c.user_ip_map: - - - - - - %endfor - %else: - - %endif -
    ${ip.ip_addr}
    ${h.ip_range(ip.ip_addr)}
    		 - ${h.form(url('user_ips_delete', id=c.user.user_id),method='delete')} - ${h.hidden('del_ip',ip.ip_id)} - ${h.submit('remove_',_('delete'),id="remove_ip_%s" % ip.ip_id, - class_="delete_icon action_button", onclick="return confirm('"+_('Confirm to delete this ip: %s') % ip.ip_addr+"');")} - ${h.end_form()} -
    ${_('All IP addresses are allowed')}
    -
    - - ${h.form(url('user_ips', id=c.user.user_id),method='put')} -
    - -
    -
    -
    - -
    -
    - ${h.text('new_ip', class_='medium')} -
    -
    -
    - ${h.submit('save',_('Add'),class_="ui-btn large")} - ${h.reset('reset',_('Reset'),class_="ui-btn large")} -
    -
    -
    - ${h.end_form()} -