Compare commits

...

8 Commits

Author SHA1 Message Date
6956e4c487 Merge pull request 'styling-mail' (#388) from styling-mail into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m50s
CI/CD Pipeline / deploy-staging (push) Successful in 5m33s
CI/CD Pipeline / deploy-main (push) Has been skipped
Reviewed-on: #388
2024-04-17 11:10:45 +02:00
Marie Birner
acb1c711e5 [TASK] style notification
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m53s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped
2024-04-17 10:56:22 +02:00
Marie Birner
ec0bd91aa3 [TASK] styling mail
Some checks failed
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test (push) Has been cancelled
2024-04-17 10:54:07 +02:00
de786c2b51 Merge pull request 'fix-spacing' (#387) from fix-spacing into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 12m49s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m31s
Reviewed-on: #387
2024-04-16 20:07:11 +02:00
74f4d4854a Merge pull request 'dont clutter logs' (#385) from usage-stats into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 13m29s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m27s
Reviewed-on: #385
2024-04-16 10:00:45 +02:00
0a01b95c85 Merge pull request 'fix ci' (#383) from usage-stats into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 13m3s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m30s
Reviewed-on: #383
2024-04-16 09:08:26 +02:00
e84547c8ca Merge pull request 'log usage' (#380) from usage-stats into main
Some checks failed
CI/CD Pipeline / deploy-staging (push) Blocked by required conditions
CI/CD Pipeline / deploy-main (push) Blocked by required conditions
CI/CD Pipeline / test (push) Has been cancelled
Reviewed-on: #380
2024-04-16 08:54:25 +02:00
95752703ff Merge pull request 'clean w/ clippy' (#378) from clippy into main
All checks were successful
CI/CD Pipeline / test (push) Successful in 13m11s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Successful in 5m32s
Reviewed-on: #378
2024-04-15 23:37:27 +02:00
3 changed files with 13 additions and 7 deletions

View File

@ -7,13 +7,19 @@
<div class="grid ">
<div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
role="alert">
<h2 class="h2">Mail senden</h2>
<form action="/admin/mail" method="post" enctype="multipart/form-data">
<h2 class="h2">Mail versenden</h2>
<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::input(label="Betreff", name="subject", type="text", required=true) }}
<textarea name="body" rows="4" cols="50" class="dark:text-white"></textarea>
<div class="">
<label for="content" class=" text-sm text-gray-600 dark:text-white ">
Inhalt
</label>
<textarea id="content" name="body" rows="4" cols="50" class="input rounded-md"></textarea>
</div>
<input type="file" name="files" multiple />
<input type="submit" value="Abschicken" />
<input type="submit" class="btn btn-primary" value="Abschicken" />
</form>
</div>
</div>

View File

@ -8,11 +8,11 @@
<div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow mt-5"
role="alert">
<h2 class="h2">Nachricht senden</h2>
<form action="/admin/notification" method="post">
<form action="/admin/notification" method="post" class="grid gap-3 p-3">
{{ macros::select(label="Gruppe", data=roles, name="role_id") }}
{{ macros::input(label="Überschrift", name="category", type="text", required=true) }}
{{ macros::input(label="Nachricht", name="message", type="text", required=true) }}
<input type="submit" value="Abschicken" />
<input type="submit" class="btn btn-primary" value="Abschicken" />
</form>
</div>
</div>

View File

@ -145,7 +145,7 @@
<a href="/admin/user" class="block w-100 py-2 hover:text-primary-600">User</a>
</li>
<li class="py-1">
<a href="/admin/mail" class="block w-100 py-2 hover:text-primary-600">Mail (beautifully layouted)</a>
<a href="/admin/mail" class="block w-100 py-2 hover:text-primary-600">Mail</a>
</li>
<li class="py-1">
<a href="/admin/rss" class="block w-100 py-2 hover:text-primary-600">Logs</a>