diff options
| -rw-r--r-- | mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html | 9 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/edit/edit_account.html | 24 |
2 files changed, 15 insertions, 18 deletions
diff --git a/mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html b/mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html index 2e63e1f8..88b232f8 100644 --- a/mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html +++ b/mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/edit_link.html @@ -17,9 +17,8 @@ #} {% block openid_edit_link %} - <p> - <a href="{{ request.urlgen('mediagoblin.plugins.openid.edit') }}"> - {% trans %}Edit your OpenID's{% endtrans %} - </a> - </p> + <a href="{{ request.urlgen('mediagoblin.plugins.openid.edit') }}"> + {% trans %}OpenID's{% endtrans %} + </a> + · {% endblock %} diff --git a/mediagoblin/templates/mediagoblin/edit/edit_account.html b/mediagoblin/templates/mediagoblin/edit/edit_account.html index 04f9230f..14011daa 100644 --- a/mediagoblin/templates/mediagoblin/edit/edit_account.html +++ b/mediagoblin/templates/mediagoblin/edit/edit_account.html @@ -41,19 +41,6 @@ Changing {{ username }}'s account settings {%- endtrans -%} </h1> - {% if pass_auth is defined %} - <p> - <a href="{{ request.urlgen('mediagoblin.edit.pass') }}"> - {% trans %}Change your password.{% endtrans %} - </a> - </p> - {% endif %} - <p> - <a href="{{ request.urlgen('mediagoblin.edit.email') }}"> - {% trans %}Change your email.{% endtrans %} - </a> - </p> - {% template_hook("edit_link") %} {{ wtforms_util.render_divs(form, True) }} <div class="form_submit_buttons"> <input type="submit" value="{% trans %}Save changes{% endtrans %}" class="button_form" /> @@ -65,5 +52,16 @@ <a href="{{ request.urlgen('mediagoblin.edit.delete_account') }}"> {%- trans %}Delete my account{% endtrans -%} </a> + · + {% template_hook("edit_link") %} + <a href="{{ request.urlgen('mediagoblin.edit.email') }}"> + {% trans %}Email{% endtrans %} + </a> + {% if pass_auth is defined %} + · + <a href="{{ request.urlgen('mediagoblin.edit.pass') }}"> + {% trans %}Password{% endtrans %} + </a> + {% endif %} </div> {% endblock %} |