Added additional features suggested by ogopogomu

This commit is contained in:
Raynaldo Rivera
2014-11-26 22:58:07 -07:00
parent d40db151db
commit ab8efdb2c1
5 changed files with 139 additions and 13 deletions

View File

@@ -11,12 +11,26 @@
<div class="col-lg-12">
<div class="row">
<h1 class="page-header text-center">SRP Fleet Data
<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">Mark Incomplete</button>
</a>
{% else %}
<a href="/srp_fleet_mark_completed/{{ fleet_id }}">
<button type="button" class="btn btn-success">Mark Completed</button>
</a>
{% endif %}
{% endif %}
</div>
</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>
<th class="text-center">Status</th>
{% if perms.auth.srp_management %}
<th class="text-center">Actions</th>
{% endif %}
@@ -33,12 +47,35 @@
target="_blank">{{ srpfleetrequest.killboard_link }}</a>
</td>
<td class="text-center">{{ srpfleetrequest.additional_info }}</td>
<td class="text-center">
{% if srpfleetrequest.srp_status == "Approved" %}
<div class="label label-success">
Approved
</div>
{% elif srpfleetrequest.srp_status == "Rejected" %}
<div class="label label-danger">
Rejected
</div>
{% else %}
<div class="label label-warning">
Pending
</div>
{% endif %}
</td>
{% if perms.auth.srp_management %}
<td class="text-center">
<td class="text-center">
<a href="/srp_request_approve/{{ srpfleetrequest.id }}">
<button type="button" class="btn btn-success"><span
class="glyphicon glyphicon-ok"></span></button>
</a>
<a href="/srp_request_reject/{{ srpfleetrequest.id }}">
<button type="button" class="btn btn-warning"><span
class="glyphicon glyphicon-remove"></span></button>
</a>
<a href="/srp_request_remove/{{ srpfleetrequest.id }}">
<button type="button" class="btn btn-danger"><span
class="glyphicon glyphicon-remove"></span></button>
class="glyphicon glyphicon-trash"></span></button>
</a>
</td>
{% endif %}

View File

@@ -13,8 +13,11 @@
<h1 class="page-header text-center">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">View All</button>
</a>
<a href="{% url 'auth_srp_fleet_add_view' %}">
<button type="button" class="btn btn-success">Add SRP Fleet</button>
<button type="button" class="btn btn-success">Add SRP Fleet</button>
</a>
{% endif %}
</div>
@@ -25,9 +28,8 @@
<th class="text-center">Fleet Time</th>
<th class="text-center">Fleet Doctrine</th>
<th class="text-center">Fleet Commander</th>
{% if perms.auth.srp_management %}
<th class="text-center">Fleet SRP Code</th>
{% endif %}
<th class="text-center">Fleet SRP Code</th>
<th class="text-center">SRP Status</th>
<th class="text-center">Actions</th>
</tr>
{% for srpfleet in srpfleets %}
@@ -44,13 +46,24 @@
{{ 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 }}
<th class="text-center">
<div class="label label-warning">
<a href="/srp_request/{{ srpfleet.fleet_srp_code }}"
target="_blank">{{ srpfleet.fleet_srp_code }}</a>
</div>
</th>
<td class="text-center">
{% if srpfleet.fleet_srp_status == "" %}
<div class="label label-warning">
Pending
</div>
</th>
{% endif %}
{% else %}
<div class="label label-success">
Completed
</div>
{% endif %}
</td>
<td class="text-center">
<a href="/srp_fleet_view/{{ srpfleet.id }}">
<button type="button" class="btn btn-primary"><span