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

Merged with R4stl1n master

Browse Source 
Had to resolve a small conflict in email. Replaced mine with upstream.
This commit is contained in:
Brett Costabile
2015-11-05 22:37:37 -05:00
parent c4069de4c5 b5133a55e8
commit 15e959b265
32 changed files with 374 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
templates/public/base.html
View File

@@ -36,7 +36,11 @@
<div class="navbar-header ">
<a class="navbar-brand ">
<div class="fa fa-cog fa-spin"></div>
{{ ALLIANCE_NAME }}
{% if IS_CORP %}
<title>{{ CORP_NAME }}</title>
{% else %}
<title>{{ ALLIANCE_NAME }}</title>
{% endif %}
</a>
</div>
@@ -76,7 +80,7 @@
class="fa fa-users fa-fw grayiconecolor"></i> Characters</a>
</li>
{% if perms.auth.alliance_member %}
{% if perms.auth.member %}
<li>
<a {% ifequal request.path "/groups/" %} class="active" {% endifequal %}
href="{% url 'auth_groups' %}"><i
@@ -94,15 +98,15 @@
<li class="text-center divider-horizontal">
<h5>Aux Navigation</h5>
</li>
{% if perms.auth.alliance_member or perms.auth.blue_member %}
{% if perms.auth.member or perms.auth.blue_member %}
<li>
<a {% ifequal request.path "/services/" %} class="active" {% endifequal %}
href="{% url 'auth_services' %}"><i
class="fa fa-cogs fa-fw grayiconecolor"></i> Alliance Services</a>
class="fa fa-cogs fa-fw grayiconecolor"></i>Services</a>
</li>
{% endif %}
{% if not perms.auth.alliance_member and not perms.auth.blue_member or perms.auth.human_resources %}
{% if not perms.auth.member and not perms.auth.blue_member or perms.auth.human_resources %}
<li>
<a {% ifequal request.path "/hr_application_management/" %}
class="active" {% endifequal %}
@@ -127,7 +131,7 @@
</li>
{% endif %}
{% if perms.auth.alliance_member or perms.auth.blue_member %}
{% if perms.auth.member or perms.auth.blue_member %}
<li>
<a {% ifequal request.path "/fits" %} class="active" {% endifequal %}
href="{% url 'auth_fleet_fits' %}"><i
@@ -158,7 +162,7 @@
class="fa fa-lock fa-fw grayiconecolor"></i>Change Password</a>
</li>
{% if perms.auth.alliance_member or perms.auth.blue_member %}
{% if perms.auth.member or perms.auth.blue_member %}
<li>
<a {% ifequal request.path "/tool/fleet_formatter_tool/" %}
class="active" {% endifequal %}

9
templates/public/login.html
View File

@@ -10,9 +10,12 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="author" content="">
<title>{{ ALLIANCE_NAME }} - Login</title>
{% if IS_CORP %}
<title>{{ CORP_NAME }} - Login</title>
{% else %}
<title>{{ ALLIANCE_NAME }} - Login</title>
{% endif %}
<!-- Bootstrap Core CSS -->
<link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet">
<!-- Custom Fonts -->

6
templates/public/register.html
View File

@@ -10,7 +10,11 @@
<meta name="description" content="">
<meta name="author" content="">
<title>{{ ALLIANCE_NAME }} - Login</title>
{% if IS_CORP %}
<title>{{ CORP_NAME }} - Login</title>
{% else %}
<title>{{ ALLIANCE_NAME }} - Login</title>
{% endif %}
<!-- Bootstrap Core CSS -->
<link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet">