Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-16 16:00:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'improve_docu_link' into 'master'

Browse Source 
Move docu link to top menu and open in new window

See merge request allianceauth/allianceauth!1189
This commit is contained in:
Ariel Rin 2020-04-03 12:04:06 +00:00
commit 653a8aa850
4 changed files with 9 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
allianceauth/authentication/urls.py
View File

@ -22,13 +22,6 @@ urlpatterns = [
r'^account/characters/add/$',
views.add_character,
name='add_character'
),
url(
r'^help/$',
login_required(
TemplateView.as_view(template_name='allianceauth/help.html')
),
name='help'
),
),
url(r'^dashboard/$', views.dashboard, name='dashboard'),
]

18
allianceauth/templates/allianceauth/help.html
View File

@ -1,18 +0,0 @@
{% extends "allianceauth/base.html" %}
{% load i18n %}
{% block page_title %}{% trans "Help" %}{% endblock page_title %}
{% block content %}
<div class="col-lg-12">
<h1 class="page-header text-center">{% trans "Help" %}</h1>
<div class="container-fluid">
<div class="embed-responsive embed-responsive-16by9">
<iframe class="embed-responsive-item" src="https://allianceauth.readthedocs.io/en/latest/features/"></iframe>
</div>
</div>
</div>
{% endblock content %}

10
allianceauth/templates/allianceauth/side-menu.html
View File

@ -26,15 +26,7 @@
{% endif %}
{% menu_items %}
{% if user.is_superuser %}
<li>
<a class="{% navactive request 'authentication:help' %}"
href="{% url 'authentication:help' %}">
<i class="fa fa-question fa-fw"></i> {% trans "Help" %}
</a>
</li>
{% endif %}
</ul>
</div>
</div>

7
allianceauth/templates/allianceauth/top-menu.html
View File

@ -39,6 +39,13 @@
{% else %}
<li><a href="{% url 'authentication:login' %}">{% trans "Login" %}</a></li>
{% endif %}
{% if user.is_superuser %}
<li>
<a href="https://allianceauth.readthedocs.io/" target="_blank">
<i class="fa fa-question-circle fa-fw"></i>
</a>
</li>
{% endif %}
</ul>
<form id="f-lang-select" class="navbar-form navbar-right" action="{% url 'set_language' %}" method="post">
{% csrf_token %}