Lessen priorities on field buttons (#182)
* Lessen priorities on field buttons * Use latest alpine
This commit is contained in:
		
							parent
							
								
									e534269c77
								
							
						
					
					
						commit
						1fd46b019c
					
				@ -1,4 +1,4 @@
 | 
				
			|||||||
FROM python:alpine3.14
 | 
					FROM python:alpine
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Getting things ready
 | 
					# Getting things ready
 | 
				
			||||||
WORKDIR /usr/src/shynet
 | 
					WORKDIR /usr/src/shynet
 | 
				
			||||||
 | 
				
			|||||||
@ -1,23 +1,23 @@
 | 
				
			|||||||
<nav class="flex w-full flex-wrap items-center justify-between" role="navigation" aria-label="pagination">
 | 
					<nav class="flex w-full flex-wrap items-center justify-between" role="navigation" aria-label="pagination">
 | 
				
			||||||
    <div class="w-full md:w-auto mb-2">
 | 
					    <div class="w-full md:w-auto mb-2">
 | 
				
			||||||
        {% if page.has_previous %}
 | 
					        {% if page.has_previous %}
 | 
				
			||||||
        <a href="?page={{ page.previous_page_number }}&{{url_parameters}}" class="button field bg-neutral-000 w-auto mr-1">Previous</a>
 | 
					        <a href="?page={{ page.previous_page_number }}&{{url_parameters}}" class="button field !low bg-neutral-000 w-auto mr-1">Previous</a>
 | 
				
			||||||
        {% else %}
 | 
					        {% else %}
 | 
				
			||||||
        <a class="button field bg-neutral-000 w-auto mr-1" disabled>Previous</a>
 | 
					        <a class="button field !low bg-neutral-000 w-auto mr-1" disabled>Previous</a>
 | 
				
			||||||
        {% endif %}
 | 
					        {% endif %}
 | 
				
			||||||
        {% if page.has_next %}
 | 
					        {% if page.has_next %}
 | 
				
			||||||
        <a href="?page={{ page.next_page_number }}&{{url_parameters}}" class="button field bg-neutral-000 w-auto">Next</a>
 | 
					        <a href="?page={{ page.next_page_number }}&{{url_parameters}}" class="button field !low bg-neutral-000 w-auto">Next</a>
 | 
				
			||||||
        {% else %}
 | 
					        {% else %}
 | 
				
			||||||
        <a class="button field bg-neutral-000 w-auto" disabled>Next</a>
 | 
					        <a class="button field !low bg-neutral-000 w-auto" disabled>Next</a>
 | 
				
			||||||
        {% endif %}
 | 
					        {% endif %}
 | 
				
			||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <ul class="pagination-list w-full md:w-auto mb-2 flex">
 | 
					    <ul class="pagination-list w-full md:w-auto mb-2 flex">
 | 
				
			||||||
        {% for pnum in begin %}
 | 
					        {% for pnum in begin %}
 | 
				
			||||||
        {% ifequal page.number pnum %}
 | 
					        {% ifequal page.number pnum %}
 | 
				
			||||||
        <li><a class="button field w-auto mx-1 text-white bg-neutral-700">{{ pnum }}</a></li>
 | 
					        <li><a class="button field !low w-auto mx-1 text-white bg-neutral-700">{{ pnum }}</a></li>
 | 
				
			||||||
        {% else %}
 | 
					        {% else %}
 | 
				
			||||||
        <li><a class="button field bg-neutral-000 w-auto mx-1" href="?page={{ pnum }}&{{url_parameters}}">{{ pnum }}</a></li>
 | 
					        <li><a class="button field !low bg-neutral-000 w-auto mx-1" href="?page={{ pnum }}&{{url_parameters}}">{{ pnum }}</a></li>
 | 
				
			||||||
        {% endifequal %}
 | 
					        {% endifequal %}
 | 
				
			||||||
        {% endfor %}
 | 
					        {% endfor %}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -25,9 +25,9 @@
 | 
				
			|||||||
        <li><span class="pagination-ellipsis">…</span></li>
 | 
					        <li><span class="pagination-ellipsis">…</span></li>
 | 
				
			||||||
        {% for pnum in middle %}
 | 
					        {% for pnum in middle %}
 | 
				
			||||||
        {% ifequal page.number pnum %}
 | 
					        {% ifequal page.number pnum %}
 | 
				
			||||||
        <li><a class="button field w-auto mx-1 text-white bg-neutral-700">{{ pnum }}</a></li>
 | 
					        <li><a class="button field !low w-auto mx-1 text-white bg-neutral-700">{{ pnum }}</a></li>
 | 
				
			||||||
        {% else %}
 | 
					        {% else %}
 | 
				
			||||||
        <li><a class="button field bg-neutral-000 w-auto mx-1" href="?page={{ pnum }}&{{url_parameters}}">{{ pnum }}</a></li>
 | 
					        <li><a class="button field !low bg-neutral-000 w-auto mx-1" href="?page={{ pnum }}&{{url_parameters}}">{{ pnum }}</a></li>
 | 
				
			||||||
        {% endifequal %}
 | 
					        {% endifequal %}
 | 
				
			||||||
        {% endfor %}
 | 
					        {% endfor %}
 | 
				
			||||||
        {% endif %}
 | 
					        {% endif %}
 | 
				
			||||||
@ -36,9 +36,9 @@
 | 
				
			|||||||
        <li><span class="pagination-ellipsis">…</span></li>
 | 
					        <li><span class="pagination-ellipsis">…</span></li>
 | 
				
			||||||
        {% for pnum in end %}
 | 
					        {% for pnum in end %}
 | 
				
			||||||
        {% ifequal page.number pnum %}
 | 
					        {% ifequal page.number pnum %}
 | 
				
			||||||
        <li><a class="button field w-auto mx-1 text-white bg-neutral-700">{{ pnum }}</a></li>
 | 
					        <li><a class="button field !low w-auto mx-1 text-white bg-neutral-700">{{ pnum }}</a></li>
 | 
				
			||||||
        {% else %}
 | 
					        {% else %}
 | 
				
			||||||
        <li><a class="button field bg-neutral-000 w-auto mx-1" href="?page={{ pnum }}&{{url_parameters}}">{{ pnum }}</a></li>
 | 
					        <li><a class="button field !low bg-neutral-000 w-auto mx-1" href="?page={{ pnum }}&{{url_parameters}}">{{ pnum }}</a></li>
 | 
				
			||||||
        {% endifequal %}
 | 
					        {% endifequal %}
 | 
				
			||||||
        {% endfor %}
 | 
					        {% endfor %}
 | 
				
			||||||
        {% endif %}
 | 
					        {% endif %}
 | 
				
			||||||
 | 
				
			|||||||
@ -2,7 +2,7 @@
 | 
				
			|||||||
    <input type="hidden" name="startDate" value="{{start_date.isoformat}}" id="startDate">
 | 
					    <input type="hidden" name="startDate" value="{{start_date.isoformat}}" id="startDate">
 | 
				
			||||||
    <input type="hidden" name="endDate" value="{{end_date.isoformat}}" id="endDate">
 | 
					    <input type="hidden" name="endDate" value="{{end_date.isoformat}}" id="endDate">
 | 
				
			||||||
</form>
 | 
					</form>
 | 
				
			||||||
<input type="input" id="rangePicker" placeholder="Date range" class="input ~neutral bg-neutral-000 cursor-pointer" style="max-width: 200px;" readonly>
 | 
					<input type="input" id="rangePicker" placeholder="Date range" class="input ~neutral !low bg-neutral-000 cursor-pointer" style="max-width: 200px;" readonly>
 | 
				
			||||||
<style>
 | 
					<style>
 | 
				
			||||||
    :root {
 | 
					    :root {
 | 
				
			||||||
        --litepicker-button-prev-month-color-hover: var(--color-urge);
 | 
					        --litepicker-button-prev-month-color-hover: var(--color-urge);
 | 
				
			||||||
 | 
				
			|||||||
@ -13,7 +13,7 @@
 | 
				
			|||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
        {% has_perm "core.create_service" user as can_create %}
 | 
					        {% has_perm "core.create_service" user as can_create %}
 | 
				
			||||||
        {% if can_create %}
 | 
					        {% if can_create %}
 | 
				
			||||||
        <a href="{% url 'dashboard:service_create' %}" class="button field bg-neutral-000 w-auto">+ New Service</a>
 | 
					        <a href="{% url 'dashboard:service_create' %}" class="button field !low bg-neutral-000 w-auto">+ New Service</a>
 | 
				
			||||||
        {% endif %}
 | 
					        {% endif %}
 | 
				
			||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
</div>
 | 
					</div>
 | 
				
			||||||
 | 
				
			|||||||
@ -6,7 +6,7 @@
 | 
				
			|||||||
<div class="mr-2">{% include 'dashboard/includes/date_range.html' %}</div>
 | 
					<div class="mr-2">{% include 'dashboard/includes/date_range.html' %}</div>
 | 
				
			||||||
{% has_perm 'core.change_service' user object as can_update %}
 | 
					{% has_perm 'core.change_service' user object as can_update %}
 | 
				
			||||||
{% if can_update %}
 | 
					{% if can_update %}
 | 
				
			||||||
<a href="{% contextual_url 'dashboard:service_update' service.uuid %}" class="button field bg-neutral-000 w-auto">Manage →</a>
 | 
					<a href="{% contextual_url 'dashboard:service_update' service.uuid %}" class="button field !low bg-neutral-000 w-auto">Manage →</a>
 | 
				
			||||||
{% endif %}
 | 
					{% endif %}
 | 
				
			||||||
{% endblock %}
 | 
					{% endblock %}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -5,7 +5,7 @@
 | 
				
			|||||||
{% block head_title %}{{object.name}} Session{% endblock %}
 | 
					{% block head_title %}{{object.name}} Session{% endblock %}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
{% block service_actions %}
 | 
					{% block service_actions %}
 | 
				
			||||||
<a href="{% contextual_url 'dashboard:service' object.uuid %}" class="button field bg-neutral-000 w-auto">Analytics →</a>
 | 
					<a href="{% contextual_url 'dashboard:service' object.uuid %}" class="button field !low bg-neutral-000 w-auto">Analytics →</a>
 | 
				
			||||||
{% endblock %}
 | 
					{% endblock %}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
{% block service_content %}
 | 
					{% block service_content %}
 | 
				
			||||||
 | 
				
			|||||||
@ -6,7 +6,7 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
{% block service_actions %}
 | 
					{% block service_actions %}
 | 
				
			||||||
<div class="mr-2">{% include 'dashboard/includes/date_range.html' %}</div>
 | 
					<div class="mr-2">{% include 'dashboard/includes/date_range.html' %}</div>
 | 
				
			||||||
<a href="{% contextual_url 'dashboard:service' object.uuid %}" class="button field ~neutral bg-neutral-000 w-auto">Analytics →</a>
 | 
					<a href="{% contextual_url 'dashboard:service' object.uuid %}" class="button field ~neutral !low bg-neutral-000 w-auto">Analytics →</a>
 | 
				
			||||||
{% endblock %}
 | 
					{% endblock %}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
{% block service_content %}
 | 
					{% block service_content %}
 | 
				
			||||||
 | 
				
			|||||||
@ -5,7 +5,7 @@
 | 
				
			|||||||
{% block head_title %}{{object.name}} Management{% endblock %}
 | 
					{% block head_title %}{{object.name}} Management{% endblock %}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
{% block service_actions %}
 | 
					{% block service_actions %}
 | 
				
			||||||
<a href="{% url 'dashboard:service' object.uuid %}" class="button field bg-neutral-000 w-auto">View →</a>
 | 
					<a href="{% url 'dashboard:service' object.uuid %}" class="button field !low bg-neutral-000 w-auto">View →</a>
 | 
				
			||||||
{% endblock %}
 | 
					{% endblock %}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
{% block service_content %}
 | 
					{% block service_content %}
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user