diff options
| author | Rodney Ewing <ewing.rj@gmail.com> | 2013-07-03 15:04:25 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-07-03 15:07:50 -0500 |
| commit | e39b9cc60f6ccd8853ee19633d09750be541f767 (patch) | |
| tree | 6c00d5f38c5607559c8cd3789351821926c24ad9 /mediagoblin/templates | |
| parent | 4f8f0a4e1f2d5a1eb64f47e62958d77bd12379f3 (diff) | |
| download | mediagoblin-e39b9cc60f6ccd8853ee19633d09750be541f767.tar.lz mediagoblin-e39b9cc60f6ccd8853ee19633d09750be541f767.tar.xz mediagoblin-e39b9cc60f6ccd8853ee19633d09750be541f767.zip | |
moved persona template stuff to use template_hooks
Diffstat (limited to 'mediagoblin/templates')
4 files changed, 2 insertions, 27 deletions
diff --git a/mediagoblin/templates/mediagoblin/auth/login.html b/mediagoblin/templates/mediagoblin/auth/login.html index af8c61b5..3329b5d0 100644 --- a/mediagoblin/templates/mediagoblin/auth/login.html +++ b/mediagoblin/templates/mediagoblin/auth/login.html @@ -47,13 +47,6 @@ </p> {% endif %} {% template_hook("login_link") %} - {% if persona is defined %} - <p> - <a href="javascript:;" id="persona_login"> - {% trans %}Or login with Persona!{% endtrans %} - </a> - </p> - {% endif %} {{ wtforms_util.render_divs(login_form, True) }} {% if pass_auth %} <p> diff --git a/mediagoblin/templates/mediagoblin/auth/register.html b/mediagoblin/templates/mediagoblin/auth/register.html index 8ed389a0..a7b8033f 100644 --- a/mediagoblin/templates/mediagoblin/auth/register.html +++ b/mediagoblin/templates/mediagoblin/auth/register.html @@ -35,14 +35,6 @@ <div class="form_box"> <h1>{% trans %}Create an account!{% endtrans %}</h1> {% template_hook("register_link") %} - {% template_hook("openid_register_link") %} - {% if persona is defined %} - <p> - <a href="javascript:;" id="persona_login"> - {% trans %}Or register with Persona!{% endtrans %} - </a> - </p> - {% endif %} {{ wtforms_util.render_divs(register_form, True) }} {{ csrf_token }} <div class="form_submit_buttons"> diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index f2f03382..77cecd93 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -47,9 +47,7 @@ {% include "mediagoblin/extra_head.html" %} {% template_hook("head") %} - {% if persona is defined %} - {% template_hook("persona_head") %} - {% endif %} + {% template_hook("persona_head") %} {% block mediagoblin_head %} {% endblock mediagoblin_head %} @@ -150,7 +148,7 @@ {% include "mediagoblin/utils/messages.html" %} {% block mediagoblin_content %} {% endblock mediagoblin_content %} - {% if persona is defined and csrf_token is defined %} + {% if csrf_token is defined %} {% template_hook("persona_form") %} {% endif %} </div> diff --git a/mediagoblin/templates/mediagoblin/edit/edit_account.html b/mediagoblin/templates/mediagoblin/edit/edit_account.html index 9bd488d7..51293acb 100644 --- a/mediagoblin/templates/mediagoblin/edit/edit_account.html +++ b/mediagoblin/templates/mediagoblin/edit/edit_account.html @@ -49,14 +49,6 @@ </p> {% endif %} {% template_hook("edit_link") %} - {% template_hook("openid_edit_link") %} - {% if persona is defined %} - <p> - <a href="{{ request.urlgen('mediagoblin.plugins.persona.edit') }}"> - {% trans %}Edit your Persona email addresses{% endtrans %} - </a> - </p> - {% endif %} {{ wtforms_util.render_divs(form, True) }} <div class="form_submit_buttons"> <input type="submit" value="{% trans %}Save changes{% endtrans %}" class="button_form" /> |