mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2026-02-08 16:16:18 +01:00
Added srp program features, updated hr applications to support adding a "mark in progress"
This commit is contained in:
Raynaldo Rivera
@@ -63,17 +63,19 @@
|
||||
href="{% url 'auth_dashboard' %}"><i
|
||||
class="fa fa-dashboard fa-fw grayiconecolor"></i> Dashboard</a>
|
||||
</li>
|
||||
<li>
|
||||
<a {% ifequal request.path "/characters/" %} class="active" {% endifequal %}
|
||||
href="{% url 'auth_characters' %}"><i
|
||||
class="fa fa-users fa-fw grayiconecolor"></i> Characters</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> 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> Characters</a>
|
||||
</li>
|
||||
|
||||
{% if perms.auth.alliance_member %}
|
||||
<li>
|
||||
<a {% ifequal request.path "/groups/" %} class="active" {% endifequal %}
|
||||
@@ -81,17 +83,22 @@
|
||||
class="fa fa-cogs fa-sitemap grayiconecolor"></i> 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> Help</a>
|
||||
</li>
|
||||
|
||||
|
||||
<li class="text-center divider-horizontal">
|
||||
<h5>Aux Navigation</h5>
|
||||
</li>
|
||||
{% if perms.auth.alliance_member or perms.auth.blue_member %}
|
||||
<li>
|
||||
<a {% ifequal request.path "/services/" %} class="active" {% endifequal %}
|
||||
href="{% url 'auth_services' %}"><i
|
||||
class="fa fa-cogs fa-fw grayiconecolor"></i> Services</a>
|
||||
</li>
|
||||
|
||||
<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> OP Timers</a>
|
||||
class="fa fa-cogs fa-fw grayiconecolor"></i> Alliance Services</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
|
||||
@@ -104,11 +111,39 @@
|
||||
</li>
|
||||
{% endif %}
|
||||
|
||||
<li>
|
||||
<a {% ifequal request.path "/help/" %} class="active" {% endifequal %}
|
||||
href="{% url 'auth_help' %}"><i
|
||||
class="fa fa-question fa-fw grayiconecolor"></i> Help</a>
|
||||
</li>
|
||||
{% if perms.auth.corp_stats %}
|
||||
<li>
|
||||
<a {% ifequal request.path "/corporation_stats" %} class="active" {% endifequal %}
|
||||
href="{% url 'auth_corp_stats' %}"><i
|
||||
class="fa fa-share-alt fa-fw grayiconecolor"></i> 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> Group Management</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
|
||||
{% if perms.auth.alliance_member or perms.auth.blue_member %}
|
||||
|
||||
<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> OP Timers</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> Ship Replacement</a>
|
||||
</li>
|
||||
|
||||
{% endif %}
|
||||
|
||||
|
||||
<li class="text-center divider-horizontal">
|
||||
<h5>Util</h5>
|
||||
@@ -127,21 +162,6 @@
|
||||
class="fa fa-space-shuttle fa-fw grayiconecolor"></i> Fleet Broadcast Formatter</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
{% if perms.auth.corp_stats %}
|
||||
<li>
|
||||
<a {% ifequal request.path "/corporation_stats" %} class="active" {% endifequal %}
|
||||
href="{% url 'auth_corp_stats' %}"><i
|
||||
class="fa fa-share-alt fa-fw grayiconecolor"></i> 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> Group Management</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
|
||||
{% if perms.auth.jabber_broadcast %}
|
||||
<li>
|
||||
@@ -151,6 +171,7 @@
|
||||
</li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
<!-- /.sidebar-collapse -->
|
||||
</div>
|
||||
|
||||
@@ -28,21 +28,22 @@
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label class="control-label " for="id_extra">Reviewer</label>
|
||||
|
||||
<div class=" ">
|
||||
{% if application.reviewer_character == None %}
|
||||
{% if application.reviewer_inprogress_character == None %}
|
||||
<div class="alert alert-info" role="alert">pending</div>
|
||||
{% else %}
|
||||
<div class="alert alert-info"
|
||||
role="alert">{{ application.reviewer_character.character_name }}</div>
|
||||
role="alert">{{ application.reviewer_inprogress_character.character_name }}</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label class="control-label" for="id_character_name">User Account</label>
|
||||
<label class="control-label" for="id_character_name">User Account</label>
|
||||
|
||||
<div class=" ">
|
||||
<input class=" form-control" value="{{ application.user.username }}" disabled>
|
||||
@@ -110,18 +111,27 @@
|
||||
<label class="control-label text-center" for="id_extra">Actions</label>
|
||||
|
||||
<div class="container-fluid well">
|
||||
|
||||
<div class="row text-center">
|
||||
<a href="/hr_application_approve/{{ application.id }}">
|
||||
<button type="button" class="btn btn-lg btn-success">Approve</button>
|
||||
</a>
|
||||
{% if application.reviewer_inprogress_character != None %}
|
||||
<a href="/hr_application_approve/{{ application.id }}">
|
||||
<button type="button" class="btn btn-lg btn-success">Approve</button>
|
||||
</a>
|
||||
|
||||
<a href="/hr_application_reject/{{ application.id }}">
|
||||
<button type="button" class="btn btn-lg btn-info">Reject</button>
|
||||
</a>
|
||||
<a href="/hr_application_reject/{{ application.id }}">
|
||||
<button type="button" class="btn btn-lg btn-info">Reject</button>
|
||||
</a>
|
||||
|
||||
<a href="/hr_application_remove/{{ application.id }}">
|
||||
<button type="button" class="btn btn-lg btn-danger">Delete</button>
|
||||
</a>
|
||||
<a href="/hr_application_remove/{{ application.id }}">
|
||||
<button type="button" class="btn btn-lg btn-danger">Delete</button>
|
||||
</a>
|
||||
|
||||
{% else %}
|
||||
<a href="/hr_mark_in_progress/{{ application.id }}">
|
||||
<button type="button" class="btn btn-lg btn-warning">Mark In Progress
|
||||
</button>
|
||||
</a>
|
||||
{% endif %}
|
||||
</div>
|
||||
<br/>
|
||||
|
||||
|
||||
49
templates/registered/srpfleetadd.html
Executable file
49
templates/registered/srpfleetadd.html
Executable file
@@ -0,0 +1,49 @@
|
||||
{% extends "public/base.html" %}
|
||||
{% load bootstrap %}
|
||||
{% load staticfiles %}
|
||||
|
||||
{% block title %}Alliance Auth - SRP Fleet Create{% endblock %}
|
||||
|
||||
{% block page_title %}SRP Fleet Create{% 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">Create SRP Fleet</h1>
|
||||
|
||||
<div class="container-fluid">
|
||||
<div class="col-md-4 col-md-offset-4">
|
||||
<div class="row">
|
||||
{% if completed == False %}
|
||||
<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">Create SRP Fleet</button>
|
||||
</form>
|
||||
{% else %}
|
||||
<div class="alert alert-success" role="alert">Fleet Created Successfully!</div>
|
||||
<div class="alert alert-info" role="alert">Give this <a
|
||||
href="/srp_request/{{ completed_srp_code }}">Link</a> to the line members
|
||||
</div>
|
||||
<div class="alert alert-info" role="alert">
|
||||
http://{{ request.get_host }}/srp_request/{{ completed_srp_code }}</div>
|
||||
{% 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 %}
|
||||
51
templates/registered/srpfleetdata.html
Executable file
51
templates/registered/srpfleetdata.html
Executable file
@@ -0,0 +1,51 @@
|
||||
{% extends "public/base.html" %}
|
||||
{% load bootstrap %}
|
||||
{% load staticfiles %}
|
||||
|
||||
{% block title %}Alliance Auth{% endblock %}
|
||||
|
||||
{% block page_title %}Srp Fleet Data{% endblock page_title %}
|
||||
{% block extra_css %}{% endblock extra_css %}
|
||||
|
||||
{% block content %}
|
||||
<div class="col-lg-12">
|
||||
<div class="row">
|
||||
<h1 class="page-header text-center">SRP Fleet Data
|
||||
</h1>
|
||||
<table class="table table-bordered">
|
||||
<tr>
|
||||
<th class="text-center">Pilot Name</th>
|
||||
<th class="text-center">Killboard Link</th>
|
||||
<th class="text-center">Additional Info</th>
|
||||
{% if perms.auth.timer_management %}
|
||||
<th class="text-center">Actions</th>
|
||||
{% endif %}
|
||||
</tr>
|
||||
{% for srpfleetrequest in srpfleetrequests %}
|
||||
<tr>
|
||||
<td class="text-center">
|
||||
<div class="label label-info">
|
||||
{{ srpfleetrequest.character.character_name }}
|
||||
</div>
|
||||
</td>
|
||||
<td class="text-center">
|
||||
<a href="{{ srpfleetrequest.killboard_link }}"
|
||||
target="_blank">{{ srpfleetrequest.killboard_link }}</a>
|
||||
</td>
|
||||
<td class="text-center">{{ srpfleetrequest.additional_info }}</td>
|
||||
{% if perms.auth.timer_management %}
|
||||
<td class="text-center">
|
||||
|
||||
<a href="/srp_request_remove/{{ srpfleetrequest.id }}">
|
||||
<button type="button" class="btn btn-danger"><span
|
||||
class="glyphicon glyphicon-remove"></span></button>
|
||||
</a>
|
||||
</td>
|
||||
{% endif %}
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% endblock content %}
|
||||
49
templates/registered/srpfleetrequest.html
Executable file
49
templates/registered/srpfleetrequest.html
Executable file
@@ -0,0 +1,49 @@
|
||||
{% extends "public/base.html" %}
|
||||
{% load bootstrap %}
|
||||
{% load staticfiles %}
|
||||
|
||||
{% block title %}Alliance Auth - SRP Request{% endblock %}
|
||||
|
||||
{% block page_title %}SRP Request{% 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">Create SRP Request</h1>
|
||||
|
||||
<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">SRP Code Does Not Exist</div>
|
||||
{% else %}
|
||||
{% if completed == False %}
|
||||
<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">Create SRP Request
|
||||
</button>
|
||||
</form>
|
||||
{% else %}
|
||||
<div class="alert alert-success" role="alert">SRP Request Successfully Submitted</div>
|
||||
{% endif %}
|
||||
{% 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 %}
|
||||
73
templates/registered/srpmanagement.html
Executable file
73
templates/registered/srpmanagement.html
Executable file
@@ -0,0 +1,73 @@
|
||||
{% extends "public/base.html" %}
|
||||
{% load bootstrap %}
|
||||
{% load staticfiles %}
|
||||
|
||||
{% block title %}Alliance Auth{% endblock %}
|
||||
|
||||
{% block page_title %}Srp Management{% endblock page_title %}
|
||||
{% block extra_css %}{% endblock extra_css %}
|
||||
|
||||
{% block content %}
|
||||
<div class="col-lg-12">
|
||||
<div class="row">
|
||||
<h1 class="page-header text-center">SRP Management
|
||||
<div class="text-right">
|
||||
{% if perms.auth.timer_management %}
|
||||
<a href="{% url 'auth_srp_fleet_add_view' %}">
|
||||
<button type="button" class="btn btn-success">Add SRP Fleet</button>
|
||||
</a>
|
||||
{% endif %}
|
||||
</div>
|
||||
</h1>
|
||||
<table class="table table-bordered">
|
||||
<tr>
|
||||
<th class="text-center">Fleet Name</th>
|
||||
<th class="text-center">Fleet Time</th>
|
||||
<th class="text-center">Fleet Doctrine</th>
|
||||
<th class="text-center">Fleet Commander</th>
|
||||
{% if perms.auth.timer_management %}
|
||||
<th class="text-center">Fleet SRP Code</th>
|
||||
{% endif %}
|
||||
<th class="text-center">Actions</th>
|
||||
</tr>
|
||||
{% for srpfleet in srpfleets %}
|
||||
<tr>
|
||||
<td class="text-center">
|
||||
<div class="label label-info">
|
||||
{{ srpfleet.fleet_name }}
|
||||
</div>
|
||||
</td>
|
||||
<td class="text-center">{{ srpfleet.fleet_time }}</td>
|
||||
<td class="text-center">{{ srpfleet.fleet_doctrine }}</td>
|
||||
<td class="text-center">
|
||||
<div class="label label-success">
|
||||
{{ srpfleet.fleet_commander.character_name }}
|
||||
</div>
|
||||
</td>
|
||||
{% if perms.auth.timer_management %}
|
||||
<th class="text-center">
|
||||
<div class="label label-danger">
|
||||
{{ srpfleet.fleet_srp_code }}
|
||||
</div>
|
||||
</th>
|
||||
{% endif %}
|
||||
<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>
|
||||
|
||||
{% if perms.auth.timer_management %}
|
||||
<a href="/srp_fleet_remove/{{ srpfleet.id }}">
|
||||
<button type="button" class="btn btn-danger"><span
|
||||
class="glyphicon glyphicon-remove"></span></button>
|
||||
</a>
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% endblock content %}
|
||||
Reference in New Issue
Block a user