Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2026-02-08 08:06:20 +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">

19
templates/registered/addapikey.html
View File

@@ -23,12 +23,19 @@
href="https://community.eveonline.com/support/api-key/CreatePredefined?accessMask=268435455">Create
a full API key</a>
</p>
<p class="text-center">
NOTE: If you are part of the alliance do not check "Blue" this is for people who are blue to the
alliance
but are not in it. Blue access is limited.
</p>
{% if IS_CORP %}
<p class="text-center">
NOTE: If you are part of the corp do not check "Blue", this is for people who are blue to the
corp
but are not in it. Blue access is limited.
</p>
{% else %}
<p class="text-center">
NOTE: If you are part of the alliance do not check "Blue", this is for people who are blue to the
alliance
but are not in it. Blue access is limited.
</p>
{% endif %}
<p class="text-center"><b>Do not change the accessmask or deselect options or it will not work </b>
</p>

8
templates/registered/corpstats.html
View File

@@ -6,7 +6,7 @@
<div class="col-lg-12">
<h1 class="page-header text-center">Corporation Stats</h1>
{% if perms.auth.alliance_member %}
{% if perms.auth.member %}
<div class="col-lg-12 container" id="example">
<div class="row">
@@ -67,7 +67,11 @@
</div>
</div>
{% else %}
<p> Not part of the alliance</p>
{% if IS_CORP %}
<div class="alert alert-danger" role="alert">You are not in the corporation.</div>
{% else %}
<div class="alert alert-danger" role="alert">You are not in the alliance.</div>
{% endif %}
{% endif %}
</div>
{% endblock content %}

10
templates/registered/dashboard.html
View File

@@ -1,12 +1,12 @@
{% extends "public/base.html" %}
{% block title %}Alliance Auth{% endblock %}
{% block page_title %}Something something here{% endblock page_title %}
{% block page_title %}Dashboard{% endblock page_title %}
{% block content %}
<div class="col-lg-12">
<h1 class="page-header text-center">Dashboard</h1>
{% if perms.auth.alliance_member %}
{% if perms.auth.member %}
<div class="col-lg-12 container" id="example">
@@ -59,7 +59,11 @@
</div>
</div>
{% else %}
<p> Not part of the alliance</p>
{% if IS_CORP %}
<div class="alert alert-danger" role="alert">Not a part of the corporation.</div>
{% else %}
<div class="alert alert-danger" role="alert">Not a part of the alliance.</div>
{% endif %}
{% endif %}
</div>
{% endblock content %}

19
templates/registered/fleetfits.html Normal file
View File

@@ -0,0 +1,19 @@
{% extends "public/base.html" %}
{% load bootstrap %}
{% load staticfiles %}
{% block title %}Alliance Auth{% endblock %}
{% block page_title %}Alliance Fleet Doctrines{% endblock page_title %}
{% block extra_css %}{% endblock extra_css %}
{% block content %}
Main bash/defense doctrine (SHIELD) <br />
<a href="javascript:CCPEVE.showFitting('17843:24427;1:12346;2:3841;2:2281;1:5975;1:33824;2:2048;1:3888;1:4405;2:31718;1:31796;2:28215;5:23025;12136::');" '="">Vexor Navy Issue</a><br />
<a href="javascript:CCPEVE.showFitting('12005:24427;1:16471;1:2889;2:5975;1:3841;2:2281;1:2553;1:2048;1:33824;2:4405;2:31796;2:28213;5:28215;10:21898;1000::');" '="">Ishtar</a><br />
<a href="javascript:CCPEVE.showFitting('11978:8641;3:24427;1:5975;1:2281;2:3841;1:8529;1:1541;2:1355;1:1447;1:31378;2:2488;3:23709;3::');" '="">Scimitar</a><br />
<a href="javascript:CCPEVE.showFitting('631:8585;3:3841;1:2281;1:2032;1:5975;1:20224;1:2048;1:1447;4:31718;1:31790;1:31360;1::');" '="">Scythe</a><br />
<br />
Ship DNA can be exported by different tools I recommend using fleetup.com OR https://www.fuzzwork.co.uk/ships/dnagen.php to get the Ship DNA
{% endblock content %}

8
templates/registered/groups.html
View File

@@ -9,7 +9,7 @@
{% block content %}
<div class="col-lg-12">
<h1 class="page-header text-center">Available Groups</h1>
{% if perms.auth.alliance_member %}
{% if perms.auth.member %}
<table class="table table-bordered">
<tr>
<th class="text-center">GroupID</th>
@@ -52,7 +52,11 @@
{% endfor %}
</table>
{% else %}
<div class="alert alert-danger" role="alert">You are not in the alliance</div>
{% if IS_CORP %}
<div class="alert alert-danger" role="alert">You are not in the corporation.</div>
{% else %}
<div class="alert alert-danger" role="alert">You are not in the alliance.</div>
{% endif %}
{% endif %}
</div>

2
templates/registered/hrapplicationmanagement.html
View File

@@ -9,7 +9,7 @@
{% block content %}
<div class="col-lg-12">
{% if not perms.auth.alliance_member %}
{% if not perms.auth.member %}
<h1 class="page-header text-center">Personal Applications
<div class="text-right">
<a href="{% url 'auth_hrapplication_create_view' %}">

18
templates/registered/services.html
View File

@@ -153,7 +153,7 @@
</tr>
{% endif %}
</table>
{% elif perms.auth.alliance_member %}
{% elif perms.auth.member %}
<table class="table table-bordered">
<tr>
<th class="text-center">Service</th>
@@ -162,7 +162,7 @@
<th class="text-center">Domain</th>
<th class="text-center">Action</th>
</tr>
{% if ENABLE_ALLIANCE_FORUM %}
{% if ENABLE_AUTH_FORUM %}
<tr>
<td class="text-center">Forums</td>
<td class="text-center">{{ authinfo.forum_username }}</td>
@@ -187,7 +187,7 @@
</td>
</tr>
{% endif %}
{% if ENABLE_ALLIANCE_IPBOARD %}
{% if ENABLE_AUTH_IPBOARD %}
<td class="text-center">IPBoard Forums</td>
<td class="text-center">{{ authinfo.ipboard_username }}</td>
<td class="text-center">{{ authinfo.ipboard_password }}</td>
@@ -210,7 +210,7 @@
{% endifequal %}
</td>
{% endif %}
{% if ENABLE_ALLIANCE_JABBER %}
{% if ENABLE_AUTH_JABBER %}
<tr>
<td class="text-center">Jabber</td>
<td class="text-center">{{ authinfo.jabber_username }}</td>
@@ -235,7 +235,7 @@
</td>
</tr>
{% endif %}
{% if ENABLE_ALLIANCE_MUMBLE %}
{% if ENABLE_AUTH_MUMBLE %}
<tr>
<td class="text-center">Mumble</td>
<td class="text-center">{{ authinfo.mumble_username }}</td>
@@ -260,7 +260,7 @@
</td>
</tr>
{% endif %}
{% if ENABLE_ALLIANCE_TEAMSPEAK3 %}
{% if ENABLE_AUTH_TEAMSPEAK3 %}
<tr>
<th class="text-center">Service</th>
<th class="text-center">Unique ID</th>
@@ -300,7 +300,11 @@
{% endif %}
</table>
{% else %}
<div class="alert alert-danger" role="alert">You are not in the alliance</div>
{% if IS_CORP %}
<div class="alert alert-danger" role="alert">You are not in the corporation.</div>
{% else %}
<div class="alert alert-danger" role="alert">You are not in the alliance.</div>
{% endif %}
{% endif %}
</div>

6
templates/registration/password_reset_complete.html
View File

@@ -12,7 +12,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">

7
templates/registration/password_reset_confirm.html
View File

@@ -12,8 +12,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">
<!-- Custom Fonts -->

2
templates/registration/password_reset_done.html
View File

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

6
templates/registration/password_reset_email.html
View File

@@ -4,12 +4,12 @@
{% trans "Please go to the following page and choose a new password:" %}
{% block reset_link %}
https://evesugar.dyndns.info{% url 'password_reset_confirm' uidb64=uid token=token %}
https://someurl.com{% url 'password_reset_confirm' uidb64=uid token=token %}
{% endblock %}
{% trans "Your username, in case you've forgotten:" %} {{ user.get_username }}
{% trans "Thanks for using our site!" %}
{% blocktrans %}SUGAR Aliiance Team{% endblocktrans %}
{% blocktrans %}Your Corporation{% endblocktrans %}
{% endautoescape %}
{% endautoescape %}

6
templates/registration/password_reset_form.html
View File

@@ -12,7 +12,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">