changed hook name to reuse with persona

diff --git a/mediagoblin/plugins/openid/__init__.py b/mediagoblin/plugins/openid/__init__.py
index 1ee60fbfd9bfe27040a6860568b74de86c5671e0..ee88808c90bb7a9d5b11b65cdceee16170089fe4 100644 (file)
--- 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 2f821c0e387c660495ae39c39a897f9c857550b4..3329b5d0c9b44784b1b8d1a9c29339364061576d 100644 (file)
--- 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 1e4b18582a95d1134236799c747c0dd670551923..a7b8033f9aa1092b12b3d0fa92e0c4cd9ca5dc9d 100644 (file)
--- 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 86c54d79f5dc782778da5ca6f0a33bd50d861805..a10949f55fd24e9a8e766c5098bf6594d6a8e0bc 100644 (file)
--- 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" />