Files
@ 631e8000eae8
Branch filter:
Location: kallithea/rhodecode/templates/admin/users/user_edit_my_account_form.html - annotation
631e8000eae8
3.5 KiB
text/html
diff parser: match the header order of hg diff --git patches
The output might look like:
diff --git a/A b/B
old mode 100644
new mode 100755
rename from A
rename to B
--- a/A
+++ b/B
Such files were shown as 'modified binary file chmod 100644 => 100755' without
diff.
Now the chmod and diff will be shown ... but still not the rename.
Correct parsing of headers do require a better parser - one do not just use a
regexp.
The output might look like:
diff --git a/A b/B
old mode 100644
new mode 100755
rename from A
rename to B
--- a/A
+++ b/B
Such files were shown as 'modified binary file chmod 100644 => 100755' without
diff.
Now the chmod and diff will be shown ... but still not the rename.
Correct parsing of headers do require a better parser - one do not just use a
regexp.
ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 d5ae996eed11 b30a842bc164 b30a842bc164 b30a842bc164 d5ae996eed11 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 4910b2607a29 4910b2607a29 4910b2607a29 4910b2607a29 4910b2607a29 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 6ce3387bf0ce ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 7ae36df760ce 7ae36df760ce ef71d7e63806 ef71d7e63806 ef71d7e63806 ef71d7e63806 86aa4f1f130b | <div>
${h.form(url('admin_settings_my_account_update'),method='put')}
<div class="form">
<div class="field">
<div class="gravatar_box">
<div class="gravatar"><img alt="gravatar" src="${h.gravatar_url(c.user.email)}"/></div>
<p>
%if c.use_gravatar:
<strong>${_('Change your avatar at')} <a href="http://gravatar.com">gravatar.com</a></strong>
<br/>${_('Using')} ${c.user.email}
%else:
<br/>${c.user.email}
%endif
</p>
</div>
</div>
<div class="field">
<div class="label">
<label>${_('API key')}</label> ${c.user.api_key}
</div>
</div>
<div class="field">
<div class="label">
<label>${_('Current IP')}:</label> ${c.perm_user.ip_addr or "?"}
</div>
</div>
<div class="fields">
<div class="field">
<div class="label">
<label for="username">${_('Username')}:</label>
</div>
<div class="input">
%if c.ldap_dn:
${h.text('username',class_='medium disabled', readonly="readonly")}
%else:
${h.text('username',class_='medium')}
%endif:
</div>
</div>
<div class="field">
<div class="label">
<label for="new_password">${_('New password')}:</label>
</div>
<div class="input">
${h.password('new_password',class_="medium",autocomplete="off")}
</div>
</div>
<div class="field">
<div class="label">
<label for="password_confirmation">${_('New password confirmation')}:</label>
</div>
<div class="input">
${h.password('password_confirmation',class_="medium",autocomplete="off")}
</div>
</div>
<div class="field">
<div class="label">
<label for="name">${_('First Name')}:</label>
</div>
<div class="input">
${h.text('firstname',class_="medium")}
</div>
</div>
<div class="field">
<div class="label">
<label for="lastname">${_('Last Name')}:</label>
</div>
<div class="input">
${h.text('lastname',class_="medium")}
</div>
</div>
<div class="field">
<div class="label">
<label for="email">${_('Email')}:</label>
</div>
<div class="input">
${h.text('email',class_="medium")}
</div>
</div>
<div class="buttons">
${h.submit('save',_('Save'),class_="ui-btn large")}
${h.reset('reset',_('Reset'),class_="ui-btn large")}
</div>
</div>
</div>
${h.end_form()}
</div>
|