Ruderverein-Donau-Linz/rowt
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects Wiki Activity

Merge pull request 'dont-show-steer-btn-when-no-coxes' (#396) from dont-show-steer-btn-when-no-coxes into staging
Some checks are pending
CI/CD Pipeline / test (push) Waiting to run
Details
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
Details
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
Details

Browse Source 
Reviewed-on: #396
This commit is contained in:
philipp 2024-04-17 13:58:11 +02:00
commit 4bec5443a2
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
templates/admin/mail.html.tera
View File

@ -8,16 +8,16 @@
<div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5" <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
role="alert"> role="alert">
<h2 class="h2">Mail versenden</h2> <h2 class="h2">Mail versenden</h2>
<form action="/admin/mail" method="post" enctype="multipart/form-data" class="grid gap-3 p-3"> <form action="/admin/mail"
method="post"
enctype="multipart/form-data"
class="grid gap-3 p-3">
{{ macros::select(label="Gruppe", data=roles, name="role_id") }} {{ macros::select(label="Gruppe", data=roles, name="role_id") }}
{{ macros::input(label="Betreff", name="subject", type="text", required=true) }} {{ macros::input(label="Betreff", name="subject", type="text", required=true) }}
<div class=""> <div class="">
<label for="content" class=" text-sm text-gray-600 dark:text-white "> <label for="content" class=" text-sm text-gray-600 dark:text-white ">Inhalt</label>
Inhalt
</label>
<textarea id="content" name="body" rows="4" cols="50" class="input rounded-md"></textarea> <textarea id="content" name="body" rows="4" cols="50" class="input rounded-md"></textarea>
</div> </div>
<input type="file" name="files" multiple /> <input type="file" name="files" multiple />
<input type="submit" class="btn btn-primary" value="Abschicken" /> <input type="submit" class="btn btn-primary" value="Abschicken" />
</form> </form>

14
templates/base.html.tera
View File

@ -6,9 +6,17 @@
content="width=device-width, initial-scale=1, shrink-to-fit=no"> content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="manifest" href="public/manifest.json" /> <link rel="manifest" href="public/manifest.json" />
<link rel="stylesheet" href="/public/main.css" /> <link rel="stylesheet" href="/public/main.css" />
<link rel="apple-touch-icon" sizes="180x180" href="/public/images/apple-touch-icon.png"> <link rel="apple-touch-icon"
<link rel="icon" type="image/png" sizes="32x32" href="/public/images/favicon-32x32.png"> sizes="180x180"
<link rel="icon" type="image/png" sizes="16x16" href="/public/images/favicon-16x16.png"> href="/public/images/apple-touch-icon.png">
<link rel="icon"
type="image/png"
sizes="32x32"
href="/public/images/favicon-32x32.png">
<link rel="icon"
type="image/png"
sizes="16x16"
href="/public/images/favicon-16x16.png">
<link rel="manifest" href="/public/images/site.webmanifest"> <link rel="manifest" href="/public/images/site.webmanifest">
<meta name="msapplication-TileColor" content="#da532c"> <meta name="msapplication-TileColor" content="#da532c">
<meta name="theme-color" content="#ffffff"> <meta name="theme-color" content="#ffffff">

6
templates/planned.html.tera
View File

@ -133,13 +133,11 @@
<a href="/planned/remove/{{ planned_event.trip_details_id }}" <a href="/planned/remove/{{ planned_event.trip_details_id }}"
class="btn btn-attention btn-fw">Abmelden</a> class="btn btn-attention btn-fw">Abmelden</a>
{% endif %} {% endif %}
{% if planned_event.max_people > planned_event.rower | length %} {% if planned_event.max_people > planned_event.rower | length and cur_user_participates == false %}
{% if cur_user_participates == false %}
<a href="/planned/join/{{ planned_event.trip_details_id }}" <a href="/planned/join/{{ planned_event.trip_details_id }}"
class="btn btn-primary btn-fw" class="btn btn-primary btn-fw"
{% if planned_event.trip_type %}onclick="return confirm('{{ planned_event.trip_type.question }}');"{% endif %}>Mitrudern</a> {% if planned_event.trip_type %}onclick="return confirm('{{ planned_event.trip_type.question }}');"{% endif %}>Mitrudern</a>
{% endif %} {% endif %}
{% endif %}
{# --- END Row Buttons --- #} {# --- END Row Buttons --- #}
{# --- START Cox Buttons --- #} {# --- START Cox Buttons --- #}
{% if "cox" in loggedin_user.roles %} {% if "cox" in loggedin_user.roles %}
@ -155,7 +153,7 @@
{% include "includes/cox-icon" %} {% include "includes/cox-icon" %}
Abmelden Abmelden
</a> </a>
{% else %} {% elif planned_event.planned_amount_cox > 0 %}
<a href="/cox/join/{{ planned_event.id }}" <a href="/cox/join/{{ planned_event.id }}"
class="block btn {% if amount_cox_missing > 0 %} btn-dark {% else %} btn-gray {% endif %} btn-fw" class="block btn {% if amount_cox_missing > 0 %} btn-dark {% else %} btn-gray {% endif %} btn-fw"
{% if planned_event.trip_type %}onclick="return confirm('{{ planned_event.trip_type.question }}');"{% endif %}> {% if planned_event.trip_type %}onclick="return confirm('{{ planned_event.trip_type.question }}');"{% endif %}>