moved persona template stuff to use template_hooks

diff --git a/mediagoblin/plugins/openid/__init__.py b/mediagoblin/plugins/openid/__init__.py
index ee88808c90bb7a9d5b11b65cdceee16170089fe4..ca17a7e8c00d3ee17bf5dbd7677c9a2390c98b4b 100644 (file)
--- a/mediagoblin/plugins/openid/__init__.py
+++ b/mediagoblin/plugins/openid/__init__.py
@@ -120,4 +120,6 @@ hooks = {
     'auth_no_pass_redirect': no_pass_redirect,
     ('mediagoblin.auth.register',
      'mediagoblin/auth/register.html'): add_to_form_context,
+    ('mediagoblin.auth.login',
+     'mediagoblin/auth/login.html'): add_to_form_context
 }

diff --git a/mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html b/mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html
index 604c4becbe159019a2201bb58ecb2d47a28e010e..8d74c2b94259d7de758b98751ca1b71d2c04e6f9 100644 (file)
--- a/mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html
+++ b/mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login.html
@@ -44,13 +44,7 @@
         {% trans %}Log in to create an account!{% endtrans %} 
         </p>
       {% endif %}
-      {% if persona is defined %}
-        <p>
-        <a href="javascript:;" id="persona_login">
-          {% trans %}Or login with Persona!{% endtrans %}
-        </a>
-        </p>
-      {% endif %}
+      {% template_hook('login_link') %}
       {% if pass_auth is defined %}
       <p>
       <a href="{{ request.urlgen('mediagoblin.auth.login') }}?{{ request.query_string }}">

diff --git a/mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html b/mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html
index e5e77d016aba13b304a0ee00fa8672f43625fb04..fa4d5e856d610fba5ce6aeba521229305ea0d544 100644 (file)
--- a/mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html
+++ b/mediagoblin/plugins/openid/templates/mediagoblin/plugins/openid/login_link.html
@@ -17,9 +17,11 @@
 #}
 
 {% block openid_login_link %}
+  {% if openid_link is defined %}
     <p>
       <a href="{{ request.urlgen('mediagoblin.plugins.openid.login') }}?{{ request.query_string }}">
           {%- trans %}Or login with OpenID!{% endtrans %}
       </a>
     </p>
+  {% endif %}
 {% endblock %}

diff --git a/mediagoblin/plugins/persona/__init__.py b/mediagoblin/plugins/persona/__init__.py
index 20cbbbf9f82716d41f5aad6673e47ca656fbefcd..d74ba0d757bc4e93e6e18780698a20ea5a8f05e1 100644 (file)
--- a/mediagoblin/plugins/persona/__init__.py
+++ b/mediagoblin/plugins/persona/__init__.py
@@ -49,7 +49,10 @@ def setup_plugin():
     pluginapi.register_template_path(os.path.join(PLUGIN_DIR, 'templates'))
     pluginapi.register_template_hooks(
         {'persona_head': 'mediagoblin/plugins/persona/persona_js_head.html',
-         'persona_form': 'mediagoblin/plugins/persona/persona.html'})
+         'persona_form': 'mediagoblin/plugins/persona/persona.html',
+         'edit_link': 'mediagoblin/plugins/persona/edit_link.html',
+         'login_link': 'mediagoblin/plugins/persona/login_link.html',
+         'register_link': 'mediagoblin/plugins/persona/register_link.html'})
 
 
 def create_user(register_form):

diff --git a/mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html b/mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html
new file mode 100644 (file)
index 0000000..08879da
--- /dev/null
+++ b/mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/edit_link.html
@@ -0,0 +1,25 @@
+{#
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+
+{% block persona_edit_link %}
+    <p>
+      <a href="{{ request.urlgen('mediagoblin.plugins.persona.edit') }}">
+          {% trans %}Edit your Persona email addresses{% endtrans %}
+      </a>
+    </p>
+{% endblock %}

diff --git a/mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html b/mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html
new file mode 100644 (file)
index 0000000..975683d
--- /dev/null
+++ b/mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/login_link.html
@@ -0,0 +1,25 @@
+{#
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+
+{% block person_login_link %}
+    <p>
+      <a href="javascript:;" id="persona_login">
+          {% trans %}Or login with Persona!{% endtrans %}
+      </a>
+    </p>
+{% endblock %}

diff --git a/mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html b/mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html
new file mode 100644 (file)
index 0000000..bcd9ae2
--- /dev/null
+++ b/mediagoblin/plugins/persona/templates/mediagoblin/plugins/persona/register_link.html
@@ -0,0 +1,25 @@
+{#
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+
+{% block persona_register_link %}
+    <p>
+      <a href="javascript:;" id="persona_login">
+        {% trans %}Or register with Persona!{% endtrans %}
+      </a>
+    </p>
+{% endblock %}

diff --git a/mediagoblin/templates/mediagoblin/auth/login.html b/mediagoblin/templates/mediagoblin/auth/login.html
index af8c61b51b08a8aa02525a4fa5ca2d16ee970da1..3329b5d0c9b44784b1b8d1a9c29339364061576d 100644 (file)
--- 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 8ed389a03bf97e78cf44a8a7536175f10fbcf316..a7b8033f9aa1092b12b3d0fa92e0c4cd9ca5dc9d 100644 (file)
--- 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 f2f03382cb1004d2f6bd898001fda8b5788d7118..77cecd9340d8771b676db848680af3667f4a6a5e 100644 (file)
--- 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 9bd488d79029fa346014637765c2bbb656dc6ed9..51293acbc1a5eb75230e72608f88a63b1ed856f0 100644 (file)
--- 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" />