aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodney Ewing <ewing.rj@gmail.com>2013-07-03 08:09:06 -0700
committerChristopher Allan Webber <cwebber@dustycloud.org>2013-07-03 13:49:17 -0500
commitc92b3c63b13ad44e8485a577f5fb768c9bdc1f94 (patch)
tree3c84cc22fb87081ed62de5c9143dcdfde5701666
parentfea0b3b289154c96017021d25b0ed455d6f7f7b4 (diff)
downloadmediagoblin-c92b3c63b13ad44e8485a577f5fb768c9bdc1f94.tar.lz
mediagoblin-c92b3c63b13ad44e8485a577f5fb768c9bdc1f94.tar.xz
mediagoblin-c92b3c63b13ad44e8485a577f5fb768c9bdc1f94.zip
changed hook name to reuse with persona
-rw-r--r--mediagoblin/plugins/openid/__init__.py6
-rw-r--r--mediagoblin/templates/mediagoblin/auth/login.html2
-rw-r--r--mediagoblin/templates/mediagoblin/auth/register.html2
-rw-r--r--mediagoblin/templates/mediagoblin/edit/edit_account.html2
4 files changed, 6 insertions, 6 deletions
diff --git a/mediagoblin/plugins/openid/__init__.py b/mediagoblin/plugins/openid/__init__.py
index 1ee60fbf..ee88808c 100644
--- a/mediagoblin/plugins/openid/__init__.py
+++ b/mediagoblin/plugins/openid/__init__.py
@@ -57,9 +57,9 @@ def setup_plugin():
pluginapi.register_template_path(os.path.join(PLUGIN_DIR, 'templates'))
pluginapi.register_template_hooks(
- {'openid_register_link': 'mediagoblin/plugins/openid/register_link.html',
- 'openid_login_link': 'mediagoblin/plugins/openid/login_link.html',
- 'openid_edit_link': 'mediagoblin/plugins/openid/edit_link.html'})
+ {'register_link': 'mediagoblin/plugins/openid/register_link.html',
+ 'login_link': 'mediagoblin/plugins/openid/login_link.html',
+ 'edit_link': 'mediagoblin/plugins/openid/edit_link.html'})
def create_user(register_form):
diff --git a/mediagoblin/templates/mediagoblin/auth/login.html b/mediagoblin/templates/mediagoblin/auth/login.html
index 2f821c0e..3329b5d0 100644
--- a/mediagoblin/templates/mediagoblin/auth/login.html
+++ b/mediagoblin/templates/mediagoblin/auth/login.html
@@ -46,7 +46,7 @@
{%- trans %}Create one here!{% endtrans %}</a>
</p>
{% endif %}
- {% template_hook("openid_login_link") %}
+ {% template_hook("login_link") %}
{{ 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 1e4b1858..a7b8033f 100644
--- a/mediagoblin/templates/mediagoblin/auth/register.html
+++ b/mediagoblin/templates/mediagoblin/auth/register.html
@@ -34,7 +34,7 @@
method="POST" enctype="multipart/form-data">
<div class="form_box">
<h1>{% trans %}Create an account!{% endtrans %}</h1>
- {% template_hook("openid_register_link") %}
+ {% 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 86c54d79..a10949f5 100644
--- a/mediagoblin/templates/mediagoblin/edit/edit_account.html
+++ b/mediagoblin/templates/mediagoblin/edit/edit_account.html
@@ -48,7 +48,7 @@
</a>
</p>
{% endif %}
- {% template_hook("openid_edit_link") %}
+ {% 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" />