mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2025-07-15 07:20:17 +02:00
Merge branch 'v4.x-theme-work' into 'v4.x'
Move User Actions into new Top Nav areas across the internal apps See merge request allianceauth/allianceauth!1581
This commit is contained in:
commit
e109198782
@ -11,16 +11,20 @@
|
|||||||
{% translate "Fleet Operation Timers" %}
|
{% translate "Fleet Operation Timers" %}
|
||||||
{% endblock header_nav_brand %}
|
{% endblock header_nav_brand %}
|
||||||
|
|
||||||
|
{% block header_nav_collapse_right %}
|
||||||
|
{% if perms.auth.optimer_management %}
|
||||||
|
<li class="nav-item">
|
||||||
|
<a class="btn btn-success" href="{% url 'optimer:add' %}">
|
||||||
|
{% translate "Create Operation" %}
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
{% endif %}
|
||||||
|
{% endblock header_nav_collapse_right %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div>
|
<div>
|
||||||
<div class="text-end">
|
|
||||||
{% if perms.auth.optimer_management %}
|
|
||||||
<a href="{% url 'optimer:add' %}" class="btn btn-success">{% translate "Create Operation" %}</a>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="text-center mb-3">
|
<div class="text-center mb-3">
|
||||||
<div class="badge bg-info text-start">
|
<div class="badge bg-primary text-start">
|
||||||
<b>{% translate "Current Eve Time:" %}</b>
|
<b>{% translate "Current Eve Time:" %}</b>
|
||||||
<span id="current-time"></span>
|
<span id="current-time"></span>
|
||||||
</div>
|
</div>
|
||||||
|
@ -11,25 +11,33 @@
|
|||||||
{% translate "Ship Replacement Program" %}
|
{% translate "Ship Replacement Program" %}
|
||||||
{% endblock header_nav_brand %}
|
{% endblock header_nav_brand %}
|
||||||
|
|
||||||
|
{% block header_nav_collapse_left %}
|
||||||
|
<a class="nav-link" href="{% url 'srp:management' %}">
|
||||||
|
{% translate "View Fleets" %}
|
||||||
|
</a>
|
||||||
|
{% endblock header_nav_collapse_left %}
|
||||||
|
|
||||||
|
{% block header_nav_collapse_right %}
|
||||||
|
{% if perms.auth.srp_management %}
|
||||||
|
<li class="nav-item">
|
||||||
|
{% if fleet_status == "Completed" %}
|
||||||
|
<a class="btn btn-warning" href="{% url 'srp:mark_uncompleted' fleet_id %}">
|
||||||
|
{% translate "Mark Incomplete" %}
|
||||||
|
</a>
|
||||||
|
{% else %}
|
||||||
|
<a class="btn btn-success" href="{% url 'srp:mark_completed' fleet_id %}">
|
||||||
|
{% translate "Mark Completed" %}
|
||||||
|
</a>
|
||||||
|
{% endif %}
|
||||||
|
</li>
|
||||||
|
{% endif %}
|
||||||
|
{% endblock header_nav_collapse_right %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div>
|
<div>
|
||||||
{% translate "SRP Fleet Data" as page_header %}
|
{% translate "SRP Fleet Data" as page_header %}
|
||||||
{% include "framework/header/page-header.html" with title=page_header %}
|
{% include "framework/header/page-header.html" with title=page_header %}
|
||||||
|
|
||||||
<div class="text-end mb-3">
|
|
||||||
{% if perms.auth.srp_management %}
|
|
||||||
{% if fleet_status == "Completed" %}
|
|
||||||
<a href="{% url 'srp:mark_uncompleted' fleet_id %}" class="btn btn-warning">
|
|
||||||
{% translate "Mark Incomplete" %}
|
|
||||||
</a>
|
|
||||||
{% else %}
|
|
||||||
<a href="{% url 'srp:mark_completed' fleet_id %}" class="btn btn-success">
|
|
||||||
{% translate "Mark Completed" %}
|
|
||||||
</a>
|
|
||||||
{% endif %}
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{% if srpfleetrequests %}
|
{% if srpfleetrequests %}
|
||||||
<form method="POST">
|
<form method="POST">
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
|
@ -11,22 +11,26 @@
|
|||||||
{% translate "Ship Replacement Program" %}
|
{% translate "Ship Replacement Program" %}
|
||||||
{% endblock header_nav_brand %}
|
{% endblock header_nav_brand %}
|
||||||
|
|
||||||
|
{% block header_nav_collapse_left %}
|
||||||
|
{% if perms.auth.srp_management %}
|
||||||
|
<li class="nav-item">
|
||||||
|
<a class="nav-link" href="{% url 'srp:all' %}">
|
||||||
|
{% translate "View All" %}
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
{% endif %}
|
||||||
|
{% endblock header_nav_collapse_left %}
|
||||||
|
{% block header_nav_collapse_right %}
|
||||||
|
{% if perms.srp.add_srpfleetmain or perms.auth.srp_management %}
|
||||||
|
<li class="nav-item">
|
||||||
|
<a class="btn btn-success" href="{% url 'srp:add' %}">
|
||||||
|
{% translate "Add SRP Fleet" %}
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
{% endif %}
|
||||||
|
{% endblock header_nav_collapse_right %}
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div>
|
<div>
|
||||||
<div class="text-end mb-3">
|
|
||||||
{% if perms.auth.srp_management %}
|
|
||||||
<a href="{% url 'srp:all' %}" class="btn btn-primary">
|
|
||||||
{% translate "View All" %}
|
|
||||||
</a>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% if perms.srp.add_srpfleetmain or perms.auth.srp_management %}
|
|
||||||
<a href="{% url 'srp:add' %}" class="btn btn-success">
|
|
||||||
{% translate "Add SRP Fleet" %}
|
|
||||||
</a>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="alert alert-info" role="alert">
|
<div class="alert alert-info" role="alert">
|
||||||
<div class="text-end">
|
<div class="text-end">
|
||||||
<b>{% translate "Total ISK Cost:" %} {{ totalcost | intcomma }}</b>
|
<b>{% translate "Total ISK Cost:" %} {{ totalcost | intcomma }}</b>
|
||||||
@ -52,9 +56,7 @@
|
|||||||
{% for srpfleet in srpfleets %}
|
{% for srpfleet in srpfleets %}
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
<div class="badge bg-info">
|
{{ srpfleet.fleet_name }}
|
||||||
{{ srpfleet.fleet_name }}
|
|
||||||
</div>
|
|
||||||
</td>
|
</td>
|
||||||
<td>{{ srpfleet.fleet_time | date:"Y-m-d H:i" }}</td>
|
<td>{{ srpfleet.fleet_time | date:"Y-m-d H:i" }}</td>
|
||||||
<td>{{ srpfleet.fleet_doctrine }}</td>
|
<td>{{ srpfleet.fleet_doctrine }}</td>
|
||||||
@ -93,7 +95,7 @@
|
|||||||
<td>
|
<td>
|
||||||
<div class="badge bg-warning">{{ srpfleet.pending_requests }}</div>
|
<div class="badge bg-warning">{{ srpfleet.pending_requests }}</div>
|
||||||
</td>
|
</td>
|
||||||
<td class="text-end">
|
<td class="text-end text-nowrap">
|
||||||
<a href="{% url 'srp:fleet' srpfleet.id %}" class="btn btn-primary btn-sm m-1" title="View">
|
<a href="{% url 'srp:fleet' srpfleet.id %}" class="btn btn-primary btn-sm m-1" title="View">
|
||||||
<i class="fa-solid fa-eye"></i>
|
<i class="fa-solid fa-eye"></i>
|
||||||
</a>
|
</a>
|
||||||
|
@ -13,18 +13,21 @@
|
|||||||
{% translate "Structure Timers" %}
|
{% translate "Structure Timers" %}
|
||||||
{% endblock header_nav_brand %}
|
{% endblock header_nav_brand %}
|
||||||
|
|
||||||
|
|
||||||
|
{% block header_nav_collapse_right %}
|
||||||
|
{% if perms.auth.timer_management %}
|
||||||
|
<li class="nav-item">
|
||||||
|
<a class="btn btn-success" href="{% url 'timerboard:add' %}">
|
||||||
|
{% translate "Create Structure Timer" %}
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
{% endif %}
|
||||||
|
{% endblock header_nav_collapse_right %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div>
|
<div>
|
||||||
<div class="text-end mb-3">
|
|
||||||
{% if perms.auth.timer_management %}
|
|
||||||
<a href="{% url 'timerboard:add' %}" class="btn btn-success">
|
|
||||||
{% translate "Create Structure Timer" %}
|
|
||||||
</a>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="col-lg-12 text-center mb-3">
|
<div class="col-lg-12 text-center mb-3">
|
||||||
<div class="badge bg-info text-start">
|
<div class="badge bg-primary text-start">
|
||||||
<span>{% translate "Current Eve Time:" %}</span>
|
<span>{% translate "Current Eve Time:" %}</span>
|
||||||
<span id="current-time"></span>
|
<span id="current-time"></span>
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user