heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove additional mentions of persona in templates and docs.

Browse Source
This commit is contained in:
Ben Sturmfels 2021-04-23 18:11:31 +10:00
parent 9e391cf500
commit 05e4795683
No known key found for this signature in database
GPG Key ID: 023C05E2C9C068F0
5 changed files with 7 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mediagoblin/plugins/basic_auth/README.rst
View File

@ -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
============================

3
mediagoblin/plugins/openid/README.rst
View File

@ -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

27
mediagoblin/templates/mediagoblin/base.html
View File

@ -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 @@
&middot;
{% 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>

2
mediagoblin/templates/mediagoblin/bits/body_end.html
View File

@ -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") %}

6
mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html
View File

@ -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