diff options
Diffstat (limited to 'mediagoblin')
| -rw-r--r-- | mediagoblin/plugins/basic_auth/README.rst | 3 | ||||
| -rw-r--r-- | mediagoblin/plugins/openid/README.rst | 3 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/base.html | 27 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/bits/body_end.html | 2 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html | 6 |
5 files changed, 7 insertions, 34 deletions
diff --git a/mediagoblin/plugins/basic_auth/README.rst b/mediagoblin/plugins/basic_auth/README.rst index 87a7b16f..04bfafa0 100644 --- a/mediagoblin/plugins/basic_auth/README.rst +++ b/mediagoblin/plugins/basic_auth/README.rst @@ -7,8 +7,7 @@ The basic_auth plugin is enabled by default in mediagoblin.ini. This plugin provides basic username and password authentication for GNU MediaGoblin. -This plugin can be enabled alongside :ref:`openid-chapter` and -:ref:`persona-chapter`. +This plugin can be enabled alongside :ref:`openid-chapter`. Set up the basic_auth plugin ============================ diff --git a/mediagoblin/plugins/openid/README.rst b/mediagoblin/plugins/openid/README.rst index e2792d9a..b6368db3 100644 --- a/mediagoblin/plugins/openid/README.rst +++ b/mediagoblin/plugins/openid/README.rst @@ -7,8 +7,7 @@ The OpenID plugin allows user to login to your GNU MediaGoblin instance using their OpenID URL. -This plugin can be enabled alongside :ref:`basic_auth-chapter` and -:ref:`persona-chapter`. +This plugin can be enabled alongside :ref:`basic_auth-chapter`. .. note:: When :ref:`basic_auth-chapter` is enabled alongside this OpenID plugin, and diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 9b0b7168..4753f6cf 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -102,28 +102,16 @@ class="button_action_highlight"> {% trans %}Verify your email!{% endtrans %}</a> or <a id="logout" href= - {% if persona is not defined %} - "{{ request.urlgen('mediagoblin.auth.logout') }}" - {% else %} - "javascript:;" - {% endif %} + "{{ request.urlgen('mediagoblin.auth.logout') }}" >{% trans %}log out{% endtrans %}</a> {% elif request.user and request.user.is_banned() %} <a id="logout" href= - {% if persona is not defined %} - "{{ request.urlgen('mediagoblin.auth.logout') }}" - {% else %} - "javascript:;" - {% endif %} + "{{ request.urlgen('mediagoblin.auth.logout') }}" >{% trans %}log out{% endtrans %}</a> {% endif %} {%- elif auth %} <a href= - {% if persona_auth is defined %} - "javascript:;" id="persona_login" - {% else %} - "{{ request.urlgen('mediagoblin.auth.login') }}" - {% endif %} + "{{ request.urlgen('mediagoblin.auth.login') }}" > {%- trans %}Log in{% endtrans -%} </a> @@ -150,11 +138,7 @@ · {% template_hook("blog_dashboard_home") %} <a id="logout" href= - {% if persona is not defined %} - "{{ request.urlgen('mediagoblin.auth.logout') }}" - {% else %} - "javascript:;" - {% endif %} + "{{ request.urlgen('mediagoblin.auth.logout') }}" >{% trans %}Log out{% endtrans %}</a> </p> <a class="button_action" href="{{ request.urlgen('mediagoblin.submit.start') }}"> @@ -194,9 +178,6 @@ {% include "mediagoblin/utils/messages.html" %} {% block mediagoblin_content %} {% endblock mediagoblin_content %} - {% if csrf_token is defined %} - {% template_hook("persona_form") %} - {% endif %} </div> </div> </div> diff --git a/mediagoblin/templates/mediagoblin/bits/body_end.html b/mediagoblin/templates/mediagoblin/bits/body_end.html index c8f5e2d6..bb7b9762 100644 --- a/mediagoblin/templates/mediagoblin/bits/body_end.html +++ b/mediagoblin/templates/mediagoblin/bits/body_end.html @@ -15,5 +15,3 @@ # 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/>. -#} - -{% template_hook("persona_end") %} diff --git a/mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html b/mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html index ec53159f..b3333e47 100644 --- a/mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html +++ b/mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html @@ -28,11 +28,7 @@ {% if allow_registration %} <p>{% trans %}Don't have one yet? It's easy!{% endtrans %}</p> <a class="button_action_highlight" href= - {% if persona_auth is defined %} - "javascript:;" id="persona_login1" - {% else %} - "{{ request.urlgen('mediagoblin.auth.register') }}" - {% endif %} + "{{ request.urlgen('mediagoblin.auth.register') }}" {% trans %} >Create an account at this site</a> or |