diff options
Diffstat (limited to 'mediagoblin/templates')
6 files changed, 5 insertions, 178 deletions
diff --git a/mediagoblin/templates/mediagoblin/auth/change_fp.html b/mediagoblin/templates/mediagoblin/auth/change_fp.html deleted file mode 100644 index a3cf9cb9..00000000 --- a/mediagoblin/templates/mediagoblin/auth/change_fp.html +++ /dev/null @@ -1,43 +0,0 @@ -{# -# GNU MediaGoblin -- federated, autonomous media hosting -# Copyright (C) 2011 Free Software Foundation, Inc -# -# 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/>. -#} -{% extends "mediagoblin/base.html" %} - -{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %} - -{% block mediagoblin_head %} - <script type="text/javascript" - src="{{ request.staticdirect('/js/show_password.js') }}"></script> -{% endblock mediagoblin_head %} - -{% block title -%} - {% trans %}Set your new password{% endtrans %} — {{ super() }} -{%- endblock %} - -{% block mediagoblin_content %} - <form action="{{ request.urlgen('mediagoblin.auth.verify_forgot_password') }}" - method="POST" enctype="multipart/form-data"> - {{ csrf_token }} - <div class="form_box"> - <h1>{% trans %}Set your new password{% endtrans %}</h1> - {{ wtforms_util.render_divs(cp_form, True) }} - <div class="form_submit_buttons"> - <input type="submit" value="{% trans %}Set password{% endtrans %}" class="button_form"/> - </div> - </div> -{% endblock %} - diff --git a/mediagoblin/templates/mediagoblin/auth/forgot_password.html b/mediagoblin/templates/mediagoblin/auth/forgot_password.html deleted file mode 100644 index 6cfd2c85..00000000 --- a/mediagoblin/templates/mediagoblin/auth/forgot_password.html +++ /dev/null @@ -1,38 +0,0 @@ -{# -# GNU MediaGoblin -- federated, autonomous media hosting -# Copyright (C) 2011 Free Software Foundation, Inc -# -# 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/>. -#} -{% extends "mediagoblin/base.html" %} - -{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %} - -{% block title -%} - {% trans %}Recover password{% endtrans %} — {{ super() }} -{%- endblock %} - -{% block mediagoblin_content %} - <form action="{{ request.urlgen('mediagoblin.auth.forgot_password') }}" - method="POST" enctype="multipart/form-data"> - {{ csrf_token }} - <div class="form_box"> - <h1>{% trans %}Recover password{% endtrans %}</h1> - {{ wtforms_util.render_divs(fp_form, True) }} - <div class="form_submit_buttons"> - <input type="submit" value="{% trans %}Send instructions{% endtrans %}" class="button_form"/> - </div> - </div> - </form> -{% endblock %} diff --git a/mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt b/mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt deleted file mode 100644 index fb5e1674..00000000 --- a/mediagoblin/templates/mediagoblin/auth/fp_verification_email.txt +++ /dev/null @@ -1,30 +0,0 @@ -{# -# GNU MediaGoblin -- federated, autonomous media hosting -# Copyright (C) 2011 Free Software Foundation, Inc -# -# 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/>. -#} - -{% trans username=username, verification_url=verification_url|safe -%} -Hi {{ username }}, - -to change your GNU MediaGoblin password, open the following URL in -your web browser: - -{{ verification_url }} - -If you think this is an error, just ignore this email and continue being -a happy goblin! -{%- endtrans %} - diff --git a/mediagoblin/templates/mediagoblin/auth/login.html b/mediagoblin/templates/mediagoblin/auth/login.html index 3329b5d0..93cd82d9 100644 --- a/mediagoblin/templates/mediagoblin/auth/login.html +++ b/mediagoblin/templates/mediagoblin/auth/login.html @@ -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 -%} @@ -39,21 +39,10 @@ {% trans %}Logging in failed!{% endtrans %} </div> {% endif %} - {% if allow_registration %} - <p> - {% trans %}Don't have an account yet?{% endtrans %} - <a href="{{ request.urlgen('mediagoblin.auth.register') }}"> - {%- trans %}Create one here!{% endtrans %}</a> - </p> - {% endif %} + {% template_hook("create_account") %} {% 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> diff --git a/mediagoblin/templates/mediagoblin/edit/change_pass.html b/mediagoblin/templates/mediagoblin/edit/change_pass.html deleted file mode 100644 index 2a1ffee0..00000000 --- a/mediagoblin/templates/mediagoblin/edit/change_pass.html +++ /dev/null @@ -1,52 +0,0 @@ -{# -# 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/>. -#} -{% extends "mediagoblin/base.html" %} - -{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %} - -{% block mediagoblin_head %} - <script type="text/javascript" - src="{{ request.staticdirect('/js/show_password.js') }}"></script> -{% endblock mediagoblin_head %} - -{% block title -%} - {% trans username=user.username -%} - Changing {{ username }}'s password - {%- endtrans %} — {{ super() }} -{%- endblock %} - -{% block mediagoblin_content %} - <form action="{{ request.urlgen('mediagoblin.edit.pass') }}" - method="POST" enctype="multipart/form-data"> - <div class="form_box edit_box"> - <h1> - {%- trans username=user.username -%} - Changing {{ username }}'s password - {%- endtrans -%} - </h1> - {{ wtforms_util.render_divs(form, True) }} - {{ csrf_token }} - <div class="form_submit_buttons"> - <input type="submit" value="{% trans %}Save{% endtrans %}" - class="button_form" /> - </div> - </div> - </form> -{% endblock %} - - diff --git a/mediagoblin/templates/mediagoblin/edit/edit_account.html b/mediagoblin/templates/mediagoblin/edit/edit_account.html index 14011daa..f9e75890 100644 --- a/mediagoblin/templates/mediagoblin/edit/edit_account.html +++ b/mediagoblin/templates/mediagoblin/edit/edit_account.html @@ -41,6 +41,7 @@ Changing {{ username }}'s account settings {%- endtrans -%} </h1> + {% 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" /> |