Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-13 14:30:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'header-nav-improvement' into 'v4.x'

Browse Source 
Header navigation improvements

See merge request allianceauth/allianceauth!1575
This commit is contained in:
Ariel Rin 2023-12-25 09:45:19 +00:00
commit 0db0978d5f
3 changed files with 80 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
allianceauth/corputils/templates/corputils/base.html
View File

@ -10,23 +10,7 @@
{% translate "Corporation Member Data" %} {% translate "Corporation Member Data" %}
{% endblock header_nav_brand %} {% endblock header_nav_brand %}
{% block content %} {% block header_nav_collapse_left %}
<div>
<nav class="navbar navbar-default navbar-expand-lg mb-4">
<div class="container-fluid">
<button
class="navbar-toggler collapsed"
type="button"
data-bs-toggle="collapse"
data-bs-target="#fleetfinder-header-navbar"
aria-controls="fleetfinder-header-navbar"
aria-expanded="false"
aria-label="{% translate 'Toggle navigation' %}"
>
<span class="navbar-toggler-icon"></span>
</button>
<ul class="navbar-nav">
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-expanded="false"> <a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-expanded="false">
{% translate "Corporations" %} {% translate "Corporations" %}
@ -54,8 +38,10 @@
{% endif %} {% endif %}
</ul> </ul>
</li> </li>
</ul> {% endblock %}
{% block header_nav_collapse_right %}
<li class="nav-item">
<form class="navbar-form navbar-right" role="search" action="{% url 'corputils:search' %}" method="GET"> <form class="navbar-form navbar-right" role="search" action="{% url 'corputils:search' %}" method="GET">
<div class="form-group"> <div class="form-group">
<input <input
@ -66,9 +52,11 @@
> >
</div> </div>
</form> </form>
</div> </li>
</nav> {% endblock %}
{% block content %}
<div>
{% block member_data %} {% block member_data %}
{% endblock member_data %} {% endblock member_data %}
</div> </div>

17
allianceauth/corputils/templates/corputils/corpstats.html
View File

@ -97,8 +97,8 @@
<table class="table table-hover" id="table-mains"> <table class="table table-hover" id="table-mains">
<thead> <thead>
<tr> <tr>
<th style="min-height: 1rem;"><!-- Must have a text or height to prevent clipping --></th> <th>{% translate "Main character" %}</th>
<th></th> <th>{% translate "Registered characters" %}</th>
</tr> </tr>
</thead> </thead>
@ -113,9 +113,10 @@
</div> </div>
</div> </div>
</td> </td>
<td> <td>
<table class="table table-hover"> <table class="table table-hover">
{% for alt in main.alts %} {% for alt in main.alts|dictsort:"character_name" %}
{% if forloop.first %} {% if forloop.first %}
<tr> <tr>
<th></th> <th></th>
@ -125,6 +126,7 @@
<th></th> <th></th>
</tr> </tr>
{% endif %} {% endif %}
<tr> <tr>
<td style="width: 5%;"> <td style="width: 5%;">
<div class="thumbnail" style="border: 0 none; box-shadow: none; background: transparent;"> <div class="thumbnail" style="border: 0 none; box-shadow: none; background: transparent;">
@ -133,7 +135,7 @@
</td> </td>
<td style="width: 30%;">{{ alt.character_name }}</td> <td style="width: 30%;">{{ alt.character_name }}</td>
<td style="width: 30%;">{{ alt.corporation_name }}</td> <td style="width: 30%;">{{ alt.corporation_name }}</td>
<td style="width: 30%;">{{ alt.alliance_name }}</td> <td style="width: 30%;">{{ alt.alliance_name|default_if_none:"" }}</td>
<td style="width: 5%;"> <td style="width: 5%;">
<a href="https://zkillboard.com/character/{{ alt.character_id }}/" class="badge bg-danger" target="_blank"> <a href="https://zkillboard.com/character/{{ alt.character_id }}/" class="badge bg-danger" target="_blank">
{% translate "Killboard" %} {% translate "Killboard" %}
@ -176,11 +178,12 @@
</td> </td>
<td>{{ member.character_ownership.user.profile.main_character.character_name }}</td> <td>{{ member.character_ownership.user.profile.main_character.character_name }}</td>
<td>{{ member.character_ownership.user.profile.main_character.corporation_name }}</td> <td>{{ member.character_ownership.user.profile.main_character.corporation_name }}</td>
<td>{{ member.character_ownership.user.profile.main_character.alliance_name }}</td> <td>{{ member.character_ownership.user.profile.main_character.alliance_name|default_if_none:"" }}</td>
</tr> </tr>
{% endfor %} {% endfor %}
{% for member in unregistered %} {% for member in unregistered %}
<tr class="danger"> <tr class="table-danger">
<td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member.character_name }}"></td> <td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member.character_name }}"></td>
<td>{{ member.character_name }}</td> <td>{{ member.character_name }}</td>
<td> <td>
@ -211,7 +214,7 @@
<tbody> <tbody>
{% for member in unregistered %} {% for member in unregistered %}
<tr class="danger"> <tr class="table-danger">
<td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member.character_name }}"></td> <td><img src="{{ member.portrait_url }}" class="img-circle" alt="{{ member.character_name }}"></td>
<td>{{ member.character_name }}</td> <td>{{ member.character_name }}</td>
<td> <td>

12
allianceauth/templates/allianceauth/base-bs5.html
View File

@ -55,7 +55,9 @@
</a> </a>
{% endif %} {% endif %}
<div class="navbar-brand">{% block header_nav_brand %}{{ SITE_NAME }}{% endblock %}</div> <div class="navbar-brand">
{% block header_nav_brand %}{{ SITE_NAME }}{% endblock %}
</div>
<div class="collapse navbar-collapse" id="navbarexpand"> <div class="collapse navbar-collapse" id="navbarexpand">
<div class="m-2"></div> <div class="m-2"></div>
@ -66,9 +68,15 @@
</ul> </ul>
<ul id="nav-right" class="navbar-nav"> <ul id="nav-right" class="navbar-nav">
{% block header_nav_collapse_right %} <!-- Default to add char and swap main --> {% block header_nav_collapse_right %}
{% endblock %}
</ul>
<ul id="nav-right-character-control" class="navbar-nav">
{% block header_nav_user_character_control %} <!-- Default to add char and swap main -->
{% include 'allianceauth/top-menu-rh-default.html' %} {% include 'allianceauth/top-menu-rh-default.html' %}
{% endblock %} {% endblock %}
{% include 'menu/menu-notification-block.html' %} {% include 'menu/menu-notification-block.html' %}
</ul> </ul>
</div> </div>