Merge branch 'add-corp-and-alliance-tags-to-srp' into 'master'

Add alliance and corp ticker to pilot name

See merge request allianceauth/allianceauth!1265
This commit is contained in:
Ariel Rin 2020-10-11 03:42:56 +00:00
commit 137e8a876d

View File

@ -61,7 +61,7 @@
{% endif %} {% endif %}
</div> </div>
</h1> </h1>
{% if srpfleetrequests %} {% if srpfleetrequests %}
<form method="POST"> <form method="POST">
{% csrf_token %} {% csrf_token %}
@ -104,7 +104,13 @@ ESC to cancel{% endblocktrans %}"id="blah"></i></th>
<tbody> <tbody>
{% for srpfleetrequest in srpfleetrequests %} {% for srpfleetrequest in srpfleetrequests %}
<tr> <tr>
<td class="text-center">{{ srpfleetrequest.character.character_name }}</td> <td class="text-center">
{% if srpfleetrequest.character.alliance.alliance_ticker %}
{{ srpfleetrequest.character.alliance.alliance_ticker }}
{% endif %}
[{{ srpfleetrequest.character.corporation.corporation_ticker }}]
{{ srpfleetrequest.character.character_name }}
</td>
<td class="text-center"> <td class="text-center">
<a href="{{ srpfleetrequest.killboard_link }}" <a href="{{ srpfleetrequest.killboard_link }}"
target="_blank" class="label label-warning">Link</a> target="_blank" class="label label-warning">Link</a>
@ -136,7 +142,7 @@ ESC to cancel{% endblocktrans %}"id="blah"></i></th>
<input type="checkbox" name="{{srpfleetrequest.id}}"> <input type="checkbox" name="{{srpfleetrequest.id}}">
<span class="cr"><i class="cr-icon fas fa-check"></i></span> <span class="cr"><i class="cr-icon fas fa-check"></i></span>
</label> </label>
</div> </div>
</td> </td>
{% endif %} {% endif %}
</tr> </tr>
@ -205,7 +211,7 @@ ESC to cancel{% endblocktrans %}"id="blah"></i></th>
var $next = $(this).closest('tr').next().find('.editable'); var $next = $(this).closest('tr').next().find('.editable');
setTimeout(function() { setTimeout(function() {
$next.editable('show'); $next.editable('show');
}, 400); }, 400);
} }
}); });
}); });
@ -248,4 +254,4 @@ ESC to cancel{% endblocktrans %}"id="blah"></i></th>
}); });
}); });
{% endblock extra_script %} {% endblock extra_script %}