theluyuan/shynet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use new a17t and Tailwind

Browse Source
This commit is contained in:
R. Miles McCain 2021-12-31 13:25:10 -05:00
parent fc38fd88bd
commit 04f095b4fb
29 changed files with 93 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
shynet/a17t/static/a17t/css/tailwind.css
View File

@ -1,3 +1,9 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
@tailwind utilities;
@layer components {
.litepicker .container__main {
@apply card p-2;
}
}

6
shynet/a17t/templates/a17t/includes/field.html
View File

@ -28,10 +28,10 @@
{% endfor %}
{% elif field|is_input %}
{% include 'a17t/includes/label.html' %}
{{field|add_class:"input my-1"}}
{{field|add_class:"input ~neutral my-1"}}
{% elif field|is_textarea %}
{% include 'a17t/includes/label.html' %}
{{ field|add_class:'textarea my-1' }}
{{ field|add_class:'textarea ~neutral my-1' }}
{% elif field|is_select %}
{% include 'a17t/includes/label.html' %}
<div class="select {% if field.errors|length > 0 %}~critical{% endif %} my-1">
@ -39,7 +39,7 @@
</div>
{% else %}
{% include 'a17t/includes/label.html' %}
{{field|add_class:"field my-1"}}
{{field|add_class:"field ~neutral my-1"}}
{% endif %}
{% for error in field.errors %}

20
shynet/a17t/templates/a17t/includes/pagination.html
View File

@ -1,23 +1,23 @@
<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">
{% if page.has_previous %}
<a href="?page={{ page.previous_page_number }}&{{url_parameters}}" class="button field !low bg-neutral-000 w-auto mr-1">Previous</a>
<a href="?page={{ page.previous_page_number }}&{{url_parameters}}" class="button ~neutral @low w-auto mr-1">Previous</a>
{% else %}
<a class="button field !low bg-neutral-000 w-auto mr-1" disabled>Previous</a>
<a class="button ~neutral @low w-auto mr-1" disabled>Previous</a>
{% endif %}
{% if page.has_next %}
<a href="?page={{ page.next_page_number }}&{{url_parameters}}" class="button field !low bg-neutral-000 w-auto">Next</a>
<a href="?page={{ page.next_page_number }}&{{url_parameters}}" class="button ~neutral @low w-auto">Next</a>
{% else %}
<a class="button field !low bg-neutral-000 w-auto" disabled>Next</a>
<a class="button ~neutral @low w-auto" disabled>Next</a>
{% endif %}
</div>
<ul class="pagination-list w-full md:w-auto mb-2 flex">
{% for pnum in begin %}
{% ifequal page.number pnum %}
<li><a class="button field !low w-auto mx-1 text-white bg-neutral-700">{{ pnum }}</a></li>
<li><a class="button ~neutral @high w-auto mx-1">{{ pnum }}</a></li>
{% else %}
<li><a class="button field !low bg-neutral-000 w-auto mx-1" href="?page={{ pnum }}&{{url_parameters}}">{{ pnum }}</a></li>
<li><a class="button ~neutral @low w-auto mx-1" href="?page={{ pnum }}&{{url_parameters}}">{{ pnum }}</a></li>
{% endifequal %}
{% endfor %}
@ -25,9 +25,9 @@
<li><span class="pagination-ellipsis">&hellip;</span></li>
{% for pnum in middle %}
{% ifequal page.number pnum %}
<li><a class="button field !low w-auto mx-1 text-white bg-neutral-700">{{ pnum }}</a></li>
<li><a class="button ~neutral @high w-auto mx-1">{{ pnum }}</a></li>
{% else %}
<li><a class="button field !low bg-neutral-000 w-auto mx-1" href="?page={{ pnum }}&{{url_parameters}}">{{ pnum }}</a></li>
<li><a class="button ~neutral @low w-auto mx-1" href="?page={{ pnum }}&{{url_parameters}}">{{ pnum }}</a></li>
{% endifequal %}
{% endfor %}
{% endif %}
@ -36,9 +36,9 @@
<li><span class="pagination-ellipsis">&hellip;</span></li>
{% for pnum in end %}
{% ifequal page.number pnum %}
<li><a class="button field !low w-auto mx-1 text-white bg-neutral-700">{{ pnum }}</a></li>
<li><a class="button ~neutral @high w-auto mx-1">{{ pnum }}</a></li>
{% else %}
<li><a class="button field !low bg-neutral-000 w-auto mx-1" href="?page={{ pnum }}&{{url_parameters}}">{{ pnum }}</a></li>
<li><a class="button ~neutral @low w-auto mx-1" href="?page={{ pnum }}&{{url_parameters}}">{{ pnum }}</a></li>
{% endifequal %}
{% endfor %}
{% endif %}

14
shynet/dashboard/static/dashboard/css/global.css
View File

@ -37,18 +37,4 @@
.geo-card--use-table-view .geo-table {
display: inline-block;
}
:root {
--color-neutral-000: white;
--color-neutral-50: #F8FAFC;
--color-neutral-100: #F1F5F9;
--color-neutral-200: #E2E8F0;
--color-neutral-300: #CBD5E1;
--color-neutral-400: #94A3B8;
--color-neutral-500: #64748B;
--color-neutral-600: #475569;
--color-neutral-700: #334155;
--color-neutral-800: #1E293B;
--color-neutral-900: #0F172A;
}

2
shynet/dashboard/templates/account/base.html
View File

@ -6,7 +6,7 @@
</div>
<hr class="sep">
{% block main %}
<div class="card ~neutral !low max-w-lg content">
<div class="card max-w-lg content">
{% block card %}
{% endblock %}
</div>

8
shynet/dashboard/templates/account/email.html
View File

@ -6,7 +6,7 @@
{% block page_title %}{% trans "Email Addresses" %}{% endblock %}
{% block main %}
<div class="card ~neutral !low max-w-lg">
<div class="card max-w-lg">
{% if user.emailaddress_set.all %}
<p>{% trans 'These are your known email addresses:' %}</p>
@ -33,7 +33,7 @@
{% endfor %}
<div class="block mt-4">
<button class="button ~neutral !high mb-1" type="submit" name="action_primary">{% trans 'Make Primary' %}</button>
<button class="button ~neutral @high mb-1" type="submit" name="action_primary">{% trans 'Make Primary' %}</button>
<button class="button ~neutral mb-1" type="submit" name="action_send">{% trans 'Resend Verification' %}</button>
<button class="button ~neutral mb-1" type="submit" name="action_remove">{% trans 'Remove' %}</button>
</div>
@ -51,10 +51,10 @@
<hr class="sep">
<form method="post" action="{% url 'account_email' %}" class="card ~neutral !low max-w-lg">
<form method="post" action="{% url 'account_email' %}" class="card max-w-lg">
{% csrf_token %}
{{ form|a17t }}
<button name="action_add" class="button ~neutral !high" type="submit">{% trans "Add Address" %}</button>
<button name="action_add" class="button ~neutral @high" type="submit">{% trans "Add Address" %}</button>
</form>
{% endblock %}

2
shynet/dashboard/templates/account/email_confirm.html
View File

@ -18,7 +18,7 @@
<form method="post" action="{% url 'account_confirm_email' confirmation.key %}">
{% csrf_token %}
<button type="submit" class="button ~positive !high">{% trans 'Confirm' %}</button>
<button type="submit" class="button ~positive @high">{% trans 'Confirm' %}</button>
</form>
{% else %}

2
shynet/dashboard/templates/account/login.html
View File

@ -16,7 +16,7 @@
{% if redirect_field_value %}
<input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
{% endif %}
<button class="button ~urge !high mr-2" type="submit">{% trans "Sign In" %}</button>
<button class="button ~urge @high mr-2" type="submit">{% trans "Sign In" %}</button>
<a href="{% url 'account_reset_password' %}" class="button ~neutral mr-2">{% trans "Reset Password" %}</a>
<a href="{{ signup_url }}" class="button ~neutral">Sign Up</a>
</form>

2
shynet/dashboard/templates/account/logout.html
View File

@ -13,6 +13,6 @@
{% if redirect_field_value %}
<input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}"/>
{% endif %}
<button type="submit" class="button ~neutral !high">{% trans 'Sign Out' %}</button>
<button type="submit" class="button ~neutral @high">{% trans 'Sign Out' %}</button>
</form>
{% endblock %}

2
shynet/dashboard/templates/account/password_change.html
View File

@ -9,6 +9,6 @@
<form method="POST" action="{% url 'account_change_password' %}" class="password_change max-w-lg">
{% csrf_token %}
{{ form|a17t }}
<button type="submit" name="action" class="button ~urge !high">{% trans "Change Password" %}</button>
<button type="submit" name="action" class="button ~urge @high">{% trans "Change Password" %}</button>
</form>
{% endblock %}

2
shynet/dashboard/templates/account/password_reset.html
View File

@ -18,6 +18,6 @@
<form method="POST" action="{% url 'account_reset_password' %}" class="password_reset max-w-lg">
{% csrf_token %}
{{ form|a17t }}
<button type="submit" class="button ~urge !high">{% trans 'Reset Password' %}</button>
<button type="submit" class="button ~urge @high">{% trans 'Reset Password' %}</button>
</form>
{% endblock %}

2
shynet/dashboard/templates/account/password_reset_from_key.html
View File

@ -13,7 +13,7 @@
<form method="POST" action="{{ action_url }}" class="max-w-lg">
{% csrf_token %}
{{ form|a17t }}
<button type="submit" name="action" class="button ~urge !high">{% trans 'Change Password' %}</button>
<button type="submit" name="action" class="button ~urge @high">{% trans 'Change Password' %}</button>
</form>
{% else %}
<p>{% trans 'Your password is now changed.' %}</p>

2
shynet/dashboard/templates/account/password_reset_from_key_done.html
View File

@ -6,5 +6,5 @@
{% block card %}
<p>{% trans 'Your password is now changed.' %}</p>
<a href="{% url 'account_login' %}" class="button ~urge !high">Log In</a>
<a href="{% url 'account_login' %}" class="button ~urge @high">Log In</a>
{% endblock %}

2
shynet/dashboard/templates/account/password_set.html
View File

@ -9,6 +9,6 @@
<form method="POST" action="{% url 'account_set_password' %}" class="password_set">
{% csrf_token %}
{{ form|a17t }}
<button type="submit" name="action" class="button ~urge !high">{% trans 'Set Password' %}</button>
<button type="submit" name="action" class="button ~urge @high">{% trans 'Set Password' %}</button>
</form>
{% endblock %}

2
shynet/dashboard/templates/account/signup.html
View File

@ -14,7 +14,7 @@
{% if redirect_field_value %}
<input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
{% endif %}
<button type="submit" class="button ~urge !high">{% trans "Sign Up" %}</button>
<button type="submit" class="button ~urge @high">{% trans "Sign Up" %}</button>
</form>
{% endblock %}

6
shynet/dashboard/templates/base.html
View File

@ -23,7 +23,7 @@
{% endblock %}
</head>
<body class="bg-neutral-100 min-h-full overflow-x-hidden">
<body class="bg-neutral-50 min-h-full overflow-x-hidden">
{% block body %}
<section class="max-w-screen-xl mx-auto px-4 py-4 md:py-12 md:flex">
@ -34,7 +34,7 @@
<i class="fas fa-binoculars fa-2x text-urge-600 md:hidden"></i>
</a>
<a tabindex="0" role="button" class="button ~neutral !low md:hidden"
<a tabindex="0" role="button" class="text-neutral-600 md:hidden"
onclick="document.getElementById('navMenuExpanded').classList.toggle('hidden')">
<span class="icon">
<i class="fas fa-bars"></i>
@ -110,7 +110,7 @@
{% if messages %}
<div>
{% for message in messages %}
<article class="card {{message.tags}} !high mb-2 w-full">{{message}}</article>
<article class="card {{message.tags}} @high mb-2 w-full">{{message}}</article>
{% endfor %}
</ul>
</div>

28
shynet/dashboard/templates/dashboard/includes/date_range.html
View File

@ -1,18 +1,20 @@
<form method="GET" id="datePicker">
<input type="hidden" name="startDate" value="{{start_date.isoformat}}" id="startDate">
<input type="hidden" name="endDate" value="{{end_date.isoformat}}" id="endDate">
</form>
<input type="input" id="rangePicker" placeholder="Date range" class="input ~neutral !low bg-neutral-000 cursor-pointer" style="max-width: 200px;" readonly>
<div class="~urge">
<form method="GET" id="datePicker" class="~urge">
<input type="hidden" name="startDate" value="{{start_date.isoformat}}" id="startDate">
<input type="hidden" name="endDate" value="{{end_date.isoformat}}" id="endDate">
</form>
<input type="input" id="rangePicker" placeholder="Date range" class="button ~neutral @low cursor-pointer" style="max-width: 200px;" readonly>
</div>
<style>
:root {
--litepicker-button-prev-month-color-hover: var(--color-urge);
--litepicker-button-next-month-color-hover: var(--color-urge);
--litepicker-day-color-hover: var(--color-urge);
--litepicker-is-today-color: var(--color-urge);
--litepicker-is-in-range-color: var(--color-urge-normal-fill);
--litepicker-is-start-color-bg: var(--color-urge);
--litepicker-is-end-color-bg: var(--color-urge);
--litepicker-button-apply-color-bg: var(--color-urge);
--litepicker-button-prev-month-color-hover: #7c3aed;
--litepicker-button-next-month-color-hover: #7c3aed;
--litepicker-day-color-hover: #7c3aed;
--litepicker-is-today-color: #7c3aed;
--litepicker-is-in-range-color: #ddd6fe;
--litepicker-is-start-color-bg: #7c3aed;
--litepicker-is-end-color-bg: #7c3aed;
--litepicker-button-apply-color-bg: #7c3aed;
}
.litepicker .container__predefined-ranges, .litepicker .container__months {

2
shynet/dashboard/templates/dashboard/includes/service_overview.html
View File

@ -1,6 +1,6 @@
{% load humanize helpers %}
<a class="card chart-card overflow-visible ~neutral !low service mb-6 p-0" href="{% contextual_url 'dashboard:service' object.uuid %}">
<a class="card chart-card overflow-visible service mb-6 p-0" href="{% contextual_url 'dashboard:service' object.uuid %}">
{% with stats=object.stats %}
<div class="p-4 md:flex justify-between overflow-none">
<div class="flex items-center mb-4 md:mb-0 md:flex-1 md:min-w-0 truncate pr-0 md:pr-2">

2
shynet/dashboard/templates/dashboard/includes/service_snippet.html
View File

@ -1,4 +1,4 @@
<div class="card ~neutral !high font-mono text-sm whitespace-pre-wrap break-all">{% filter force_escape %}<noscript>
<div class="card ~neutral @high font-mono text-sm whitespace-pre-wrap break-all">{% filter force_escape %}<noscript>
<img src="{{script_protocol}}{{request.get_host}}{% url 'ingress:endpoint_pixel' object.uuid %}">
</noscript>
<script defer src="{{script_protocol}}{{request.get_host}}{% url 'ingress:endpoint_script' object.uuid %}"></script>{% endfilter %}

4
shynet/dashboard/templates/dashboard/includes/sidebar_portal.html
View File

@ -1,6 +1,6 @@
{% load helpers %}
<div>
<a class="portal !low {% if request.get_full_path|startswith:url %}~urge active bg-neutral-100{% endif %} flex items-center" title="{{label}}"
{% if disable_turbolinks %}data-turbolinks="false"{% endif %} href="{{url}}">{{icon}} <span class="truncate">{{label}}</span></a>
<a class="portal {% if request.get_full_path|startswith:url %}text-urge-600{% endif %} flex items-center" title="{{label}}"
href="{{url}}">{{icon}} <span class="truncate">{{label}}</span></a>
</div>

2
shynet/dashboard/templates/dashboard/includes/stats_status_chip.html
View File

@ -2,7 +2,7 @@
{% with stats=object.get_daily_stats %}
{% if stats.currently_online > 0 %}
<span class="chip ~positive !high whitespace-nowrap">
<span class="chip ~positive @high whitespace-nowrap">
{{stats.currently_online|intcomma}} online
</span>
{% endif %}

4
shynet/dashboard/templates/dashboard/pages/dashboard.html
View File

@ -13,7 +13,7 @@
</div>
{% has_perm "core.create_service" user as can_create %}
{% if can_create %}
<a href="{% url 'dashboard:service_create' %}" class="button field !low bg-neutral-000 w-auto">+ New Service</a>
<a href="{% url 'dashboard:service_create' %}" class="button ~neutral @low w-auto">+ New Service</a>
{% endif %}
</div>
</div>
@ -21,7 +21,7 @@
{% for object in object_list|dictsortreversed:"stats.session_count" %}
{% include 'dashboard/includes/service_overview.html' %}
{% empty %}
<p class="aside ~urge !high">You don't have any services yet. {% if can_create %}Get started by <a href="{% url 'dashboard:service_create' %}" class="underline">creating one</a>.{% endif %}</p>
<p class="aside ~urge @high">You don't have any services yet. {% if can_create %}Get started by <a href="{% url 'dashboard:service_create' %}" class="underline">creating one</a>.{% endif %}</p>
{% endfor %}
{% if object_list %}

2
shynet/dashboard/templates/dashboard/pages/index.html
View File

@ -4,6 +4,6 @@
<section class="content">
<h2>{{request.site.name}} Analytics</h2>
<p>{{request.site.name}} uses Shynet. Eventually, more information about Shynet will be available here.</p>
<a href="{% url 'account_login' %}" class="button ~urge !high">Log In</a>
<a href="{% url 'account_login' %}" class="button ~urge @high">Log In</a>
</section>
{% endblock %}

26
shynet/dashboard/templates/dashboard/pages/service.html
View File

@ -6,7 +6,7 @@
<div class="mr-2">{% include 'dashboard/includes/date_range.html' %}</div>
{% has_perm 'core.change_service' user object as can_update %}
{% if can_update %}
<a href="{% contextual_url 'dashboard:service_update' service.uuid %}" class="button field !low bg-neutral-000 w-auto">Manage &rarr;</a>
<a href="{% contextual_url 'dashboard:service_update' service.uuid %}" class="button ~neutral @low w-auto">Manage &rarr;</a>
{% endif %}
{% endblock %}
@ -19,7 +19,7 @@
{% include 'dashboard/includes/service_snippet.html' %}
</div>
{% else %}
<div class="grid grid-cols-2 gap-6 md:flex justify-between mb-6 card ~neutral !high px-6" id="stats">
<div class="grid grid-cols-2 gap-6 md:flex justify-between mb-6 card ~neutral @high px-6" id="stats">
{% with classes="text-sm font-semibold" good_classes="text-positive-400" bad_classes="text-critical-400" neutral_classes="text-gray-400" %}
<article class="">
<p class="label text-gray-400">Sessions</p>
@ -93,12 +93,12 @@
</article>
{% endwith %}
</div>
<div class="card overflow-visible ~neutral !low py-0 mb-6">
<div class="card overflow-visible py-0 mb-6">
{% include 'dashboard/includes/time_chart.html' with data=stats.chart_data tooltip_format=stats.chart_tooltip_format granularity=stats.chart_granularity click_zoom=True %}
</div>
{% endif %}
<div id="card-grid" class="grid grid-cols-1 md:grid-cols-2 gap-6 mb-6">
<div class="card ~neutral !low limited-height py-2">
<div class="card limited-height py-2">
<table class="table">
<thead class="text-sm">
<tr>
@ -132,22 +132,22 @@
</tbody>
</table>
</div>
<div class="geo-map card ~neutral !low py-2 overflow-y-hidden">
<div class="geo-map card py-2 overflow-y-hidden">
<p class="text-sm font-semibold p-2 border-b mb-2" style="color: var(--color-title)">
Sessions by Geography &nbsp
<button onclick="document.getElementById('card-grid').classList.add('geo-card--use-table-view')" class="text-xs select-none p-0 button ~urge !low">
<button onclick="document.getElementById('card-grid').classList.add('geo-card--use-table-view')" class="text-xs select-none p-0 text-urge-600">
(view table)
</button>
</p>
{% include 'dashboard/includes/map_chart.html' with countries=stats.countries %}
</div>
<div class="geo-table card ~neutral !low limited-height py-2">
<div class="geo-table card limited-height py-2">
<table class="table">
<thead class="text-sm">
<tr>
<th>
Country &nbsp
<button onclick="document.getElementById('card-grid').classList.remove('geo-card--use-table-view'); geoMap.resize()" class="text-xs select-none p-0 button ~urge !low">
<button onclick="document.getElementById('card-grid').classList.remove('geo-card--use-table-view'); geoMap.resize()" class="text-xs select-none p-0 text-urge-600">
(view map)
</button>
</th>
@ -180,7 +180,7 @@
</tbody>
</table>
</div>
<div class="card ~neutral !low limited-height py-2">
<div class="card limited-height py-2">
<table class="table">
<thead class="text-sm">
<tr>
@ -214,7 +214,7 @@
</tbody>
</table>
</div>
<div class="card ~neutral !low limited-height py-2">
<div class="card limited-height py-2">
<table class="table">
<thead class="text-sm">
<tr>
@ -248,7 +248,7 @@
</tbody>
</table>
</div>
<div class="card ~neutral !low limited-height py-2">
<div class="card limited-height py-2">
<table class="table">
<thead class="text-sm">
<tr>
@ -283,7 +283,7 @@
</tbody>
</table>
</div>
<div class="card ~neutral !low limited-height py-2">
<div class="card limited-height py-2">
<table class="table">
<thead class="text-sm">
<tr>
@ -318,7 +318,7 @@
</table>
</div>
</div>
<div class="card ~neutral !low py-2 overflow-auto">
<div class="card py-2 overflow-auto">
{% include 'dashboard/includes/session_list.html' %}
<hr class="sep h-8 md:h-12">
<a href="{% contextual_url 'dashboard:service_session_list' service.uuid %}" class="button ~neutral w-auto mb-2">View more

8
shynet/dashboard/templates/dashboard/pages/service_create.html
View File

@ -7,14 +7,14 @@
{% block content %}
<h4 class="heading leading-none">Create Service</h4>
<hr class="sep">
<form class="card ~neutral !low p-0 max-w-xl" method="POST">
<form class="card p-0 max-w-xl" method="POST">
{% csrf_token %}
<div class="p-4">
{% include 'dashboard/includes/service_form.html' %}
</div>
<div class="section ~urge !normal p-4">
<button type="submit" class="button ~urge !high">Create</button>
<a href="{% url 'dashboard:dashboard' %}" class="button ~urge !low">Cancel</a>
<div class="section ~urge @low p-4">
<button type="submit" class="button ~urge @high">Create</button>
<a href="{% url 'dashboard:dashboard' %}" class="ml-4 text-urge-600">Cancel</a>
</div>
</form>
{% endblock %}

8
shynet/dashboard/templates/dashboard/pages/service_delete.html
View File

@ -5,16 +5,16 @@
{% block head_title %}Delete {{object.name}}{% endblock %}
{% block service_content %}
<form class="card ~neutral !low p-0 max-w-xl" method="POST">
<form class="card p-0 max-w-xl" method="POST">
{% csrf_token %}
<div class="p-4">
<p>Are you sure you want to delete this service? All of its
analytics and associated data will be permanently deleted.</p>
{{form|a17t}}
</div>
<div class="section ~critical !normal p-4">
<button type="submit" class="button ~critical !high">Delete</button>
<a href="{% url 'dashboard:service' object.uuid %}" class="button ~critical !low">Cancel</a>
<div class="section ~critical @low p-4">
<button type="submit" class="button ~critical @high">Delete</button>
<a href="{% url 'dashboard:service' object.uuid %}" class="ml-4 text-critical-600">Cancel</a>
</div>
</form>
{% endblock %}

8
shynet/dashboard/templates/dashboard/pages/service_session.html
View File

@ -5,11 +5,11 @@
{% block head_title %}{{object.name}} Session{% endblock %}
{% block service_actions %}
<a href="{% contextual_url 'dashboard:service' object.uuid %}" class="button field !low bg-neutral-000 w-auto">Analytics &rarr;</a>
<a href="{% contextual_url 'dashboard:service' object.uuid %}" class="button ~neutral @low w-auto">Analytics &rarr;</a>
{% endblock %}
{% block service_content %}
<article class="card ~neutral !high">
<article class="card ~neutral @high">
<div class="md:flex items-center justify-between">
<div>
<h3 class="heading text-2xl mr-4">
@ -18,7 +18,7 @@
</div>
<div>
<p class="font-medium text-lg">{{session.start_time|date:"M j Y, g:i a"}} to
{{session.last_seen|date:"g:i a"}}{% if session.is_currently_active %} <span class="chip ~positive !high text-base">Online</span>{% endif %}</p>
{{session.last_seen|date:"g:i a"}}{% if session.is_currently_active %} <span class="chip ~positive @high text-base">Online</span>{% endif %}</p>
</div>
</div>
<hr class="sep h-8 md:h-12">
@ -70,7 +70,7 @@
<div class="md:w-2/12 mb-2 md:mr-4 pt-4 md:text-right">
<div class="text-lg font-medium">{{hit.start_time|date:"g:i a"}}</div>
</div>
<div class="md:flex card ~neutral !low flex-grow justify-between">
<div class="md:flex card flex-grow justify-between">
<div class="mb-4 md:mb-0 md:w-1/2">
<p class="label font-medium text-lg truncate">{{hit.location|default:"Unknown"|urlize}}</p>
{% if hit.referrer %}

4
shynet/dashboard/templates/dashboard/pages/service_session_list.html
View File

@ -6,11 +6,11 @@
{% block service_actions %}
<div class="mr-2">{% include 'dashboard/includes/date_range.html' %}</div>
<a href="{% contextual_url 'dashboard:service' object.uuid %}" class="button field ~neutral !low bg-neutral-000 w-auto">Analytics &rarr;</a>
<a href="{% contextual_url 'dashboard:service' object.uuid %}" class="button ~neutral @low bg-neutral-000 w-auto">Analytics &rarr;</a>
{% endblock %}
{% block service_content %}
<div class="card ~neutral !low mb-8 pt-2 max-w-full overflow-x-auto">
<div class="card mb-8 pt-2 max-w-full overflow-x-auto">
{% include 'dashboard/includes/session_list.html' %}
</div>
{% pagination page_obj request %}

12
shynet/dashboard/templates/dashboard/pages/service_update.html
View File

@ -5,7 +5,7 @@
{% block head_title %}{{object.name}} Management{% endblock %}
{% block service_actions %}
<a href="{% url 'dashboard:service' object.uuid %}" class="button field !low bg-neutral-000 w-auto">View &rarr;</a>
<a href="{% url 'dashboard:service' object.uuid %}" class="button ~neutral @low w-auto">View &rarr;</a>
{% endblock %}
{% block service_content %}
@ -15,18 +15,18 @@
{% include 'dashboard/includes/service_snippet.html' %}
<hr class="sep h-4">
<h5>Settings</h5>
<form class="card ~neutral !low p-0" method="POST">
<form class="card p-0" method="POST">
{% csrf_token %}
<div class="p-4">
{% include 'dashboard/includes/service_form.html' %}
</div>
<div class="section ~neutral !normal p-4 flex justify-between">
<div class="section ~neutral @low p-4 flex justify-between">
<div>
<button type="submit" class="button ~neutral !high">Save</button>
<a href="{% url 'dashboard:service' object.uuid %}" class="button ~neutral !low">Cancel</a>
<button type="submit" class="button ~neutral @high">Save</button>
<a href="{% url 'dashboard:service' object.uuid %}" class="button ~neutral @low">Cancel</a>
</div>
<div>
<a href="{% url 'dashboard:service_delete' object.uuid %}" class="button ~critical !high">Delete</a>
<a href="{% url 'dashboard:service_delete' object.uuid %}" class="button ~critical @high">Delete</a>
</div>
</div>
</form>