diff options
| author | Aditi <aditi.iitr@gmail.com> | 2013-07-04 21:35:22 +0530 |
|---|---|---|
| committer | Aditi <aditi.iitr@gmail.com> | 2013-07-04 21:35:22 +0530 |
| commit | 7b77f7e490a27de57a4dab5301662ef95d11b213 (patch) | |
| tree | 9b87d1720e64565e42970bcc24625ff6bfd8fa85 /mediagoblin/templates | |
| parent | 2392fbc02bbf6d05d998de5091b8f11f37c101f0 (diff) | |
| parent | 41a14c6efc1dd9cfc36f1b2eb4cb3f3b34e4d975 (diff) | |
| download | mediagoblin-7b77f7e490a27de57a4dab5301662ef95d11b213.tar.lz mediagoblin-7b77f7e490a27de57a4dab5301662ef95d11b213.tar.xz mediagoblin-7b77f7e490a27de57a4dab5301662ef95d11b213.zip | |
Merge remote-tracking branch 'cweb/master'
sage aborts
Merge branch master of git://gitorious.org/mediagoblin/mediagoblin.git
Diffstat (limited to 'mediagoblin/templates')
| -rw-r--r-- | mediagoblin/templates/mediagoblin/auth/login.html | 14 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/auth/register.html | 3 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/edit/edit_account.html | 5 |
3 files changed, 14 insertions, 8 deletions
diff --git a/mediagoblin/templates/mediagoblin/auth/login.html b/mediagoblin/templates/mediagoblin/auth/login.html index d9f92557..3329b5d0 100644 --- a/mediagoblin/templates/mediagoblin/auth/login.html +++ b/mediagoblin/templates/mediagoblin/auth/login.html @@ -29,7 +29,7 @@ {%- endblock %} {% block mediagoblin_content %} - <form action="{{ request.urlgen('mediagoblin.auth.login') }}" + <form action="{{ post_url }}" method="POST" enctype="multipart/form-data"> {{ csrf_token }} <div class="form_box"> @@ -41,16 +41,18 @@ {% endif %} {% if allow_registration %} <p> - {% trans %}Don't have an account yet?{% endtrans %} <a href="{{ request.urlgen('mediagoblin.auth.register') }}"> + {% trans %}Don't have an account yet?{% endtrans %} + <a href="{{ request.urlgen('mediagoblin.auth.register') }}"> {%- trans %}Create one here!{% endtrans %}</a> </p> {% endif %} + {% template_hook("login_link") %} {{ wtforms_util.render_divs(login_form, True) }} {% if pass_auth %} - <p> - <a href="{{ request.urlgen('mediagoblin.auth.forgot_password') }}" id="forgot_password"> - {% trans %}Forgot your password?{% endtrans %}</a> - </p> + <p> + <a href="{{ request.urlgen('mediagoblin.auth.forgot_password') }}" id="forgot_password"> + {% trans %}Forgot your password?{% endtrans %}</a> + </p> {% endif %} <div class="form_submit_buttons"> <input type="submit" value="{% trans %}Log in{% endtrans %}" class="button_form"/> diff --git a/mediagoblin/templates/mediagoblin/auth/register.html b/mediagoblin/templates/mediagoblin/auth/register.html index b315975c..a7b8033f 100644 --- a/mediagoblin/templates/mediagoblin/auth/register.html +++ b/mediagoblin/templates/mediagoblin/auth/register.html @@ -30,10 +30,11 @@ {% block mediagoblin_content %} - <form action="{{ request.urlgen('mediagoblin.auth.register') }}" + <form action="{{ post_url }}" method="POST" enctype="multipart/form-data"> <div class="form_box"> <h1>{% trans %}Create an account!{% endtrans %}</h1> + {% template_hook("register_link") %} {{ wtforms_util.render_divs(register_form, True) }} {{ csrf_token }} <div class="form_submit_buttons"> diff --git a/mediagoblin/templates/mediagoblin/edit/edit_account.html b/mediagoblin/templates/mediagoblin/edit/edit_account.html index 98b1b224..51293acb 100644 --- a/mediagoblin/templates/mediagoblin/edit/edit_account.html +++ b/mediagoblin/templates/mediagoblin/edit/edit_account.html @@ -41,13 +41,16 @@ 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 %} + {% template_hook("edit_link") %} {{ wtforms_util.render_divs(form, True) }} - <div class="form_submit_buttons"> + <div class="form_submit_buttons"> <input type="submit" value="{% trans %}Save changes{% endtrans %}" class="button_form" /> {{ csrf_token }} </div> |