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

Adarnof's Little Things (#547)

Browse Source 
* Port to Django 1.10
Initial migrations for current states of all models. Requires faking to retain data.
Removed all references to render_to_response, replacing with render shortcut.
Same for HttpResponseRedirect to render shortcut.
Corrected notification signal import to wait for app registry to finish loading.

* Correct typos from render conversion

* Modify models to suppress Django field warnings

* Script for automatic database conversion
 - fakes initial migrations to preserve data
Include LOGIN_URL setting

* Correct context processor import typo

* Removed pathfinder support.
Current pathfinder versions require SSO, not APIs added to database.
Conditionally load additional database definitions only if services are enabled.
Prevents errors when running auth without creating all possible databases.

* Condense context processors

* Include Django 1.10 installation in migrate script
Remove syncdb/evolve, replace with migrate for update script

* Replaced member/blue perms with user state system
Removed sigtracker
Initial migrations for default perms and groups
Removed perm bootstrapping on first run

* Clean up services list

* Remove fleet fittings page

* Provide action feedback via django messaging
Display unread notification count
Correct left navbar alignment

* Stop storing service passwords.
Provide them one time upon activation or reset.
Closes #177

* Add group sync buttons to admin site
Allow searcing of AuthServicesInfo models
Display user main character

* Correct button CSS to remove underlines on hover

* Added bulk actions to notifications
Altered notification default ordering

* Centralize API key validation.
Remove unused error count on API key model.
Restructure API key refresh task to queue all keys per user and await completion.
Closes #350

* Example configuration files for supervisor.
Copy to /etc/supervisor/conf.d and restart to take effect.
Closes #521
Closes #266

* Pre-save receiver for member/blue state switching
Removed is_blue field
Added link to admin site

* Remove all hardcoded URLs from views and templates
Correct missing render arguments
Closes #540

* Correct celeryd process directory

* Migration to automatically set user states.
Runs instead of waiting for next API refresh cycle. Should make the transition much easier.

* Verify service accounts accessible to member state

* Restructure project to remove unnecessary apps.
(celerytask, util, portal, registraion apps)
Added workarounds for python 3 compatibility.

* Correct python2 compatibility

* Check services against state being changed to

* Python3 compatibility fixes

* Relocate x2bool py3 fix

* SSO integration for logging in to existing accounts.

* Add missing url names for fleetup reverse

* Sanitize groupnames before syncing.

* Correct trailing slash preventing url resolution

* Alter group name sanitization to allow periods and hyphens

* Correct state check on pre_save model for corp/alliance group assignment

* Remove sigtracker table from old dbs to allow user deletion

* Include missing celery configuration

* Teamspeak error handling

* Prevent celery worker deadlock on async group result wait

* Correct active navbar links for translated urls.
Correct corp status url resolution for some links.
Remove DiscordAuthToken model.
This commit is contained in:
Adarnof
2016-10-16 18:01:14 -04:00
committed by GitHub
parent 56136d050a
commit 1b4f5e4e88
220 changed files with 5716 additions and 5331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
stock/static/img/sso/EVE_SSO_Login_Buttons_Large_Black.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
stock/static/img/sso/EVE_SSO_Login_Buttons_Large_White.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

172
stock/templates/public/base.html
View File

@@ -1,5 +1,6 @@
{% load staticfiles %}
{% load i18n %}
{% load navactive %}
<!DOCTYPE html>
<html lang="en">
@@ -30,6 +31,10 @@
#f_lang_select {
margin-right: 5px;
}
.navbar-brand {
height: 58px;
padding: 19px 19px;
}
</style>
</head>
@@ -39,22 +44,17 @@
<!-- Navigation -->
<nav class="navbar navbar-inverse navbar-static-top" role="navigation">
<div class="navbar-header ">
<a class="navbar-brand ">
<div class="fa fa-cog fa-spin"></div>
<div class="container-fluid">
<a class="navbar-brand">
{% if IS_CORP %}
{{ CORP_NAME }}
{% else %}
{{ ALLIANCE_NAME }}
{% endif %}
</a>
</div>
</a>
<!-- /.navbar-header -->
<ul class="nav navbar-top-links navbar-right">
<li class="nav-link">
<form id="f_lang_select" action="{% url 'set_language' %}" method="post">
{% csrf_token %}
@@ -70,21 +70,30 @@
</form>
</li>
{% if notifications %}
<li class="nav-link active"><a href="{% url 'auth_notification_list' %}">
<i class="fa fa-flag"></i></a>
<li class="nav-link active">
<a href="{% url 'auth_notification_list' %}">
<span class="fa-stack">
<i class="fa fa-bell fa-stack-2x"></i>
<i class="fa fa-inverse fa-stack-1x">{{ notifications }}</i>
</span>
</a>
</li>
{% else %}
<li class="nav-link"><a href="{% url 'auth_notification_list' %}">
<i class="fa fa-flag-o"></i></a>
<i class="fa fa-bell-o"></i></a>
</li>
{% endif %}
{% if user.is_authenticated %}
{% if user.is_staff %}
<li><a href="{% url 'admin:index' %}">Admin</a></li>
{% endif %}
<li><a href="{% url 'auth_logout_user' %}">{% trans "Logout" %}</a></li>
{% else %}
<li><a href="{% url 'auth_login_user' %}">{% trans "Login" %}</a></li>
{% endif %}
</ul>
</div>
<!-- /.navbar-top-links -->
@@ -96,149 +105,134 @@
</li>
<li>
<a {% ifequal request.path "/dashboard/" %} class="active" {% endifequal %}
href="{% url 'auth_dashboard' %}"><i
class="fa fa-dashboard fa-fw grayiconecolor"></i>{% trans " Dashboard" %}</a>
<a class="{% navactive request 'auth_dashboard' %}" href="{% url 'auth_dashboard' %}">
<i class="fa fa-dashboard fa-fw grayiconecolor"></i>{% trans " Dashboard" %}
</a>
</li>
<li>
<a {% ifequal request.path "/api_key_management/" %} class="active" {% endifequal %}
href="{% url 'auth_api_key_management' %}"><i
class="fa fa-key fa-fw grayiconecolor"></i>{% trans " Api Keys" %}</a>
<a class="{% navactive request 'auth_api_key_management auth_add_api_key' %}" href="{% url 'auth_api_key_management' %}">
<i class="fa fa-key fa-fw grayiconecolor"></i>{% trans " Api Keys" %}
</a>
</li>
<li>
<a {% ifequal request.path "/characters/" %} class="active" {% endifequal %}
href="{% url 'auth_characters' %}"><i
class="fa fa-users fa-fw grayiconecolor"></i>{% trans " Characters" %}</a>
<a class="{% navactive request 'auth_characters' %}" href="{% url 'auth_characters' %}">
<i class="fa fa-users fa-fw grayiconecolor"></i>{% trans " Characters" %}
</a>
</li>
{% if perms.auth.member %}
{% if STATE == MEMBER_STATE or user.is_superuser %}
<li>
<a {% ifequal request.path "/groups/" %} class="active" {% endifequal %}
href="{% url 'auth_groups' %}"><i
class="fa fa-cogs fa-sitemap grayiconecolor"></i>{% trans " Groups" %}</a>
<a class="{% navactive request 'auth_groups' %}" href="{% url 'auth_groups' %}">
<i class="fa fa-cogs fa-fw fa-sitemap grayiconecolor"></i>{% trans " Groups" %}
</a>
</li>
{% endif %}
<li>
<a {% ifequal request.path "/help/" %} class="active" {% endifequal %}
href="{% url 'auth_help' %}"><i
class="fa fa-question fa-fw grayiconecolor"></i>{% trans " Help" %}</a>
<a class="{% navactive request 'auth_help' %}" href="{% url 'auth_help' %}">
<i class="fa fa-question fa-fw grayiconecolor"></i>{% trans " Help" %}
</a>
</li>
<li class="text-center divider-horizontal">
<h5>{% trans "Aux Navigation" %}</h5>
</li>
{% if perms.auth.member or perms.auth.blue_member %}
{% if STATE in MEMBER_BLUE_STATE or user.is_superuser %}
<li>
<a {% ifequal request.path "/services/" %} class="active" {% endifequal %}
href="{% url 'auth_services' %}"><i
class="fa fa-cogs fa-fw grayiconecolor"></i>{% trans " Services" %}</a>
<a class="{% navactive request 'auth_services' %}" href="{% url 'auth_services' %}">
<i class="fa fa-cogs fa-fw grayiconecolor"></i>{% trans " Services" %}
</a>
</li>
{% endif %}
{% if not perms.auth.member or perms.auth.human_resources %}
{% if not STATE == MEMBER_STATE or perms.auth.human_resources %}
<li>
<a {% ifequal request.path "/hr_application_management/" %}
class="active" {% endifequal %}
href="{% url 'auth_hrapplications_view' %}"><i
class="fa fa-file-o fa-fw grayiconecolor"></i>{% trans " Applications" %}</a>
<a class="{% navactive request 'auth_hrapplications_view auth_hrapplication_create_view auth_hrapplication_personal_view auth_hrapplication_search auth_hrapplication_view' %}"
href="{% url 'auth_hrapplications_view' %}">
<i class="fa fa-file-o fa-fw grayiconecolor"></i>{% trans " Applications" %}
</a>
</li>
{% endif %}
{% if perms.auth.corp_apis or perms.auth.alliance_apis %}
<li>
<a {% ifequal request.path "/corputils/" %} class="active" {% endifequal %}
href="{% url 'auth_corputils' %}"><i
class="fa fa-share-alt fa-fw grayiconecolor"></i>{% trans " Corporation Stats" %}</a>
<a class="{% navactive request 'auth_corputils auth_corputils_search auth_corputils_corp_view auth_corputils_month' %}" href="{% url 'auth_corputils' %}">
<i class="fa fa-share-alt fa-fw grayiconecolor"></i>{% trans " Corporation Stats" %}
</a>
</li>
{% endif %}
{% if perms.auth.group_management %}
<li>
<a {% ifequal request.path "/user/group_management/" %} class="active" {% endifequal %}
href="{% url 'auth_group_management' %}"><i
class="fa fa-lock fa-sitemap grayiconecolor"></i>{% trans " Group Management" %}</a>
<a class="{% navactive request 'auth_group_management' %}" href="{% url 'auth_group_management' %}">
<i class="fa fa-lock fa-sitemap fa-fw grayiconecolor"></i>{% trans " Group Management" %}
</a>
</li>
{% endif %}
{% if perms.auth.member or perms.auth.blue_member %}
<li>
<a {% ifequal request.path "/fits" %} class="active" {% endifequal %}
href="{% url 'auth_fleet_fits' %}"><i
class="fa fa-bolt fa-fw grayiconecolor"></i>{% trans " Fleet Doctrines" %}</a>
</li>
{% if STATE in MEMBER_BLUE_STATE or user.is_superuser %}
<li>
<a {% ifequal request.path "/fleetup" %} class="active" {% endifequal %}
href="{% url 'auth_fleetup_view' %}"><i
class="fa fa-clock-o fa-fw grayiconecolor"></i> Fleet-Up</a>
<a class="{% navactive request 'auth_fleetup_view auth_fleetup_fittings auth_fleetup_fitting auth_fleetup_doctrines auth_fleetup_doctrine auth_fleetup_characters' %}" href="{% url 'auth_fleetup_view' %}">
<i class="fa fa-clock-o fa-fw grayiconecolor"></i> Fleet-Up
</a>
</li>
{% endif %}
{% if perms.auth.member or perms.auth.blue_member %}
{% if perms.auth.signature_view %}
<li>
<a {% ifequal request.path "/sigtracker" %} class="active" {% endifequal %}
href="{% url 'auth_signature_view' %}"><i
class="fa fa-compass fa-fw grayiconecolor"></i>{% trans " Wormhole Tracker" %}</a>
</li>
{% endif %}
{% if STATE in MEMBER_BLUE_STATE or user.is_superuser %}
{% if perms.auth.optimer_view %}
<li>
<a {% ifequal request.path "/optimer" %} class="active" {% endifequal %}
href="{% url 'auth_optimer_view' %}"><i
class="fa fa-exclamation fa-fw grayiconecolor"></i>{% trans " Fleet Operations" %}</a>
<a class="{% navactive request 'auth_optimer_view auth_add_optimer_view auth_edit_optimer' %}" href="{% url 'auth_optimer_view' %}">
<i class="fa fa-exclamation fa-fw grayiconecolor"></i>{% trans " Fleet Operations" %}
</a>
</li>
{% endif %}
{% if perms.auth.timer_view %}
<li>
<a {% ifequal request.path "/timer_management" %} class="active" {% endifequal %}
href="{% url 'auth_timer_view' %}"><i
class="fa fa-clock-o fa-fw grayiconecolor"></i>{% trans " Structure Timers" %}</a>
<a class="{% navactive request 'auth_timer_view auth_add_timer_view auth_edit_timer' %}" href="{% url 'auth_timer_view' %}">
<i class="fa fa-clock-o fa-fw grayiconecolor"></i>{% trans " Structure Timers" %}
</a>
</li>
{% endif %}
<li>
<a {% ifequal request.path "/fat/" %} class="active" {% endifequal %}
href="{% url 'auth_fatlink_view' %}"><i
class="fa fa-users fa-lightbulb-o grayiconecolor"></i> Fleet Activity Tracking</a>
</li>
<li>
<a {% ifequal request.path "/srp/" %} class="active" {% endifequal %}
href="{% url 'auth_srp_management_view' %}"><i
class="fa fa-money fa-fw grayiconecolor"></i>{% trans " Ship Replacement" %}</a>
<a class="{% navactive request 'auth_fatlink_view auth_fatlink_view_statistics auth_fatlink_view_statistics_month auth_fatlink_view_personal_statistics auth_fatlink_view_personal_statistics_year auth_fatlink_personal_statistics_month auth_fatlink_view_user_statistics_month auth_create_fatlink_view auth_modify_fatlink_view auth_click_fatlink_view' %}" href="{% url 'auth_fatlink_view' %}">
<i class="fa fa-users fa-lightbulb-o fa-fw grayiconecolor"></i> Fleet Activity Tracking
</a>
</li>
<li>
<a class="{% navactive request 'auth_srp_management_view auth_srp_management_all_view auth_srp_fleet_view auth_srp_fleet_add_view auth_srp_fleet_edit_view auth_srp_request_view auth_srp_request_update_amount_view' %}" href="{% url 'auth_srp_management_view' %}">
<i class="fa fa-money fa-fw grayiconecolor"></i>{% trans " Ship Replacement" %}
</a>
</li>
{% endif %}
<li class="text-center divider-horizontal">
<h5>{% trans "Util" %}</h5>
</li>
<li>
<a {% ifequal request.path "/user/password/" %} class="active" {% endifequal %}
href="{% url 'password_change' %}"><i
class="fa fa-lock fa-fw grayiconecolor"></i>{% trans "Change Password" %}</a>
<a class="{% navactive request 'password_change password_change_done' %}" href="{% url 'password_change' %}">
<i class="fa fa-lock fa-fw grayiconecolor"></i>{% trans "Change Password" %}
</a>
</li>
{% if perms.auth.member or perms.auth.blue_member %}
{% if STATE in MEMBER_BLUE_STATE or user.is_superuser %}
<li>
<a {% ifequal request.path "/tool/fleet_formatter_tool/" %}
class="active" {% endifequal %}
href="{% url 'auth_fleet_format_tool_view' %}"><i
class="fa fa-space-shuttle fa-fw grayiconecolor"></i>{% trans " Fleet Broadcast Formatter" %}</a>
<a class="{% navactive request 'auth_fleet_format_tool_view' %}" href="{% url 'auth_fleet_format_tool_view' %}">
<i class="fa fa-space-shuttle fa-fw grayiconecolor"></i>{% trans " Fleet Broadcast Formatter" %}
</a>
</li>
{% endif %}
{% if perms.auth.jabber_broadcast %}
<li>
<a {% ifequal request.path "/services/jabber_broadcast/" %}
class="active" {% endifequal %} href="{% url 'auth_jabber_broadcast_view' %}"><i
class="fa fa-lock fa-bullhorn grayiconecolor"></i>{% trans " Jabber Broadcast" %}</a>
<a class="{% navactive request 'auth_jabber_broadcast_view' %}" href="{% url 'auth_jabber_broadcast_view' %}">
<i class="fa fa-lock fa-fw fa-bullhorn grayiconecolor"></i>{% trans " Jabber Broadcast" %}
</a>
</li>
{% endif %}
</ul>
@@ -251,6 +245,12 @@
<div id="page-wrapper">
<div class="container">
{% if messages %}
<br>
{% for message in messages %}
<div class="alert alert-{{ message.level_tag}}">{{ message }}</div>
{% endfor %}
{% endif %}
{% block content %}
{% endblock content %}
</div>

37
stock/templates/public/login.html
View File

@@ -49,28 +49,41 @@
<body>
<div class="container" style="margin-top:150px">
<div class="col-md-4 col-md-offset-4">
{% if messages %}
{% for message in messages %}
<div class="alert alert-{{ message.level_tag}}">{{ message }}</div>
{% endfor %}
{% endif %}
<div class="panel panel-default panel-transparent">
<div class="panel-body">
{% if error %}
<div class="alert alert-danger" role="alert">{% trans "Username/Password Invalid" %}</div>
{% endif %}
<a href="{% url 'auth_register_user' %}">
<button class="btn btn- btn-success btn-block">{% trans "Register" %}</button>
</a>
<form class="form-signin" role="form" action="{% url 'auth_login_user' %}" method="POST">
{% csrf_token %}
<h2 class="form-signin-heading text-center">{% trans "Please sign in" %}</h2>
{{ form|bootstrap }}
<div class="col-md-6">
<div class="row">
<div class="col-md-12">
<button class="btn btn-lg btn-primary btn-block" type="submit">{% trans "Sign in" %}</button>
</div>
</div>
</form>
<div class="col-md-6">
<a href="{% url 'password_reset' %}">
<button class="btn btn-lg btn-danger btn-block">{% trans "Reset" %}</button>
</a>
<div class="row">
<div class="col-md-6">
<a href="{% url 'password_reset' %}" class="btn btn-lg btn-danger btn-block">{% trans "Reset" %}</a>
</div>
<div class="col-md-6">
<a href="{% url 'auth_register_user' %}" class="btn btn-success btn-block btn-lg">{% trans "Register" %}</a>
</div>
</div>
{% if EVE_SSO_CALLBACK_URL %}
<br>
<div class="col-md-12">
<p style="text-align:center">
<a href="{% url 'auth_sso_login' %}">
<img src="{% static 'img/sso/EVE_SSO_Login_Buttons_Large_Black.png' %}" border=0>
</a>
</p>
</div>
{% endif %}
</div>
</div>

39
stock/templates/registered/addsignature.html
View File

@@ -1,39 +0,0 @@
{% extends "public/base.html" %}
{% load bootstrap %}
{% load staticfiles %}
{% load i18n %}
{% block title %}Alliance Auth - Signature Create{% endblock %}
{% block page_title %}{% trans "Create Signature" %}{% endblock page_title %}
{% block extra_css %}
<link href="{% static 'css/jquery.datetimepicker.css' %}" rel="stylesheet" type="text/css">{% endblock extra_css %}
{% block content %}
<div class="col-lg-12">
<h1 class="page-header text-center">{% trans "Create Signature" %}</h1>
<div class="container-fluid">
<div class="col-md-4 col-md-offset-4">
<div class="row">
<form class="form-signin" role="form" action="" method="POST">
{% csrf_token %}
{{ form|bootstrap }}
<br/>
<button class="btn btn-lg btn-primary btn-block" type="submit">{% trans "Create Signature" %}</button>
</form>
</div>
</div>
</div>
</div>
{% endblock content %}
{% block extra_script %}
$('#id_eve_time').datetimepicker({
maskInput: true,
format: 'Y-m-d H:i',minDate:0
});
{% endblock extra_script %}

14
stock/templates/registered/apikeymanagment.html
View File

@@ -17,9 +17,7 @@
{% endif %}
<h1 class="page-header text-center">{% trans "API Key Management" %}
<div class="text-right">
<a href="{% url 'auth_add_api_key' %}">
<button type="button" class="btn btn-success">{% trans "Add Key" %}</button>
</a>
<a href="{% url 'auth_add_api_key' %}" class="btn btn-success">{% trans "Add Key" %}</a>
</div>
</h1>
<table class="table table-bordered">
@@ -33,13 +31,11 @@
<td class="text-center">{{ pair.api_id }}</td>
<td class="text-center">{{ pair.api_key }}</td>
<td class="text-center">
<a href="/refresh_api_pair/{{ pair.api_id }}">
<button type="button" class="btn btn-success"><span
class="glyphicon glyphicon-refresh"></span></button>
<a href="{% url 'auth_user_refresh_api' pair.api_id %}" class="btn btn-success">
<span class="glyphicon glyphicon-refresh"></span>
</a>
<a href="/delete_api_pair/{{ pair.api_id }}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
<a href="{% url 'auth_api_key_removal' pair.api_id %}" class="btn btn-danger">
<span class="glyphicon glyphicon-remove"></span>
</a>
</td>
</tr>

15
stock/templates/registered/characters.html
View File

@@ -30,15 +30,11 @@
{{ character.character_name }}
</div>
<div class="text-right col-md-4">
<a href="/main_character_change/{{ character.character_id }}">
<a href="{% url 'auth_main_character_change' character.character_id %}" class="btn btn-default btn-xs">
{% ifequal character.character_id authinfo.main_char_id %}
{% blocktrans %}<button type="button" class="btn btn-default btn-xs">
Refresh Primary
</button>{% endblocktrans %}
{% blocktrans %}Refresh Primary{% endblocktrans %}
{% else %}
{% blocktrans %}<button type="button" class="btn btn-primary btn-xs">Make
Primary
</button>{% endblocktrans %}
{% blocktrans %}Make Primary{% endblocktrans %}
{% endifequal %}
</a>
</div>
@@ -48,9 +44,8 @@
</div>
<div class="panel-body">
<div class="col-lg-5 col-sm-2"><img class=
"ra-avatar img-responsive" src=
"https://image.eveonline.com/Character/{{ character.character_id }}_128.jpg">
<div class="col-lg-5 col-sm-2">
<img class="ra-avatar img-responsive" src="https://image.eveonline.com/Character/{{ character.character_id }}_128.jpg">
</div>
<div class="col-lg-7 col-sm-2">

8
stock/templates/registered/corputils.html
View File

@@ -52,7 +52,7 @@
<ul class="dropdown-menu scrollable">
{% for membercorpid, membercorpname in membercorplist %}
<li>
<a href="/corputils/{{ membercorpid }}/">{{ membercorpname }}</a>
<a href="{% url 'auth_corputils_corp_view' membercorpid %}">{{ membercorpname }}</a>
</li>
{% endfor %}
</ul>
@@ -159,10 +159,8 @@
<td>
{% for apiinfo in player.apilist %}
<p>
<a href="{{ JACK_KNIFE_URL }}?usid={{ apiinfo.api_id }}&apik={{ apiinfo.api_key }}"
target="_blank">
<button type="button" class="btn btn-primary">{% trans "API JackKnife" %}
</button>
<a href="{{ JACK_KNIFE_URL }}?usid={{ apiinfo.api_id }}&apik={{ apiinfo.api_key }}" target="_blank" class="btn btn-primary">
{% trans "API JackKnife" %}
</a>
</p>
{% endfor %}

6
stock/templates/registered/corputilssearchview.html
View File

@@ -13,7 +13,7 @@
{% if perms.auth.corputils %}
<h1 class="page-header text-center">{% trans "Member Search Results" %}
</h1>
<h2 class="text-center"><a href="{% url 'auth_corputils' %}{{ corp.corporation_id }}">{{ corp.corporation_name }}</a></h2>
<h2 class="text-center"><a href="{% url 'auth_corputils_corp_view' corp.corporation_id %}">{{ corp.corporation_name }}</a></h2>
<div class="container-fluid">
<div class="panel panel-default">
@@ -21,10 +21,10 @@
<div class="container-fluid">
<ul class="nav navbar-nav navbar-wide">
<li style="float: right">
<form class="navbar-form navbar-right" role="search" action={% url 'auth_corputils_search' %}{{ corp.corporation_id }}/ method="POST">
<form class="navbar-form navbar-right" role="search" action="{% url 'auth_corputils_search_corp' corp.corporation_id %}" method="POST">
<div class="form-group">
{% csrf_token %}
{{ search_form.as_table }}
{{ search_form|bootstrap }}
</div>
<button class="btn btn-default" type="submit">{% trans "Search" %}</button>
</form>

7
stock/templates/registered/dashboard.html
View File

@@ -7,7 +7,7 @@
<div class="col-lg-12">
<h1 class="page-header text-center">{% trans "Dashboard" %}</h1>
{% if perms.auth.member %}
{% if STATE == MEMBER_STATE or user.is_superuser%}
<div class="col-lg-12 container" id="example">
@@ -19,9 +19,8 @@
<div class="panel-heading">{% trans "Main character" %}</div>
<div class="panel-body">
<div class="col-lg-5 col-sm-2"><img class=
"ra-avatar img-responsive" src=
"https://image.eveonline.com/Character/{{ character.character_id }}_128.jpg">
<div class="col-lg-5 col-sm-2">
<img class="ra-avatar img-responsive" src="https://image.eveonline.com/Character/{{ character.character_id }}_128.jpg">
</div>
<div class="col-lg-7 col-sm-2">

35
stock/templates/registered/discord.html
View File

@@ -1,35 +0,0 @@
{% extends "public/base.html" %}
{% load bootstrap %}
{% load staticfiles %}
{% load i18n %}
{% block title %}Alliance Auth{% endblock %}
{% block page_title %}{% trans "Jabber Broadcast" %}{% endblock page_title %}
{% block extra_css %}{% endblock extra_css %}
{% block content %}
<div class="col-lg-12">
<h1 class="page-header text-center">{% trans "Discord Connection" %}</h1>
<div class="container-fluid">
<div class="col-md-4 col-md-offset-4">
<div class="row">
{% if success %}
<div class="alert alert-success" role="alert">{% trans "Account Linked" %}</div>
{% endif %}
<p>{% trans "Enter your Discord account credentials below. These are not stored: they are needed to determine your user ID and make you join the server." %}</p>
<p>{% trans "If you do not have a Discord account, please create one <a href="https://discordapp.com">on their site</a> and report back with the credentials." %}</p>
<form class="form-signin" role="form" action="" method="POST"
onsubmit="submitbutton.disabled = true; return true;">
{% csrf_token %}
{{ form|bootstrap }}
<br/>
<button class="btn btn-lg btn-primary btn-block" name="submitbutton" type="submit">{% trans "Connect" %}</button>
</form>
</div>
</div>
</div>
</div>
{% endblock content %}

8
stock/templates/registered/fatlinkpersonalmonthlystatisticsview.html
View File

@@ -11,12 +11,8 @@
<h1 class="page-header text-center">{% trans "Participation data statistics for" %} {{ month }}, {{ year }}
{% if char_id %}
<div class="text-right">
<a href="{% url 'auth_fatlink_view_user_statistics_month' char_id previous_month|date:"Y" previous_month|date:"m" %}">
<button type="button" class="btn btn-info">{% trans "Previous month" %}</button>
</a>
<a href="{% url 'auth_fatlink_view_user_statistics_month' char_id next_month|date:"Y" next_month|date:"m" %}">
<button type="button" class="btn btn-info">{% trans "Next month" %}</button>
</a>
<a href="{% url 'auth_fatlink_view_user_statistics_month' char_id previous_month|date:"Y" previous_month|date:"m" %}" class="btn btn-info">{% trans "Previous month" %}</a>
<a href="{% url 'auth_fatlink_view_user_statistics_month' char_id next_month|date:"Y" next_month|date:"m" %}" class="btn btn-info">{% trans "Next month" %}</a>
</div>
{% endif %}
</h1>

8
stock/templates/registered/fatlinkpersonalstatisticsview.html
View File

@@ -10,13 +10,9 @@
<div class="col-lg-12">
<h1 class="page-header text-center">{% trans "Participation data statistics for" %} {{ year }}
<div class="text-right">
<a href="{% url 'auth_fatlink_view_personal_statistics_year' previous_year %}">
<button type="button" class="btn btn-info">{% trans "Previous year" %}</button>
</a>
<a href="{% url 'auth_fatlink_view_personal_statistics_year' previous_year %}" class="btn btn-info">{% trans "Previous year" %}</a>
{% if next_year %}
<a href="{% url 'auth_fatlink_view_personal_statistics_year' next_year %}">
<button type="button" class="btn btn-info">{% trans "Next year" %}</button>
</a>
<a href="{% url 'auth_fatlink_view_personal_statistics_year' next_year %}" class="btn btn-info">{% trans "Next year" %}</a>
{% endif %}
</div>
</h1>

8
stock/templates/registered/fatlinkstatisticsview.html
View File

@@ -10,13 +10,9 @@
<div class="col-lg-12">
<h1 class="page-header text-center">{% blocktrans %}Participation data statistics for {{ month }}, {{ year }}{% endblocktrans %}
<div class="text-right">
<a href="{% url 'auth_fatlink_view_statistics_month' previous_month|date:"Y" previous_month|date:"m" %}">
<button type="button" class="btn btn-info">{% trans "Previous month" %}</button>
</a>
<a href="{% url 'auth_fatlink_view_statistics_month' previous_month|date:"Y" previous_month|date:"m" %}" class="btn btn-info">{% trans "Previous month" %}</a>
{% if next_month %}
<a href="{% url 'auth_fatlink_view_statistics_month' next_month|date:"Y" next_month|date:"m" %}">
<button type="button" class="btn btn-info">{% trans "Next month" %}</button>
</a>
<a href="{% url 'auth_fatlink_view_statistics_month' next_month|date:"Y" next_month|date:"m" %}" class="btn btn-info">{% trans "Next month" %}</a>
{% endif %}
</div>
</h1>

17
stock/templates/registered/fatlinkview.html
View File

@@ -16,8 +16,8 @@
</h4>
</th>
<th class="col-md-1">
<a href="{% url 'auth_fatlink_view_personal_statistics' %}">
<button type="button" class="btn btn-info">{% trans "Personal statistics" %}</button>
<a href="{% url 'auth_fatlink_view_personal_statistics' %}" class="btn btn-info">
{% trans "Personal statistics" %}
</a>
</th>
</tr>
@@ -53,13 +53,13 @@
</h4>
</th>
<th class="col-md-1">
<a href="{% url 'auth_fatlink_view_statistics' %}">
<button type="button" class="btn btn-info">{% trans "View statistics" %}</button>
<a href="{% url 'auth_fatlink_view_statistics' %}" class="btn btn-info">
{% trans "View statistics" %}
</a>
</th>
<th class="col-md-1">
<a href="{% url 'auth_create_fatlink_view' %}">
<button type="button" class="btn btn-success">{% trans "Create fatlink" %}</button>
<a href="{% url 'auth_create_fatlink_view' %}" class="btn btn-success">
{% trans "Create fatlink" %}
</a>
</th>
</tr>
@@ -81,9 +81,8 @@
<td class="text-center">{{ link.fatdatetime }}</td>
<td class="text-center">{{ link.duration }}</td>
<td class="text-center">
<a href="{% url 'auth_modify_fatlink_view' %}{{ link.hash }}/{{ link.name }}">
<button type="button" class="btn btn-info"><span
class="glyphicon glyphicon-edit"></span></button>
<a href="{% url 'auth_modify_fatlink_view' %}{{ link.hash }}/{{ link.name }}" class="btn btn-info">
<span class="glyphicon glyphicon-edit"></span>
</a>
</td>
</tr>

20
stock/templates/registered/fleetfits.html
View File

@@ -1,20 +0,0 @@
{% extends "public/base.html" %}
{% load bootstrap %}
{% load staticfiles %}
{% load i18n %}
{% block title %}Alliance Auth{% endblock %}
{% block page_title %}{% trans "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 %}

19
stock/templates/registered/fleetfits.html.example
View File

@@ -1,19 +0,0 @@
{% 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
stock/templates/registered/fleetup.html
View File

@@ -22,10 +22,10 @@
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<li class="active"><a href="#">{% trans "Ops and Timers" %} <span class="sr-only">(current)</span></a></li>
<li><a href="/fleetup/doctrines/">{% trans "Doctrines" %}</a></li>
<li><a href="/fleetup/fittings/">{% trans "Fittings" %}</a></li>
<li><a href="{% url 'auth_fleetup_doctrines' %}">{% trans "Doctrines" %}</a></li>
<li><a href="{% url 'auth_fleetup_fittings' %}">{% trans "Fittings" %}</a></li>
{% if perms.auth.human_resources %}
<li><a href="/fleetup/characters/">{% trans "Characters" %}</a></li>
<li><a href="{% url 'auth_fleetup_characters' %}">{% trans "Characters" %}</a></li>
{% endif %}
<li></li>
</ul>
@@ -82,7 +82,7 @@
{% if start.doctrine %}
{% for doctrine in start.doctrine %}
<a href="/fleetup/doctrines/{{ doctrine.Id }}/" class="label label-success">{{ doctrine.Name }}</a>
<a href="{% url 'auth_fleetup_doctrine' doctrine.Id %}" class="label label-success">{{ doctrine.Name }}</a>
{% endfor %}

10
stock/templates/registered/fleetupcharacters.html
View File

@@ -22,11 +22,11 @@
</div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<li><a href="/fleetup/">{% trans "Ops and Timers" %}</a></li>
<li><a href="/fleetup/doctrines/">{% trans "Doctrines" %}</a></li>
<li><a href="/fleetup/fittings/">{% trans "Fittings" %}</a></li>
<li><a href="{% url 'auth_fleetup_view' %}">{% trans "Ops and Timers" %}</a></li>
<li><a href="{% url 'auth_fleetup_doctrines' %}">{% trans "Doctrines" %}</a></li>
<li><a href="{% url 'auth_fleetup_fittings' %}">{% trans "Fittings" %}</a></li>
<li class="active"><a href="/fleetup/characters/">{% trans "Characters" %} <span class="sr-only">(current)</span></a></li>
<li class="active"><a href="{% url 'auth_fleetup_characters' %}">{% trans "Characters" %} <span class="sr-only">(current)</span></a></li>
<li></li>
</ul>
@@ -69,4 +69,4 @@
</div>
{% endif %}
</div>
{% endblock content %}
{% endblock content %}

10
stock/templates/registered/fleetupdoctrine.html
View File

@@ -21,11 +21,11 @@
</div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<li><a href="/fleetup/">{% trans "Ops and Timers" %}</a></li>
<li class="active"><a href="/fleetup/doctrines/">{% trans "Doctrines" %} <span class="sr-only">(current)</span></a></li>
<li><a href="/fleetup/fittings/">{% trans "Fittings" %}</a></li>
<li><a href="{% url 'auth_fleetup_view' %}">{% trans "Ops and Timers" %}</a></li>
<li class="active"><a href="{% url 'auth_fleetup_doctrines' %}">{% trans "Doctrines" %} <span class="sr-only">(current)</span></a></li>
<li><a href="{% url 'auth_fleetup_fittings' %}">{% trans "Fittings" %}</a></li>
{% if perms.auth.corp_stats %}
<li><a href="/fleetup/characters/">{% trans "Characters" %}</a></li>
<li><a href="{% url 'auth_fleetup_characters' %}">{% trans "Characters" %}</a></li>
{% endif %}
<li></li>
</ul>
@@ -56,7 +56,7 @@
{% for item in Role.list %}
<tr>
<td>
<a href="/fleetup/fittings/{{ item.FittingId }}/"><img src="https://image.eveonline.com/InventoryType/{{ item.EveTypeId }}_32.png"></a>
<a href="{% url 'auth_fleetup_fitting' item.FittingId %}"><img src="https://image.eveonline.com/InventoryType/{{ item.EveTypeId }}_32.png"></a>
</td>
<td>
{{ item.Name }}

12
stock/templates/registered/fleetupdoctrinesview.html
View File

@@ -21,11 +21,11 @@
</div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<li><a href="/fleetup/">{% trans "Ops and Timers" %}</a></li>
<li class="active"><a href="/fleetup/doctrines/">{% trans "Doctrines" %} <span class="sr-only">(current)</span></a></li>
<li><a href="/fleetup/fittings/">{% trans "Fittings" %}</a></li>
<li><a href="{% url 'auth_fleetup_view' %}">{% trans "Ops and Timers" %}</a></li>
<li class="active"><a href="{% url 'auth_fleetup_doctrines' %}">{% trans "Doctrines" %} <span class="sr-only">(current)</span></a></li>
<li><a href="{% url 'auth_fleetup_fittings' %}">{% trans "Fittings" %}</a></li>
{% if perms.auth.corp_stats %}
<li><a href="/fleetup/characters/">{% trans "Characters" %}</a></li>
<li><a href="{% url 'auth_fleetup_characters' %}">{% trans "Characters" %}</a></li>
{% endif %}
<li></li>
</ul>
@@ -56,13 +56,13 @@
<tr>
<td>
<a href="/fleetup/doctrines/{{ item.DoctrineId }}/"><img src="https://image.eveonline.com/InventoryType/{{ item.IconId }}_32.png"></a>
<a href="{% url 'auth_fleetup_doctrine' item.DoctrineId %}"><img src="https://image.eveonline.com/InventoryType/{{ item.IconId }}_32.png"></a>
</td>
<td>
{{ item.Name }}
</td>
<td>
<a href="/fleetup/doctrines/{{ item.DoctrineId }}/" class="btn btn-info btn-sm">{{ item.FolderName }}</a>
<a href="{% url 'auth_fleetup_doctrine' item.DoctrineId %}" class="btn btn-info btn-sm">{{ item.FolderName }}</a>
</td>
<td>
{{ item.LastUpdatedString }}

12
stock/templates/registered/fleetupfitting.html
View File

@@ -21,11 +21,11 @@
</div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<li><a href="/fleetup/">{% trans "Ops and Timers" %}</a></li>
<li><a href="/fleetup/doctrines/">{% trans "Doctrines" %}</a></li>
<li class="active"><a href="/fleetup/fittings/">{% trans "Fittings" %} <span class="sr-only">(current)</span></a></li>
<li><a href="{% url 'auth_fleetup_view' %}">{% trans "Ops and Timers" %}</a></li>
<li><a href="{% url 'auth_fleetup_doctrines' %}">{% trans "Doctrines" %}</a></li>
<li class="active"><a href="{% url 'auth_fleetup_fittings' %}">{% trans "Fittings" %} <span class="sr-only">(current)</span></a></li>
{% if perms.auth.corp_stats %}
<li><a href="/fleetup/characters/">{% trans "Characters" %}</a></li>
<li><a href="{% url 'auth_fleetup_characters' %}">{% trans "Characters" %}</a></li>
{% endif %}
<li></li>
</ul>
@@ -82,7 +82,7 @@
{% for arbit, orbit in doctrines_list.items %}
{% for fitting in orbit.Data %}
<a href="/fleetup/fittings/{{ fitting.FittingId }}/" class="list-group-item">
<a href="{% url 'auth_fleetup_fitting' fitting.FittingId %}" class="list-group-item">
<h4 class="list-group-item-heading">{{ fitting.Name }}<span class="pull-right"><img src="https://image.eveonline.com/InventoryType/{{ fitting.EveTypeId }}_32.png" class="img-circle"></span></h4>
<p class="list-group-item-heading">{{ fitting.Role }} - {{ fitting.ShipType }}</p>
@@ -150,4 +150,4 @@
</div>
</div>
{% endblock content %}
{% endblock content %}

12
stock/templates/registered/fleetupfittingsview.html
View File

@@ -21,11 +21,11 @@
</div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<li><a href="/fleetup/">{% trans "Ops and Timers" %}</a></li>
<li><a href="/fleetup/doctrines/">{% trans "Doctrines" %}</a></li>
<li class="active"><a href="/fleetup/fittings/">{% trans "Fittings" %} <span class="sr-only">(current)</span></a></li>
<li><a href="{% url 'auth_fleetup_view' %}">{% trans "Ops and Timers" %}</a></li>
<li><a href="{% url 'auth_fleetup_doctrines' %}">{% trans "Doctrines" %}</a></li>
<li class="active"><a href="{% url 'auth_fleetup_fittings' %}">{% trans "Fittings" %} <span class="sr-only">(current)</span></a></li>
{% if perms.auth.corp_stats %}
<li><a href="/fleetup/characters/">{% trans "Characters" %}</a></li>
<li><a href="{% url 'auth_fleetup_characters' %}">{% trans "Characters" %}</a></li>
{% endif %}
<li></li>
</ul>
@@ -47,7 +47,7 @@
<tr>
<td>
<a href="/fleetup/fittings/{{ fittings.fitting_id }}/"><img src="https://image.eveonline.com/InventoryType/{{ fittings.icon_id }}_32.png"></a>
<a href="{% url 'auth_fleetup_fitting' fittings.fitting_id %}"><img src="https://image.eveonline.com/InventoryType/{{ fittings.icon_id }}_32.png"></a>
</td>
<td>
{{ fittings.name }}
@@ -76,4 +76,4 @@
</div>
</div>
{% endblock content %}
{% endblock content %}

24
stock/templates/registered/groupmanagement.html
View File

@@ -26,16 +26,12 @@
<td class="text-center">{{ acceptrequest.main_char.character_name }}</td>
<td class="text-center">{{ acceptrequest.group.name }}</td>
<td class="text-center">
<a href="/group/request/accept/{{ acceptrequest.id }}">
<button type="button" class="btn btn-success">
{% trans "Accept" %}
</button>
<a href="{% url 'auth_group_accept_request' acceptrequest.id %}" class="btn btn-success">
{% trans "Accept" %}
</a>
<a href="/group/request/reject/{{ acceptrequest.id }}">
<button type="button" class="btn btn-danger">
{% trans "Reject" %}
</button>
<a href="{% url 'auth_group_reject_request' acceptrequest.id %}" class="btn btn-danger">
{% trans "Reject" %}
</a>
</td>
</tr>
@@ -56,16 +52,12 @@
<td class="text-center">{{ leaverequest.main_char.character_name }}</td>
<td class="text-center">{{ leaverequest.group.name }}</td>
<td class="text-center">
<a href="/group/leave_request/accept/{{ leaverequest.id }}">
<button type="button" class="btn btn-success">
{% trans "Accept" %}
</button>
<a href="{% url 'auth_group_leave_accept_request' leaverequest.id %}" class="btn btn-success">
{% trans "Accept" %}
</a>
<a href="/group/leave_request/reject/{{ leaverequest.id }}">
<button type="button" class="btn btn-danger">
{% trans "Reject" %}
</button>
<a href="{% url 'auth_group_leave_reject_request' leaverequest.id %}" class="btn btn-danger">
{% trans "Reject" %}
</a>
</td>
</tr>

14
stock/templates/registered/groups.html
View File

@@ -10,7 +10,7 @@
{% block content %}
<div class="col-lg-12">
<h1 class="page-header text-center">{% trans "Available Groups" %}</h1>
{% if perms.auth.member %}
{% if STATE == MEMBER_STATE or user.is_superuser %}
<table class="table table-bordered">
<tr>
<th class="text-center">{% trans "GroupID" %}</th>
@@ -27,10 +27,8 @@
<td class="text-center">
{% if pair.0 in user.groups.all %}
{% if pair.2 == "" %}
<a href="/group/request_leave/{{ pair.0.id }}">
<button type="button" class="btn btn-danger">
{% trans "Leave" %}
</button>
<a href="{% url 'auth_group_request_leave' pair.0.id %}" class="btn btn-danger">
{% trans "Leave" %}
</a>
{% else %}
<button type="button" class="btn btn-primary" disabled>
@@ -38,10 +36,8 @@
</button>
{% endif %}
{% elif pair.2 == "" %}
<a href="/group/request_add/{{ pair.0.id }}">
<button type="button" class="btn btn-success">
{% trans "Request" %}
</button>
<a href="{% url 'auth_group_request_add' pair.0.id %}" class="btn btn-success">
{% trans "Request" %}
</a>
{% else %}
<button type="button" class="btn btn-primary" disabled>

22
stock/templates/registered/hrapplicationmanagement.html
View File

@@ -10,7 +10,7 @@
{% block content %}
<div class="col-lg-12">
{% if not perms.auth.member %}
{% if not STATE == MEMBER_STATE and not user.is_superuser %}
<h1 class="page-header text-center">{% trans "Personal Applications" %}
<div class="text-right">
{% if create %}
@@ -41,15 +41,13 @@
{% endif %}
</td>
<td class="text-center">
<a href="/hr_application_personal_view/{{ personal_app.id }}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-eye-open"></span></button>
<a href="{% url 'auth_hrapplication_personal_view' personal_app.id %}"class="btn btn-primary">
<span class="glyphicon glyphicon-eye-open"></span>
</a>
{% if personal_app.approved == None %}
<a href="/hr_application_personal_removal/{{ personal_app.id }}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
<a href="{% url 'auth_hrapplication_personal_removal' personal_app.id %}" class="btn btn-danger">
<span class="glyphicon glyphicon-remove"></span>
</a>
{% endif %}
</td>
@@ -102,9 +100,8 @@
{% endif %}
</td>
<td class="text-center">
<a href="/hr_application_view/{{ app.id }}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-eye-open"></span></button>
<a href="{% url 'auth_hrapplication_view' app.id %}" class="btn btn-primary">
<span class="glyphicon glyphicon-eye-open"></span>
</a>
</td>
</tr>
@@ -143,9 +140,8 @@
{% endif %}
</td>
<td class="text-center">
<a href="/hr_application_view/{{ app.id }}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-eye-open"></span></button>
<a href="{% url 'auth_hrapplication_view' app.id %}" class="btn btn-primary">
<span class="glyphicon glyphicon-eye-open"></span>
</a>
</td>
</tr>

5
stock/templates/registered/hrapplicationsearchview.html
View File

@@ -45,9 +45,8 @@
{% endif %}
</td>
<td class="text-center">
<a href="/hr_application_view/{{ app.id }}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-eye-open"></span></button>
<a href="{% url 'auth_hrapplication_view' app.id %}" class="btn btn-primary">
<span class="glyphicon glyphicon-eye-open"></span>
</a>
</td>
</tr>

8
stock/templates/registered/hrapplicationview.html
View File

@@ -76,16 +76,16 @@
{% if app.approved == None %}
{% if app.reviewer == user %}
{% if perms.hrapplications.approve_application %}
<a href="/hr_application_approve/{{ app.id }}" class="btn btn-success">{% trans "Approve" %}</a>
<a href="{% url 'auth_hrapplication_approve' app.id %}" class="btn btn-success">{% trans "Approve" %}</a>
{% endif %}
{% if perms.hrapplications.reject_application %}
<a href="/hr_application_reject/{{ app.id }}" class="btn btn-danger">{% trans "Reject" %}</a>
<a href="{% url 'auth_hrapplication_reject' app.id %}" class="btn btn-danger">{% trans "Reject" %}</a>
{% endif %}
{% if perms.hrapplications.delete_application %}
<a href="/hr_application_remove/{{ app.id }}" class="btn btn-danger">{% trans "Delete" %}</a>
<a href="{% url 'auth_hrapplication_remove' app.id %}" class="btn btn-danger">{% trans "Delete" %}</a>
{% endif %}
{% elif not app.reviewer %}
<a href="/hr_mark_in_progress/{{ app.id }}" class="btn btn-warning">{% trans "Mark in Progress" %}</a>
<a href="{% url 'auth_hrapplication_mark_in_progress' app.id %}" class="btn btn-warning">{% trans "Mark in Progress" %}</a>
{% endif %}
{% endif %}
{% if perms.hrapplications.add_applicationcomment %}

33
stock/templates/registered/hrcreateapplication.html
View File

@@ -1,33 +0,0 @@
{% extends "public/base.html" %}
{% load bootstrap %}
{% load staticfiles %}
{% load i18n %}
{% block title %}Alliance Auth - Create Application{% endblock %}
{% block page_title %}{% trans "Create Application" %}{% endblock page_title %}
{% block extra_css %}{% endblock extra_css %}
{% block content %}
<div class="col-lg-12">
<h1 class="page-header text-center">{% trans "Create Application" %}</h1>
<div class="container-fluid">
<div class="col-md-4 col-md-offset-4">
<div class="row">
{% if success %}
<div class="alert alert-success text-center" role="alert">{% trans "Application Submitted" %}</div>
{% else %}
<form class="form-signin" role="form" action="" method="POST">
{% csrf_token %}
{{ form|bootstrap }}
<br/>
<button class="btn btn-lg btn-primary btn-block" type="submit">{% trans "Submit Application" %}</button>
</form>
{% endif %}
</div>
</div>
</div>
</div>
{% endblock content %}

32
stock/templates/registered/notification_list.html
View File

@@ -13,6 +13,10 @@
<ul class="nav nav-tabs">
<li class="active"><a data-toggle="tab" href="#unread">{% trans "Unread" %} <b>({{unread|length}})</b></a></li>
<li><a data-toggle="tab" href="#read">{% trans "Read" %} <b>({{read|length}})</b></a></li>
<div class="text-right">
<a href="{% url 'auth_mark_all_notifications_read' %}" class="btn btn-primary">Mark All Read</a>
<a href="{% url 'auth_delete_all_read_notifications' %}" class="btn btn-danger">Delete All Read</a>
</div>
</ul>
<div class="tab-content">
<div id="unread" class="tab-pane fade in active">
@@ -22,22 +26,18 @@
<tr>
<th class="text-center">{% trans "Timestamp" %}</th>
<th class="text-center">{% trans "Title" %}</th>
<th class="text-center">{% trans "View" %}</th>
<th class="text-center">{% trans "Action" %}</th>
</tr>
{% for notif in unread %}
<tr class="{{ notif.level }}">
<td class="text-center">{{ notif.timestamp }}</td>
<td class="text-center">{{ notif.title }}</td>
<td class="text-center">
<a href="{% url 'auth_notification_view' notif.id %}">
<button type="button" class="btn btn-success" title="View">
<span class="glyphicon glyphicon-eye-open"></span>
</button>
<a href="{% url 'auth_notification_view' notif.id %}" class="btn btn-success" title="View">
<span class="glyphicon glyphicon-eye-open"></span>
</a>
<a href="{% url 'auth_remove_notification' notif.id %}">
<button type="button" class="btn btn-danger" title="remove">
<span class="glyphicon glyphicon-remove"></span>
</button>
<a href="{% url 'auth_remove_notification' notif.id %}" class="btn btn-danger" title="Remove">
<span class="glyphicon glyphicon-remove"></span>
</a>
</td>
</tr>
@@ -53,22 +53,18 @@
<tr>
<th class="text-center">{% trans "Timestamp" %}</th>
<th class="text-center">{% trans "Title" %}</th>
<th class="text-center">{% trans "View" %}</th>
<th class="text-center">{% trans "Action" %}</th>
</tr>
{% for notif in read %}
<tr class="{{ notif.level }}">
<td class="text-center">{{ notif.timestamp }}</td>
<td class="text-center">{{ notif.title }}</td>
<td class="text-center">
<a href="{% url 'auth_notification_view' notif.id %}">
<button type="button" class="btn btn-success" title="View">
<span class="glyphicon glyphicon-eye-open"></span>
</button>
<a href="{% url 'auth_notification_view' notif.id %}" class="btn btn-success" title="View">
<span class="glyphicon glyphicon-eye-open"></span>
</a>
<a href="{% url 'auth_remove_notification' notif.id %}">
<button type="button" class="btn btn-danger" title="remove">
<span class="glyphicon glyphicon-remove"></span>
</button>
<a href="{% url 'auth_remove_notification' notif.id %}" class="btn btn-danger" title="remove">
<span class="glyphicon glyphicon-remove"></span>
</a>
</td>
</tr>

42
stock/templates/registered/operationmanagement.html
View File

@@ -12,11 +12,9 @@
<div class="col-lg-12">
<h1 class="page-header text-center">{% trans "Fleet Operation Timers" %}
<div class="text-right">
<a href="{% url 'auth_add_optimer_view' %}">
{% if perms.auth.optimer_management %}
<button type="button" class="btn btn-success">{% trans "Create Operation" %}</button>
{% endif %}
</a>
{% if perms.auth.optimer_management %}
<a href="{% url 'auth_add_optimer_view' %}" class="btn btn-success">{% trans "Create Operation" %}</a>
{% endif %}
</div>
</h1>
<div class="col-lg-12 text-center">
@@ -44,11 +42,11 @@
</tr>
{% for ops in optimer %}
<tr>
<tr>
<td style="width:150px" class="text-center">{{ ops.operation_name }}</td>
<td style="width:150px" class="text-center">{{ ops.doctrine }}</td>
<td class="text-center">
<a href="http://evemaps.dotlan.net/system/{{ ops.system }}">{{ ops.system }}</a>
<a href="http://evemaps.dotlan.net/system/{{ ops.system }}">{{ ops.system }}</a>
</td>
<td style="width:150px" class="text-center">{{ ops.location }}</td>
<td style="width:150px" class="text-center" nowrap>{{ ops.start | date:"Y-m-d H:i" }}</td>
@@ -57,23 +55,19 @@
<td style="width:150px" class="text-center">{{ ops.fc }}</td>
<td style="width:150px" class="text-center">{{ ops.details }}</td>
<td style="width:150px" class="text-center">{{ ops.post_time}}</td>
{% if perms.auth.optimer_management %}
<td style="width:150px" class="text-center">{{ ops.eve_character }}</td>
<td class="text-center">
<a href="/remove_optimer/{{ ops.id }}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
</a>
<a href="/edit_optimer/{{ ops.id }}">
<button type="button" class="btn btn-info"><span
class="glyphicon glyphicon-pencil"></span></button>
</a>
</td>
{% endif %}
</tr>
{% endfor %}
{% if perms.auth.optimer_management %}
<td style="width:150px" class="text-center">{{ ops.eve_character }}</td>
<td class="text-center">
<a href="{% url 'auth_remove_optimer' ops.id %}" class="btn btn-danger">
<span class="glyphicon glyphicon-remove"></span>
</a>
<a href="{% url 'auth_edit_optimer' ops.id %}" class="btn btn-info">
<span class="glyphicon glyphicon-pencil"></span>
</a>
</td>
{% endif %}
</tr>
{% endfor %}
</tr>
</table>

23
stock/templates/registered/service_credentials.html Normal file
View File

@@ -0,0 +1,23 @@
{% extends "public/base.html" %}
{% load staticfiles %}
{% block page_title %}Credentials{% endblock page_title %}
{% block title %}Credentials{% endblock title%}
{% block content %}
<div class="col-lg-12">
<h1 class="page-header text-center">{{ service }} Credentials</h1>
<div class="container-fluid">
<div class="col-lg-4 col-lg-offset-4">
<form class="form-signin">
{% for key, value in credentials.items %}
<div class="form-group">
<label class="control-label" for="id_{{ key }}">{{ key|capfirst }}</label>
<input class="form-control" value="{{ value }}" readonly>
</div>
{% endfor %}
</form>
<a href="{% url 'auth_services' %}" class="btn btn-lg btn-block btn-primary" title="Continue">Continue</a>
</div>
</div>
</div>
{% endblock %}

9
stock/templates/registered/service_password.html
View File

@@ -11,15 +11,6 @@
{% block content %}
<div class="col-lg-12">
<h1 class="page-header text-center">{% blocktrans %}Set {{service}} Password{% endblocktrans %}</h1>
{% if error %}
<div class="container-fluid">
<div class="col-md-4 col-md-offset-4">
<div class="row">
<div class="alert alert-danger text-center" role="alert">{{error}}</div>
</div>
</div>
</div>
{% endif %}
<div class="container-fluid">
<div class="col-md-4 col-md-offset-4">
<div class="row">

631
stock/templates/registered/services.html
View File

@@ -10,7 +10,7 @@
{% block content %}
<div class="col-lg-12">
<h1 class="page-header text-center">{% trans "Available Services" %}</h1>
{% if ENABLE_AUTH_DISCORD or ENABLE_BLUE_DISCORD %}
{% if SHOW_DISCORD %}
{% if request.user.is_superuser %}
<div class="text-center">
<a type="button" class="btn btn-lg btn-success" href="{% url 'auth_discord_add_bot' %}">{% trans "Link Discord" %} Server</a>
@@ -18,629 +18,204 @@
<br>
{% endif %}
{% endif %}
{% if perms.auth.blue_member %}
<table class="table table-bordered">
<tr>
<th class="text-center">{% trans "Service" %}</th>
<th class="text-center">{% trans "Username" %}</th>
<th class="text-center">{% trans "Password" %}</th>
<th class="text-center">{% trans "Domain" %}</th>
<th class="text-center">{% trans "Action" %}</th>
</tr>
{% if ENABLE_BLUE_FORUM %}
<tr>
<td class="text-center">Forums</td>
<td class="text-center">{{ authinfo.forum_username }}</td>
<td class="text-center">{{ authinfo.forum_password }}</td>
<td class="text-center"><a href="{{ FORUM_URL }}">{{ FORUM_URL }}</a></td>
<td class="text-center">
{% ifequal authinfo.forum_username "" %}
<a href="{% url 'auth_activate_forum' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button>
</a>
{% else %}
<a href="{% url 'auth_set_forum_password' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-pencil"></span></button>
</a>
<a href="{% url 'auth_reset_forum_password' %}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-refresh"></span></button>
</a>
<a href="{% url 'auth_deactivate_forum' %}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
</a>
{% endifequal %}
</td>
</tr>
{% endif %}
{% if ENABLE_BLUE_SMF %}
<tr>
<td class="text-center">SMF Forums</td>
<td class="text-center">{{ authinfo.smf_username }}</td>
<td class="text-center">{{ authinfo.smf_password }}</td>
<td class="text-center"><a href="{{ SMF_URL }}">{{ SMF_URL }}</a></td>
<td class="text-center">
{% ifequal authinfo.smf_username "" %}
<a href="{% url 'auth_activate_smf' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button>
</a>
{% else %}
<a href="{% url 'auth_set_smf_password' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-pencil"></span></button>
</a>
<a href="{% url 'auth_reset_smf_password' %}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-refresh"></span></button>
</a>
<a href="{% url 'auth_deactivate_smf' %}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
</a>
{% endifequal %}
</td>
</tr>
{% endif %}
{% if ENABLE_BLUE_IPBOARD %}
<tr>
<td class="text-center">IPBoard Forums</td>
<td class="text-center">{{ authinfo.ipboard_username }}</td>
<td class="text-center">{{ authinfo.ipboard_password }}</td>
<td class="text-center"><a href="{{ FORUM_URL }}">{{ FORUM_URL }}</a></td>
<td class="text-center">
{% ifequal authinfo.ipboard_username "" %}
<a href="{% url 'auth_activate_ipboard' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button>
</a>
{% else %}
<a href="{% url 'auth_set_ipboard_password' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-pencil"></span></button>
</a>
<a href="{% url 'auth_reset_ipboard_password' %}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-refresh"></span></button>
</a>
<a href="{% url 'auth_deactivate_ipboard' %}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
</a>
{% endifequal %}
</td>
</tr>
{% endif %}
{% if ENABLE_BLUE_XENFORO %}
<tr>
<td class="text-center">XenForo Forums</td>
<td class="text-center">{{ authinfo.xenforo_username }}</td>
<td class="text-center">{{ authinfo.xenforo_password }}</td>
<td class="text-center"><a href="{{ FORUM_URL }}">{{ FORUM_URL }}</a></td>
<td class="text-center">
{% ifequal authinfo.xenforo_username "" %}
<a href="{% url 'auth_activate_xenforo' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button>
</a>
{% else %}
<a href="{% url 'auth_set_xenforo_password' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-pencil"></span></button>
</a>
<a href="{% url 'auth_reset_xenforo_password' %}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-refresh"></span></button>
</a>
<a href="{% url 'auth_deactivate_xenforo' %}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
</a>
{% endifequal %}
</td>
</tr>
{% endif %}
{% if ENABLE_BLUE_MARKET %}
<tr>
<td class="text-center">Alliance Market</td>
<td class="text-center">{{ authinfo.market_username }}</td>
<td class="text-center">{{ authinfo.market_password }}</td>
<td class="text-center"><a href="{{ MARKET_URL }}">{{ MARKET_URL }}</a></td>
<td class="text-center">
{% ifequal authinfo.market_username "" %}
<a href="{% url 'auth_activate_market' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button>
</a>
{% else %}
<a href="{% url 'auth_set_market_password' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-pencil"></span></button>
</a>
<a href="{% url 'auth_reset_market_password' %}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-refresh"></span></button>
</a>
<a href="{% url 'auth_deactivate_market' %}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
</a>
{% endifequal %}
</td>
</tr>
{% endif %}
{% if ENABLE_BLUE_PATHFINDER %}
<tr>
<td class="text-center">Pathfinder</td>
<td class="text-center">{{ authinfo.pathfinder_username }}</td>
<td class="text-center">{{ authinfo.pathfinder_password }}</td>
<td class="text-center"><a href="{{ PATHFINDER_URL }}">{{ PATHFINDER_URL }}</a></td>
<td class="text-center">
{% ifequal authinfo.pathfinder_username "" %}
<a href="{% url 'auth_activate_pathfinder' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button>
</a>
{% else %}
<a href="{% url 'auth_set_pathfinder_password' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-pencil"></span></button>
</a>
<a href="{% url 'auth_reset_pathfinder_password' %}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-refresh"></span></button>
</a>
<a href="{% url 'auth_deactivate_pathfinder' %}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
</a>
{% endifequal %}
</td>
</tr>
{% endif %}
{% if ENABLE_BLUE_JABBER %}
<tr>
<td class="text-center">Jabber</td>
<td class="text-center">{{ authinfo.jabber_username }}</td>
<td class="text-center">{{ authinfo.jabber_password }}</td>
<td class="text-center">{{ JABBER_URL }}</td>
<td class="text-center">
{% ifequal authinfo.jabber_username "" %}
<a href="{% url 'auth_activate_jabber' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button>
</a>
{% else %}
<a href="{% url 'auth_set_jabber_password' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-pencil"></span></button>
</a>
<a href="{% url 'auth_reset_jabber_password' %}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-refresh"></span></button>
</a>
<a href="{% url 'auth_deactivate_jabber' %}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
</a>
{% endifequal %}
</td>
</tr>
{% endif %}
{% if ENABLE_BLUE_MUMBLE %}
<tr>
<td class="text-center">Mumble</td>
<td class="text-center">{{ authinfo.mumble_username }}</td>
<td class="text-center">{{ authinfo.mumble_password }}</td>
<td class="text-center">{{ MUMBLE_URL }}</td>
<td class="text-center">
{% ifequal authinfo.mumble_username "" %}
<a href="{% url 'auth_activate_mumble' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button>
</a>
{% else %}
<a href="{% url 'auth_set_mumble_password' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-pencil"></span></button>
</a>
<a href="{% url 'auth_reset_mumble_password' %}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-refresh"></span></button>
</a>
<a href="{% url 'auth_deactivate_mumble' %}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
</a>
{% endifequal %}
</td>
</tr>
{% endif %}
{% if ENABLE_BLUE_IPS4 %}
<td class="text-center">IPS4</td>
<td class="text-center">{{ authinfo.ips4_username }}</td>
<td class="text-center">{{ authinfo.ips4_password }}</td>
<td class="text-center"><a href="{{ IPS4_URL }}">{{ IPS4_URL }}</a></td>
<td class="text-center">
{% ifequal authinfo.ips4_username "" %}
<a href="{% url 'auth_activate_ips4' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button>
</a>
{% else %}
<a href="{% url 'auth_set_ips4_password' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-pencil"></span></button>
</a>
<a href="{% url 'auth_reset_ips4_password' %}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-refresh"></span></button>
</a>
<a href="{% url 'auth_deactivate_ips4' %}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
</a>
{% endifequal %}
</td>
{% endif %}
{% if ENABLE_BLUE_DISCORD %}
<tr>
<td class="text-center">Discord</td>
<td class="text-center"></td>
<td class="text-center"></td>
<td class="text-center"><a href="https://discordapp.com/channels/{{ DISCORD_SERVER_ID }}/{{ DISCORD_SERVER_ID}}">https://discordapp.com</a></td>
<td class="text-center">
{% ifequal authinfo.discord_uid "" %}
<a href="{% url 'auth_activate_discord' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button>
</a>
{% else %}
<a href="{% url 'auth_reset_discord' %}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-refresh"></span></button>
</a>
<a href="{% url 'auth_deactivate_discord' %}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
</a>
{% endifequal %}
</td>
</tr>
{% endif %}
{% if ENABLE_BLUE_DISCOURSE %}
<tr>
<td class="text-center">Discourse</td>
<td class="text-center">{{ authinfo.discourse_username }}</td>
<td class="text-center">{{ authinfo.discourse_password }}</td>
<td class="text-center"><a href="{{ DISCOURSE_URL }}">{{ DISCOURSE_URL }}</a></td>
<td class="text-center">
{% ifequal authinfo.discourse_username "" %}
<a href="{% url 'auth_activate_discourse' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button>
</a>
{% else %}
<a href="{% url 'auth_deactivate_discourse' %}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
</a>
{% endifequal %}
</td>
</tr>
{% endif %}
{% if ENABLE_BLUE_TEAMSPEAK3 %}
<tr>
<th class="text-center">{% trans "Service" %}</th>
<th class="text-center">{% trans "Unique ID" %}</th>
<th class="text-center">PermissionKey</th>
<th class="text-center">{% trans "Quick Link" %}</th>
<th class="text-center">{% trans "Action" %}</th>
</tr>
<tr>
<td class="text-center">Teamspeak 3</td>
<td class="text-center">{{ authinfo.teamspeak3_uid }}</td>
<td class="text-center">{{ authinfo.teamspeak3_perm_key }}</td>
<td class="text-center">
{% ifequal authinfo.teamspeak3_uid "" %}
{% else %}
<a href="ts3server://{{ TEAMSPEAK3_PUBLIC_URL }}?token={{ authinfo.teamspeak3_perm_key }}&nickname={{ authinfo.teamspeak3_uid }}">Teamspeak3
Link</a>
{% endifequal %}
</td>
<td class="text-center">
{% ifequal authinfo.teamspeak3_uid "" %}
<a href="{% url 'auth_activate_teamspeak3' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button>
</a>
{% else %}
<a href="{% url 'auth_verify_teamspeak3' %}" class="btn btn-success" title="Verify"><span class="glyphicon glyphicon-log-in"></a>
<a href="{% url 'auth_reset_teamspeak3_perm' %}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-refresh"></span></button>
</a>
<a href="{% url 'auth_deactivate_teamspeak3' %}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
</a>
{% endifequal %}
</td>
</tr>
{% endif %}
</table>
{% elif perms.auth.member %}
<table class="table table-bordered">
<tr>
<th class="text-center">{% trans "Service" %}</th>
<th class="text-center">{% trans "Username" %}</th>
<th class="text-center">{% trans "Password" %}</th>
<th class="text-center">{% trans "Domain" %}</th>
<th class="text-center">{% trans "Action" %}</th>
</tr>
{% if ENABLE_AUTH_FORUM %}
{% if SHOW_FORUM %}
<tr>
<td class="text-center">Forums</td>
<td class="text-center">{{ authinfo.forum_username }}</td>
<td class="text-center">{{ authinfo.forum_password }}</td>
<td class="text-center"><a href="{{ FORUM_URL }}">{{ FORUM_URL }}</a></td>
<td class="text-center">
{% ifequal authinfo.forum_username "" %}
<a href="{% url 'auth_activate_forum' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button>
<a href="{% url 'auth_activate_forum' %}" class="btn btn-warning">
<span class="glyphicon glyphicon-ok"></span>
</a>
{% else %}
<a href="{% url 'auth_set_forum_password' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-pencil"></span></button>
<a href="{% url 'auth_set_forum_password' %}" class="btn btn-warning">
<span class="glyphicon glyphicon-pencil"></span>
</a>
<a href="{% url 'auth_reset_forum_password' %}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-refresh"></span></button>
<a href="{% url 'auth_reset_forum_password' %}" class="btn btn-primary">
<span class="glyphicon glyphicon-refresh"></span>
</a>
<a href="{% url 'auth_deactivate_forum' %}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
<a href="{% url 'auth_deactivate_forum' %}" class="btn btn-danger">
<span class="glyphicon glyphicon-remove"></span>
</a>
{% endifequal %}
</td>
</tr>
{% endif %}
{% if ENABLE_AUTH_SMF %}
{% if SHOW_SMF %}
<tr>
<td class="text-center">SMF Forums</td>
<td class="text-center">{{ authinfo.smf_username }}</td>
<td class="text-center">{{ authinfo.smf_password }}</td>
<td class="text-center"><a href="{{ SMF_URL }}">{{ SMF_URL }}</a></td>
<td class="text-center">
{% ifequal authinfo.smf_username "" %}
<a href="{% url 'auth_activate_smf' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button>
<a href="{% url 'auth_activate_smf' %}" class="btn btn-warning">
<span class="glyphicon glyphicon-ok"></span>
</a>
{% else %}
<a href="{% url 'auth_set_smf_password' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-pencil"></span></button>
<a href="{% url 'auth_set_smf_password' %}" class="btn btn-warning">
<span class="glyphicon glyphicon-pencil"></span>
</a>
<a href="{% url 'auth_reset_smf_password' %}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-refresh"></span></button>
<a href="{% url 'auth_reset_smf_password' %}" class="btn btn-primary">
<span class="glyphicon glyphicon-refresh"></span>
</a>
<a href="{% url 'auth_deactivate_smf' %}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
<a href="{% url 'auth_deactivate_smf' %}" class="btn btn-danger">
<span class="glyphicon glyphicon-remove"></span>
</a>
{% endifequal %}
</td>
</tr>
{% endif %}
{% if ENABLE_AUTH_IPBOARD %}
{% if SHOW_IPBOARD %}
<tr>
<td class="text-center">IPBoard Forums</td>
<td class="text-center">{{ authinfo.ipboard_username }}</td>
<td class="text-center">{{ authinfo.ipboard_password }}</td>
<td class="text-center"><a href="{{ FORUM_URL }}">{{ FORUM_URL }}</a></td>
<td class="text-center">
{% ifequal authinfo.ipboard_username "" %}
<a href="{% url 'auth_activate_ipboard' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button>
<a href="{% url 'auth_activate_ipboard' %}" class="btn btn-warning">
<span class="glyphicon glyphicon-ok"></span>
</a>
{% else %}
<a href="{% url 'auth_set_ipboard_password' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-pencil"></span></button>
<a href="{% url 'auth_set_ipboard_password' %}" class="btn btn-warning">
<span class="glyphicon glyphicon-pencil"></span>
</a>
<a href="{% url 'auth_reset_ipboard_password' %}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-refresh"></span></button>
<a href="{% url 'auth_reset_ipboard_password' %}" class="btn btn-primary">
<span class="glyphicon glyphicon-refresh"></span>
</a>
<a href="{% url 'auth_deactivate_ipboard' %}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
<a href="{% url 'auth_deactivate_ipboard' %}" class="btn btn-danger">
<span class="glyphicon glyphicon-remove"></span>
</a>
{% endifequal %}
</td>
</tr>
{% endif %}
{% if ENABLE_AUTH_XENFORO %}
{% if SHOW_XENFORO %}
<tr>
<td class="text-center">XenForo Forums</td>
<td class="text-center">{{ authinfo.xenforo_username }}</td>
<td class="text-center">{{ authinfo.xenforo_password }}</td>
<td class="text-center"><a href="{{ FORUM_URL }}">{{ FORUM_URL }}</a></td>
<td class="text-center">
{% ifequal authinfo.xenforo_username "" %}
<a href="{% url 'auth_activate_xenforo' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button>
<a href="{% url 'auth_activate_xenforo' %}" class="btn btn-warning">
<span class="glyphicon glyphicon-ok"></span>
</a>
{% else %}
<a href="{% url 'auth_set_xenforo_password' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-pencil"></span></button>
<a href="{% url 'auth_set_xenforo_password' %}" class="btn btn-warning">
<span class="glyphicon glyphicon-pencil"></span>
</a>
<a href="{% url 'auth_reset_xenforo_password' %}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-refresh"></span></button>
<a href="{% url 'auth_reset_xenforo_password' %}" class="btn btn-primary">
<span class="glyphicon glyphicon-refresh"></span>
</a>
<a href="{% url 'auth_deactivate_xenforo' %}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
<a href="{% url 'auth_deactivate_xenforo' %}" class="btn btn-danger">
<span class="glyphicon glyphicon-remove"></span>
</a>
{% endifequal %}
</td>
</tr>
{% endif %}
{% if ENABLE_AUTH_MARKET %}
{% if SHOW_MARKET %}
<tr>
<td class="text-center">Alliance Market</td>
<td class="text-center">{{ authinfo.market_username }}</td>
<td class="text-center">{{ authinfo.market_password }}</td>
<td class="text-center"><a href="{{ MARKET_URL }}">{{ MARKET_URL }}</a></td>
<td class="text-center">
{% ifequal authinfo.market_username "" %}
<a href="{% url 'auth_activate_market' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button>
<a href="{% url 'auth_activate_market' %}" class="btn btn-warning">
<span class="glyphicon glyphicon-ok"></span>
</a>
{% else %}
<a href="{% url 'auth_set_market_password' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-pencil"></span></button>
<a href="{% url 'auth_set_market_password' %}" class="btn btn-warning">
<span class="glyphicon glyphicon-pencil"></span>
</a>
<a href="{% url 'auth_reset_market_password' %}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-refresh"></span></button>
<a href="{% url 'auth_reset_market_password' %}" class="btn btn-primary">
<span class="glyphicon glyphicon-refresh"></span>
</a>
<a href="{% url 'auth_deactivate_market' %}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
<a href="{% url 'auth_deactivate_market' %}" class="btn btn-danger">
<span class="glyphicon glyphicon-remove"></span>
</a>
{% endifequal %}
</td>
</tr>
{% endif %}
{% if ENABLE_AUTH_PATHFINDER %}
<tr>
<td class="text-center">Pathfinder</td>
<td class="text-center">{{ authinfo.pathfinder_username }}</td>
<td class="text-center">{{ authinfo.pathfinder_password }}</td>
<td class="text-center"><a href="{{ PATHFINDER_URL }}">{{ PATHFINDER_URL }}</a></td>
<td class="text-center">
{% ifequal authinfo.pathfinder_username "" %}
<a href="{% url 'auth_activate_pathfinder' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button>
</a>
{% else %}
<a href="{% url 'auth_set_pathfinder_password' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-pencil"></span></button>
</a>
<a href="{% url 'auth_reset_pathfinder_password' %}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-refresh"></span></button>
</a>
<a href="{% url 'auth_deactivate_pathfinder' %}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
</a>
{% endifequal %}
</td>
</tr>
{% endif %}
{% if ENABLE_AUTH_JABBER %}
{% if SHOW_JABBER %}
<tr>
<td class="text-center">Jabber</td>
<td class="text-center">{{ authinfo.jabber_username }}</td>
<td class="text-center">{{ authinfo.jabber_password }}</td>
<td class="text-center">{{ JABBER_URL }}</td>
<td class="text-center">
{% ifequal authinfo.jabber_username "" %}
<a href="{% url 'auth_activate_jabber' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button>
<a href="{% url 'auth_activate_jabber' %}" class="btn btn-warning">
<span class="glyphicon glyphicon-ok"></span>
</a>
{% else %}
<a href="{% url 'auth_set_jabber_password' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-pencil"></span></button>
<a href="{% url 'auth_set_jabber_password' %}" class="btn btn-warning">
<span class="glyphicon glyphicon-pencil"></span>
</a>
<a href="{% url 'auth_reset_jabber_password' %}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-refresh"></span></button>
<a href="{% url 'auth_reset_jabber_password' %}" class="btn btn-primary">
<span class="glyphicon glyphicon-refresh"></span>
</a>
<a href="{% url 'auth_deactivate_jabber' %}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
<a href="{% url 'auth_deactivate_jabber' %}" class="btn btn-danger">
<span class="glyphicon glyphicon-remove"></span>
</a>
{% endifequal %}
</td>
</tr>
{% endif %}
{% if ENABLE_AUTH_MUMBLE %}
{% if SHOW_MUMBLE %}
<tr>
<td class="text-center">Mumble</td>
<td class="text-center">{{ authinfo.mumble_username }}</td>
<td class="text-center">{{ authinfo.mumble_password }}</td>
<td class="text-center">{{ MUMBLE_URL }}</td>
<td class="text-center">
{% ifequal authinfo.mumble_username "" %}
<a href="{% url 'auth_activate_mumble' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button>
<a href="{% url 'auth_activate_mumble' %}" class="btn btn-warning">
<span class="glyphicon glyphicon-ok"></span>
</a>
{% else %}
<a href="{% url 'auth_set_mumble_password' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-pencil"></span></button>
<a href="{% url 'auth_set_mumble_password' %}" class="btn btn-warning">
<span class="glyphicon glyphicon-pencil"></span>
</a>
<a href="{% url 'auth_reset_mumble_password' %}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-refresh"></span></button>
<a href="{% url 'auth_reset_mumble_password' %}" class="btn btn-primary">
<span class="glyphicon glyphicon-refresh"></span>
</a>
<a href="{% url 'auth_deactivate_mumble' %}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
<a href="{% url 'auth_deactivate_mumble' %}" class="btn btn-danger">
<span class="glyphicon glyphicon-remove"></span>
</a>
{% endifequal %}
</td>
</tr>
{% endif %}
{% if ENABLE_AUTH_IPS4 %}
{% if SHOW_IPS4 %}
<td class="text-center">IPS4</td>
<td class="text-center">{{ authinfo.ips4_username }}</td>
<td class="text-center">{{ authinfo.ips4_password }}</td>
<td class="text-center"><a href="{{ IPS4_URL }}">{{ IPS4_URL }}</a></td>
<td class="text-center">
{% ifequal authinfo.ips4_username "" %}
<a href="{% url 'auth_activate_ips4' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button>
<a href="{% url 'auth_activate_ips4' %}" class="btn btn-warning">
<span class="glyphicon glyphicon-ok"></span>
</a>
{% else %}
<a href="{% url 'auth_set_ips4_password' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-pencil"></span></button>
<a href="{% url 'auth_set_ips4_password' %}" class="btn btn-warning">
<span class="glyphicon glyphicon-pencil"></span>
</a>
<a href="{% url 'auth_reset_ips4_password' %}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-refresh"></span></button>
<a href="{% url 'auth_reset_ips4_password' %}" class="btn btn-primary">
<span class="glyphicon glyphicon-refresh"></span>
</a>
<a href="{% url 'auth_deactivate_ips4' %}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
<a href="{% url 'auth_deactivate_ips4' %}" class="btn btn-danger">
<span class="glyphicon glyphicon-remove"></span>
</a>
{% endifequal %}
</td>
{% endif %}
{% if ENABLE_AUTH_DISCORD %}
{% if SHOW_DISCORD %}
<tr>
<td class="text-center">Discord</td>
<td class="text-center"></td>
@@ -648,43 +223,37 @@
<td class="text-center"><a href="https://discordapp.com/channels/{{ DISCORD_SERVER_ID }}/{{ DISCORD_SERVER_ID}}">https://discordapp.com</a></td>
<td class="text-center">
{% ifequal authinfo.discord_uid "" %}
<a href="{% url 'auth_activate_discord' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button>
<a href="{% url 'auth_activate_discord' %}" class="btn btn-warning">
<span class="glyphicon glyphicon-ok"></span>
</a>
{% else %}
<a href="{% url 'auth_reset_discord' %}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-refresh"></span></button>
<a href="{% url 'auth_reset_discord' %}" class="btn btn-primary">
<span class="glyphicon glyphicon-refresh"></span>
</a>
<a href="{% url 'auth_deactivate_discord' %}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
<a href="{% url 'auth_deactivate_discord' %}" class="btn btn-danger">
<span class="glyphicon glyphicon-remove"></span>
</a>
{% endifequal %}
</td>
</tr>
{% endif %}
{% if ENABLE_AUTH_DISCOURSE %}
{% if SHOW_DISCOURSE %}
<td class="text-center">Discourse</td>
<td class="text-center">{{ authinfo.discourse_username }}</td>
<td class="text-center">{{ authinfo.discourse_password }}</td>
<td class="text-center"><a href="{{ DISCOURSE_URL }}">{{ DISCOURSE_URL }}</a></td>
<td class="text-center">
{% ifequal authinfo.discourse_username "" %}
<a href="{% url 'auth_activate_discourse' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button>
<a href="{% url 'auth_activate_discourse' %}" class="btn btn-warning">
<span class="glyphicon glyphicon-ok"></span>
</a>
{% else %}
<a href="{% url 'auth_deactivate_discourse' %}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
</a>
<a href="{% url 'auth_deactivate_discourse' %}" class="btn btn-danger">
<span class="glyphicon glyphicon-remove"></span>
</a>
{% endifequal %}
</td>
{% endif %}
{% if ENABLE_AUTH_TEAMSPEAK3 %}
{% if SHOW_TEAMSPEAK3 %}
<tr>
<th class="text-center">{% trans "Service" %}</th>
<th class="text-center">{% trans "Unique ID" %}</th>
@@ -705,32 +274,24 @@
</td>
<td class="text-center">
{% ifequal authinfo.teamspeak3_uid "" %}
<a href="{% url 'auth_activate_teamspeak3' %}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-ok"></span></button>
<a href="{% url 'auth_activate_teamspeak3' %}" class="btn btn-warning">
<span class="glyphicon glyphicon-ok"></span>
</a>
{% else %}
<a href="{% url 'auth_verify_teamspeak3' %}" class="btn btn-success" title="Verify"><span class="glyphicon glyphicon-log-in"></a>
<a href="{% url 'auth_reset_teamspeak3_perm' %}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-refresh"></span></button>
<a href="{% url 'auth_verify_teamspeak3' %}" class="btn btn-success" title="Verify">
<span class="glyphicon glyphicon-log-in">
</a>
<a href="{% url 'auth_deactivate_teamspeak3' %}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
<a href="{% url 'auth_reset_teamspeak3_perm' %}" class="btn btn-primary">
<span class="glyphicon glyphicon-refresh"></span>
</a>
<a href="{% url 'auth_deactivate_teamspeak3' %}" class="btn btn-danger">
<span class="glyphicon glyphicon-remove"></span>
</a>
{% endifequal %}
</td>
</tr>
{% endif %}
</table>
{% else %}
{% if IS_CORP %}
<div class="alert alert-danger" role="alert">{% trans "You are not in the corporation." %}</div>
{% else %}
<div class="alert alert-danger" role="alert">{% trans "You are not in the alliance." %}</div>
{% endif %}
{% endif %}
</div>
{% endblock content %}

78
stock/templates/registered/signaturemanagement.html
View File

@@ -1,78 +0,0 @@
{% extends "public/base.html" %}
{% load staticfiles %}
{% load i18n %}
{% block title %}Alliance Auth{% endblock %}
{% block page_title %}{% trans "Wormhole Signature Management" %}{% endblock page_title %}
{% block extra_css %}{% endblock extra_css %}
{% block content %}
<div class="col-lg-12">
<h1 class="page-header text-center">{% trans "Wormhole Signatures" %}
<div class="text-right">
<a href="{% url 'auth_add_signature_view' %}">
{% if perms.auth.signature_management %}
<button type="button" class="btn btn-success">{% trans "Create Signature" %}</button>
{% endif %}
</a>
</div>
</h1>
<table class="table table-responsive table-bordered">
<tr>
<th class="text-center">{% trans "ID" %}</th>
<th class="text-center">{% trans "System" %}</th>
<th class="text-center">{% trans "Destination" %}</th>
<th class="text-center">{% trans "Goes Through" %}</th>
<th class="text-center">{% trans "Lifetime Status" %}</th>
<th class="text-center">{% trans "Mass Status" %}</th>
<th class="text-center">{% trans "Ship Size" %}</th>
<th class="text-center">{% trans "Notes" %}</th>
<th class="text-center">{% trans "Post Time" %}</th>
{% if perms.auth.signature_management %}
<th class="text-center">{% trans "Creator" %}</th>
<th class="text-center">{% trans "Action" %}</th>
{% endif %}
</tr>
{% for sigt in sigtracker %}
<tr>
<td style="width:150px" class="text-center">{{ sigt.ident }}</td>
<td class="text-center">
<a href="http://evemaps.dotlan.net/system/{{ sigt.system }}">{{ sigt.system }}</a>
</td>
<td style="width:150px" class="text-center">{{ sigt.destination }}</td>
<td style="width:150px" class="text-center">{{ sigt.through_dest }}</td>
<td style="width:150px" class="text-center">{{ sigt.lifetime_status }}</td>
<td style="width:150px" class="text-center">{{ sigt.mass_status }}</td>
<td style="width:150px" class="text-center">{{ sigt.ships_size }}</td>
<td style="width:150px" class="text-center">{{ sigt.notes }}</td>
<td style="width:150px" class="text-center">{{ sigt.post_time}}</td>
{% if perms.auth.signature_management %}
<td style="width:150px" class="text-center">{{ sigt.eve_character }}</td>
<td class="text-center">
<a href="/remove_signature/{{ sigt.id }}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
</a>
<a href="/edit_signature/{{ sigt.id }}">
<button type="button" class="btn btn-info"><span
class="glyphicon glyphicon-pencil"></span></button>
</a>
</td>
{% endif %}
</tr>
{% endfor %}
</tr>
</table>
</div>
{% endblock content %}

46
stock/templates/registered/signatureupdate.html
View File

@@ -1,46 +0,0 @@
{% extends "public/base.html" %}
{% load bootstrap %}
{% load staticfiles %}
{% load i18n %}
{% block title %}Alliance Auth - Update Signature {% endblock %}
{% block page_title %}{% trans "Update AAR Link" %}{% endblock page_title %}
{% block extra_css %}
<link href="{% static 'css/jquery.datetimepicker.css' %}" rel="stylesheet" type="text/css">{% endblock extra_css %}
{% block content %}
<div class="col-lg-12">
<h1 class="page-header text-center">{% trans "Update Signature" %}</h1>
<div class="container-fluid">
<div class="col-md-4 col-md-offset-4">
<div class="row">
{% if no_fleet_id %}
<div class="alert alert-danger" role="alert">{% trans "Signature Does Not Exist" %}</div>
{% else %}
<form class="form-signin" role="form" action="" method="POST">
{% csrf_token %}
{{ form|bootstrap }}
<br/>
<button class="btn btn-lg btn-primary btn-block" type="submit">{% trans "Update Signature" %}
</button>
</form>
{% endif %}
</div>
</div>
</div>
</div>
{% endblock content %}
{% block extra_script %}
$('#id_fleet_time').datetimepicker({
maskInput: true,
format: 'Y-m-d H:i',minDate:0
});
{% endblock extra_script %}

7
stock/templates/registered/srpfleetadd.html
View File

@@ -25,12 +25,9 @@
<button class="btn btn-lg btn-primary btn-block" type="submit">{% trans "Create SRP Fleet" %}</button>
</form>
{% else %}
<div class="alert alert-success" role="alert">{% trans "Fleet Created Successfully!" %}</div>
<div class="alert alert-info" role="alert">{% blocktrans %}Give this <a
href="/srp_request/{{ completed_srp_code }}">Link</a> to the line members{% endblocktrans %}
</div>
<div class="alert alert-info" role="alert">{% blocktrans %}Give this link to the line members{% endblocktrans %}.</div>
<div class="alert alert-info" role="alert">
http://{{ request.get_host }}/srp_request/{{ completed_srp_code }}</div>
http://{{ request.get_host }}{% url 'auth_srp_request_view' completed_srp_code %}</div>
{% endif %}
</div>
</div>

48
stock/templates/registered/srpfleetdata.html
View File

@@ -16,12 +16,12 @@
<div class="text-right">
{% if perms.auth.srp_management %}
{% if fleet_status == "Completed" %}
<a href="/srp_fleet_mark_uncompleted/{{ fleet_id }}">
<button type="button" class="btn btn-warning">{% trans "Mark Incomplete" %}</button>
<a href="{% url 'auth_srp_fleet_mark_uncompleted' fleet_id %}" class="btn btn-warning">
{% trans "Mark Incomplete" %}
</a>
{% else %}
<a href="/srp_fleet_mark_completed/{{ fleet_id }}">
<button type="button" class="btn btn-success">{% trans "Mark Completed" %}</button>
<a href="{% url 'auth_srp_fleet_mark_completed' fleet_id %}" class="btn btn-success">
{% trans "Mark Completed" %}
</a>
{% endif %}
{% endif %}
@@ -82,45 +82,37 @@
{% if perms.auth.srp_management %}
<td class="text-center">
<a href="/srp_request_amount_update/{{ srpfleetrequest.id }}">
<button type="button" class="btn btn-info"><span
class="glyphicon glyphicon-pencil"></span></button>
<a href="{% url 'auth_srp_request_update_amount_view' srpfleetrequest.id %}" class="btn btn-info">
<span class="glyphicon glyphicon-pencil"></span>
</a>
{% if srpfleetrequest.srp_status == "Rejected" %}
<a href="/srp_request_approve/{{ srpfleetrequest.id }}">
<button type="button" class="btn btn-success"><span
class="glyphicon glyphicon-ok"></span></button>
<a href="{% url 'auth_srp_request_approve' srpfleetrequest.id %}" class="btn btn-success">
<span class="glyphicon glyphicon-ok"></span>
</a>
{% elif srpfleetrequest.srp_status == "Pending" %}
<a href="/srp_request_approve/{{ srpfleetrequest.id }}">
<button type="button" class="btn btn-success"><span
class="glyphicon glyphicon-ok"></span></button>
<a href="{% url 'auth_srp_request_approve' srpfleetrequest.id %}" class="btn btn-success">
<span class="glyphicon glyphicon-ok"></span>
</a>
{% elif srpfleetrequest.srp_status == "" %}
<a href="/srp_request_approve/{{ srpfleetrequest.id }}">
<button type="button" class="btn btn-success"><span
class="glyphicon glyphicon-ok"></span></button>
<a href="{% url 'auth_srp_request_approve' srpfleetrequest.id %}" class="btn btn-success">
<span class="glyphicon glyphicon-ok"></span>
</a>
{% endif %}
{% if srpfleetrequest.srp_status == "Approved" %}
<a href="/srp_request_reject/{{ srpfleetrequest.id }}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-remove"></span></button>
<a href="{% url 'auth_srp_request_reject' srpfleetrequest.id %}" class="btn btn-warning">
<span class="glyphicon glyphicon-remove"></span>
</a>
{% elif srpfleetrequest.srp_status == "Pending" %}
<a href="/srp_request_reject/{{ srpfleetrequest.id }}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-remove"></span></button>
<a href="{% url 'auth_srp_request_reject' srpfleetrequest.id %}" class="btn btn-warning">
<span class="glyphicon glyphicon-remove"></span>
</a>
{% elif srpfleetrequest.srp_status == "" %}
<a href="/srp_request_reject/{{ srpfleetrequest.id }}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-remove"></span></button>
<a href="{% url 'auth_srp_request_reject' srpfleetrequest.id %}" class="btn btn-warning">
<span class="glyphicon glyphicon-remove"></span>
</a>
{% endif %}
<a href="/srp_request_remove/{{ srpfleetrequest.id }}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-trash"></span></button>
<a href="{% url 'auth_srp_request_remove' srpfleetrequest.id %}" class="btn btn-danger">
<span class="glyphicon glyphicon-trash"></span>
</a>
</td>

18
stock/templates/registered/srpfleetrequestamount.html
View File

@@ -17,17 +17,13 @@
<div class="container-fluid">
<div class="col-md-4 col-md-offset-4">
<div class="row">
{% if no_srp_code %}
<div class="alert alert-danger" role="alert">{% trans "SRP Code Does Not Exist" %}</div>
{% else %}
<form class="form-signin" role="form" action="" method="POST">
{% csrf_token %}
{{ form|bootstrap }}
<br/>
<button class="btn btn-lg btn-primary btn-block" type="submit">{% trans "Update SRP Request Amount" %}
</button>
</form>
{% endif %}
<form class="form-signin" role="form" action="" method="POST">
{% csrf_token %}
{{ form|bootstrap }}
<br/>
<button class="btn btn-lg btn-primary btn-block" type="submit">{% trans "Update SRP Request Amount" %}
</button>
</form>
</div>
</div>
</div>

35
stock/templates/registered/srpmanagement.html
View File

@@ -15,11 +15,11 @@
<h1 class="page-header text-center">{% trans "SRP Management" %}
<div class="text-right">
{% if perms.auth.srp_management %}
<a href="{% url 'auth_srp_management_all_view' %}">
<button type="button" class="btn btn-primary">{% trans "View All" %}</button>
<a href="{% url 'auth_srp_management_all_view' %}" class="btn btn-primary">
{% trans "View All" %}
</a>
<a href="{% url 'auth_srp_fleet_add_view' %}">
<button type="button" class="btn btn-success">{% trans "Add SRP Fleet" %}</button>
<a href="{% url 'auth_srp_fleet_add_view' %}" class="btn btn-success">
{% trans "Add SRP Fleet" %}
</a>
{% endif %}
</div>
@@ -60,7 +60,7 @@
<th class="text-center">
{% if srpfleet.fleet_srp_code %}
<div class="label label-warning">
<a href="/srp_request/{{ srpfleet.fleet_srp_code }}"
<a href="{% url 'auth_srp_request_view' srpfleet.fleet_srp_code %}"
>{{ srpfleet.fleet_srp_code }}</a>
</div>
{% else %}
@@ -90,30 +90,25 @@
</td>
<td class="text-center">
<a href="/srp_fleet_view/{{ srpfleet.id }}">
<button type="button" class="btn btn-primary"><span
class="glyphicon glyphicon-eye-open"></span></button>
<a href="{% url 'auth_srp_fleet_view' srpfleet.id %}" class="btn btn-primary">
<span class="glyphicon glyphicon-eye-open"></span>
</a>
{% if perms.auth.srp_management %}
<a href="/srp_fleet_edit/{{ srpfleet.id }}">
<button type="button" class="btn btn-info"><span
class="glyphicon glyphicon-pencil"></span></button>
<a href="{% url 'auth_srp_fleet_edit_view' srpfleet.id %}" class="btn btn-info">
<span class="glyphicon glyphicon-pencil"></span>
</a>
<a href="/srp_fleet_remove/{{ srpfleet.id }}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-trash"></span></button>
<a href="{% url 'auth_srp_fleet_remove' srpfleet.id %}" class="btn btn-danger">
<span class="glyphicon glyphicon-trash"></span>
</a>
{% if srpfleet.fleet_srp_code %}
<a href="/srp_fleet_disable/{{ srpfleet.id }}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-remove-sign"></span></button>
<a href="{% url 'auth_srp_fleet_disable' srpfleet.id %}" class="btn btn-warning">
<span class="glyphicon glyphicon-remove-sign"></span>
</a>
{% else %}
<a href="/srp_fleet_enable/{{ srpfleet.id }}">
<button type="button" class="btn btn-success"><span
class="glyphicon glyphicon-ok-sign"></span></button>
<a href="{% url 'auth_srp_fleet_enable' srpfleet.id %}" class="btn btn-success">
<span class="glyphicon glyphicon-ok-sign"></span>
</a>
{% endif %}

47
stock/templates/registered/timermanagement.html
View File

@@ -12,11 +12,9 @@
<div class="col-lg-12">
<h1 class="page-header text-center">{% trans "Structure Timers" %}
<div class="text-right">
<a href="{% url 'auth_add_timer_view' %}">
{% if perms.auth.timer_management %}
<button type="button" class="btn btn-success">{% trans "Create Structure Timer" %}</button>
{% endif %}
</a>
{% if perms.auth.timer_management %}
<a href="{% url 'auth_add_timer_view' %}" class="btn btn-success">{% trans "Create Structure Timer" %}</a>
{% endif %}
</div>
</h1>
<div class="col-lg-12 text-center">
@@ -113,13 +111,11 @@
<td class="text-center">{{ timer.eve_character.character_name }}</td>
{% if perms.auth.timer_management %}
<td class="text-center">
<a href="/remove_timer/{{ timer.id }}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
<a href="{% url 'auth_remove_timer' timer.id %}" class="btn btn-danger">
<span class="glyphicon glyphicon-remove"></span>
</a>
<a href="/edit_timer/{{ timer.id }}">
<button type="button" class="btn btn-info"><span
class="glyphicon glyphicon-pencil"></span></button>
<a href="{% url 'auth_edit_timer' timer.id %}" class="btn btn-info">
<span class="glyphicon glyphicon-pencil"></span>
</a>
</td>
{% endif %}
@@ -165,8 +161,8 @@
</div>
{% endifequal %}
</td>
<td class="text-center"><a
href="http://evemaps.dotlan.net/system/{{ timer.system }}">{{ timer.system }} {{ timer.planet_moon }} </a>
<td class="text-center">
<a href="http://evemaps.dotlan.net/system/{{ timer.system }}">{{ timer.system }} {{ timer.planet_moon }}</a>
</td>
<td class="text-center">
{% ifequal timer.structure "I-HUB" %}
@@ -215,13 +211,11 @@
<td class="text-center">{{ timer.eve_character.character_name }}</td>
{% if perms.auth.timer_management %}
<td class="text-center">
<a href="/remove_timer/{{ timer.id }}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
<a href="{% url 'auth_remove_timer' timer.id %}" class="btn btn-danger">
<span class="glyphicon glyphicon-remove"></span>
</a>
<a href="/edit_timer/{{ timer.id }}">
<button type="button" class="btn btn-info"><span
class="glyphicon glyphicon-pencil"></span></button>
<a href="{% url 'auth_edit_timer' timer.id %}" class="btn btn-info">
<span class="glyphicon glyphicon-pencil"></span>
</td>
{% endif %}
</tr>
@@ -265,8 +259,8 @@
</div>
{% endifequal %}
</td>
<td class="text-center"><a
href="http://evemaps.dotlan.net/system/{{ timer.system }}">{{ timer.system }} {{ timer.planet_moon }} </a>
<td class="text-center">
<a href="http://evemaps.dotlan.net/system/{{ timer.system }}">{{ timer.system }} {{ timer.planet_moon }}</a>
</td>
<td class="text-center">
{% ifequal timer.structure "I-HUB" %}
@@ -315,13 +309,12 @@
<td class="text-center">{{ timer.eve_character.character_name }}</td>
{% if perms.auth.timer_management %}
<td class="text-center">
<a href="/remove_timer/{{ timer.id }}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
<a href="{% url 'auth_remove_timer' timer.id %}" class="btn btn-danger">
<span class="glyphicon glyphicon-remove"></span>
</a>
<a href="{% url 'auth_edit_timer' timer.id %}" class="btn btn-info">
<span class="glyphicon glyphicon-pencil"></span>
</a>
<a href="/edit_timer/{{ timer.id }}">
<button type="button" class="btn btn-info"><span
class="glyphicon glyphicon-pencil"></span></button>
</td>
{% endif %}
</tr>

4
stock/templates/registration/password_reset_complete.html
View File

@@ -50,9 +50,7 @@
<p class="text-center">{% trans "Your password has been set." %}</p>
<a href="{{ login_url }}">
<button class="btn btn-lg btn-success btn-block">{% trans "Login" %}</button>
</a>
<a href="{{ login_url }}" class="btn btn-lg btn-success btn-block">{% trans "Login" %}</a>
</div>
</div>
</div>