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

Add missing titles to SRP buttons (#654)

Browse Source 
Add pending request counter.
Restrict SRP status to choices.

Closes #643
This commit is contained in:
Adarnof
2017-01-18 15:46:47 -05:00
committed by GitHub
parent d186088a8f
commit cf81f59fa6
5 changed files with 73 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,14 +51,10 @@
</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">{{ srpfleetrequest.character.character_name }}</td>
<td class="text-center">
<a href="{{ srpfleetrequest.killboard_link }}"
target="_blank">{{ srpfleetrequest.killboard_link }}</a>
target="_blank" class="label label-warning">Link</a>
</td>
<td class="text-center">{{ srpfleetrequest.additional_info }}</td>
<td class="text-center">{{ srpfleetrequest.srp_ship_name }}</td>
@@ -83,36 +79,28 @@
{% if perms.auth.srp_management %}
<td class="text-center">
<a href="{% url 'auth_srp_request_update_amount_view' srpfleetrequest.id %}" class="btn btn-info">
<span class="glyphicon glyphicon-pencil"></span>
<a href="{% url 'auth_srp_request_update_amount_view' srpfleetrequest.id %}" class="btn btn-info" title="Update Value">
<span class="glyphicon glyphicon-usd"></span>
</a>
{% if srpfleetrequest.srp_status == "Rejected" %}
<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="{% url 'auth_srp_request_approve' srpfleetrequest.id %}" class="btn btn-success">
{% if srpfleetrequest.srp_status in "RejectedPending" %}
<a href="{% url 'auth_srp_request_approve' srpfleetrequest.id %}" class="btn btn-success" title="Approve">
<span class="glyphicon glyphicon-ok"></span>
</a>
{% elif srpfleetrequest.srp_status == "" %}
<a href="{% url 'auth_srp_request_approve' srpfleetrequest.id %}" class="btn btn-success">
<a href="{% url 'auth_srp_request_approve' srpfleetrequest.id %}" class="btn btn-success" title="Approve">
<span class="glyphicon glyphicon-ok"></span>
</a>
{% endif %}
{% if srpfleetrequest.srp_status == "Approved" %}
<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="{% url 'auth_srp_request_reject' srpfleetrequest.id %}" class="btn btn-warning">
{% if srpfleetrequest.srp_status in "ApprovedPending" %}
<a href="{% url 'auth_srp_request_reject' srpfleetrequest.id %}" class="btn btn-warning" title="Reject">
<span class="glyphicon glyphicon-remove"></span>
</a>
{% elif srpfleetrequest.srp_status == "" %}
<a href="{% url 'auth_srp_request_reject' srpfleetrequest.id %}" class="btn btn-warning">
<a href="{% url 'auth_srp_request_reject' srpfleetrequest.id %}" class="btn btn-warning" title="Reject">
<span class="glyphicon glyphicon-remove"></span>
</a>
{% endif %}
<a href="{% url 'auth_srp_request_remove' srpfleetrequest.id %}" class="btn btn-danger">
<a href="{% url 'auth_srp_request_remove' srpfleetrequest.id %}" class="btn btn-danger" title="Remove">
<span class="glyphicon glyphicon-trash"></span>
</a>

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

@@ -40,6 +40,7 @@
<th class="text-center">{% trans "Fleet SRP Code" %}</th>
<th class="text-center">{% trans "Fleet ISK Cost" %}</th>
<th class="text-center">{% trans "SRP Status" %}</th>
<th class="text-center">{% trans "Pending Requests" %}</th>
<th class="text-center">{% trans "Actions" %}</th>
</tr>
{% for srpfleet in srpfleets %}
@@ -56,27 +57,21 @@
{{ srpfleet.fleet_commander.character_name }}
</div>
</td>
<th class="text-center"><a href="{{ srpfleet.fleet_srp_aar_link }}"
target="_blank">{{ srpfleet.fleet_srp_aar_link }}</a></th>
<th class="text-center">
<td class="text-center">
{% if srpfleet.fleet_srp_aar_link %}
<a href="{{ srpfleet.fleet_srp_aar_link }}" target="_blank" class="label label-primary">{% trans 'Link' %}</a>
{% endif %}
</td>
<td class="text-center">
{% if srpfleet.fleet_srp_code %}
<div class="label label-warning">
<a href="{% url 'auth_srp_request_view' srpfleet.fleet_srp_code %}"
>{{ srpfleet.fleet_srp_code }}</a>
</div>
<a class="label label-warning" href="{% url 'auth_srp_request_view' srpfleet.fleet_srp_code %}">{{ srpfleet.fleet_srp_code }}</a>
{% else %}
<div class="label label-danger">
{% trans "Disabled" %}
</div>
{% endif %}
</th>
<td class="text-center">
{% for key,value in price_pair.items %}
{% if key == srpfleet.id %}
ISK: {{ value | intcomma }}
{% endif %}
{% endfor %}
</td>
<td class="text-center">ISK: {{ srpfleet.total_cost | intcomma }}</td>
<td class="text-center">
{% if srpfleet.fleet_srp_status == "" %}
@@ -89,26 +84,29 @@
</div>
{% endif %}
</td>
<td class="text-center">
<div class="label label-warning">{{ srpfleet.pending_requests }}</div>
</td>
<td class="text-center">
<a href="{% url 'auth_srp_fleet_view' srpfleet.id %}" class="btn btn-primary">
<a href="{% url 'auth_srp_fleet_view' srpfleet.id %}" class="btn btn-primary" title="View">
<span class="glyphicon glyphicon-eye-open"></span>
</a>
{% if perms.auth.srp_management %}
<a href="{% url 'auth_srp_fleet_edit_view' srpfleet.id %}" class="btn btn-info">
<a href="{% url 'auth_srp_fleet_edit_view' srpfleet.id %}" class="btn btn-info" title="Edit">
<span class="glyphicon glyphicon-pencil"></span>
</a>
<a href="{% url 'auth_srp_fleet_remove' srpfleet.id %}" class="btn btn-danger">
<a href="{% url 'auth_srp_fleet_remove' srpfleet.id %}" class="btn btn-danger" title="Remove">
<span class="glyphicon glyphicon-trash"></span>
</a>
{% if srpfleet.fleet_srp_code %}
<a href="{% url 'auth_srp_fleet_disable' srpfleet.id %}" class="btn btn-warning">
<a href="{% url 'auth_srp_fleet_disable' srpfleet.id %}" class="btn btn-warning" title="Disable">
<span class="glyphicon glyphicon-remove-sign"></span>
</a>
{% else %}
<a href="{% url 'auth_srp_fleet_enable' srpfleet.id %}" class="btn btn-success">
<a href="{% url 'auth_srp_fleet_enable' srpfleet.id %}" class="btn btn-success" title="Enable">
<span class="glyphicon glyphicon-ok-sign"></span>
</a>
{% endif %}