used template hooks instead of hardcoding basic_auth functionality into templates
This commit is contained in:
Rodney Ewing
parent
af665c4eb9
commit
36f901fbbd
@ -13,6 +13,7 @@
|
||||
#
|
||||
# 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/>.
|
||||
from pkg_resources import resource_filename
|
||||
import os
|
||||
|
||||
from mediagoblin.plugins.basic_auth import forms as auth_forms
|
||||
@ -21,6 +22,8 @@ from mediagoblin.auth.tools import create_basic_user
|
||||
from mediagoblin.db.models import User
|
||||
from mediagoblin.tools import pluginapi
|
||||
from sqlalchemy import or_
|
||||
from mediagoblin.tools.staticdirect import PluginStatic
|
||||
|
||||
|
||||
PLUGIN_DIR = os.path.dirname(__file__)
|
||||
|
||||
@ -42,6 +45,11 @@ def setup_plugin():
|
||||
pluginapi.register_routes(routes)
|
||||
pluginapi.register_template_path(os.path.join(PLUGIN_DIR, 'templates'))
|
||||
|
||||
pluginapi.register_template_hooks(
|
||||
{'edit_link': 'mediagoblin/plugins/basic_auth/edit_link.html',
|
||||
'fp_link': 'mediagoblin/plugins/basic_auth/fp_link.html',
|
||||
'fp_head': 'mediagoblin/plugins/basic_auth/fp_head.html'})
|
||||
|
||||
|
||||
def get_user(**kwargs):
|
||||
username = kwargs.pop('username', None)
|
||||
@ -103,4 +111,7 @@ hooks = {
|
||||
'auth_check_password': check_password,
|
||||
'auth_fake_login_attempt': auth_tools.fake_login_attempt,
|
||||
'template_global_context': append_to_global_context,
|
||||
'static_setup': lambda: PluginStatic(
|
||||
'coreplugin_basic_auth',
|
||||
resource_filename('mediagoblin.plugins.basic_auth', 'static'))
|
||||
}
|
||||
|
||||
@ -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 change_pass_link %}
|
||||
<p>
|
||||
<a href="{{ request.urlgen('mediagoblin.plugins.basic_auth.edit.pass') }}">
|
||||
{% trans %}Change your password.{% endtrans %}
|
||||
</a>
|
||||
</p>
|
||||
{% endblock %}
|
||||
@ -0,0 +1,20 @@
|
||||
{#
|
||||
# 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/>.
|
||||
#}
|
||||
|
||||
<script type="text/javascript"
|
||||
src="{{ request.staticdirect('/js/autofilledin_password.js', 'coreplugin_basic_auth') }}"></script>
|
||||
@ -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 fp_link %}
|
||||
<p>
|
||||
<a href="{{ request.urlgen('mediagoblin.plugins.basic_auth.forgot_password') }}" id="forgot_password">
|
||||
{% trans %}Forgot your password?{% endtrans %}</a>
|
||||
</p>
|
||||
{% endblock %}
|
||||
|
||||
@ -20,8 +20,8 @@
|
||||
{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
|
||||
|
||||
{% block mediagoblin_head %}
|
||||
<script type="text/javascript"
|
||||
src="{{ request.staticdirect('/js/autofilledin_password.js') }}"></script>
|
||||
{{ super() }}
|
||||
{% template_hook("fp_head") %}
|
||||
{% endblock %}
|
||||
|
||||
{% block title -%}
|
||||
|
||||
@ -20,8 +20,8 @@
|
||||
{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
|
||||
|
||||
{% block mediagoblin_head %}
|
||||
<script type="text/javascript"
|
||||
src="{{ request.staticdirect('/js/autofilledin_password.js') }}"></script>
|
||||
{{ super() }}
|
||||
{% template_hook("fp_head") %}
|
||||
{% endblock %}
|
||||
|
||||
{% block title -%}
|
||||
@ -48,12 +48,7 @@
|
||||
{% endif %}
|
||||
{% template_hook("login_link") %}
|
||||
{{ wtforms_util.render_divs(login_form, True) }}
|
||||
{% if pass_auth %}
|
||||
<p>
|
||||
<a href="{{ request.urlgen('mediagoblin.auth.forgot_password') }}" id="forgot_password">
|
||||
{% trans %}Forgot your password?{% endtrans %}</a>
|
||||
</p>
|
||||
{% endif %}
|
||||
{% template_hook("fp_link") %}
|
||||
<div class="form_submit_buttons">
|
||||
<input type="submit" value="{% trans %}Log in{% endtrans %}" class="button_form"/>
|
||||
</div>
|
||||
|
||||
@ -41,13 +41,6 @@
|
||||
Changing {{ username }}'s account settings
|
||||
{%- endtrans -%}
|
||||
</h1>
|
||||
{% if pass_auth is defined %}
|
||||
<p>
|
||||
<a href="{{ request.urlgen('mediagoblin.edit.pass') }}">
|
||||
{% trans %}Change your password.{% endtrans %}
|
||||
</a>
|
||||
</p>
|
||||
{% endif %}
|
||||
{% template_hook("edit_link") %}
|
||||
{{ wtforms_util.render_divs(form, True) }}
|
||||
<div class="form_submit_buttons">
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user