Compare commits

..

No commits in common. "b3fd09c7d038e11c99de56300d76481c48638692" and "9158e4ad2a1bca677db44c0900f0ba183fd24997" have entirely different histories.

8 changed files with 46 additions and 63 deletions

View File

@ -1,7 +1,3 @@
<FilesMatch "\.(jpg|png)$">
Header set Cache-Control "public, max-age=31536000, no-transform"
</FilesMatch>
RewriteEngine on RewriteEngine on
RewriteRule ^doppelklinge/?$ /?p=doppelklinge [L] RewriteRule ^doppelklinge/?$ /?p=doppelklinge [L]
RewriteRule ^doppelklinge/([a-zA-Z0-9]{8})/?$ /?p=doppelklinge&c=$1 [L] RewriteRule ^doppelklinge/([a-zA-Z0-9]{8})/?$ /?p=doppelklinge&c=$1 [L]

File diff suppressed because one or more lines are too long

View File

@ -19,10 +19,6 @@ body {
} }
} }
#logo {
height: 38px;
}
.sidebar-sticky { .sidebar-sticky {
height: calc(100vh - 48px); height: calc(100vh - 48px);
overflow-x: hidden; overflow-x: hidden;

BIN
public/img/logo.png (Stored with Git LFS)

Binary file not shown.

File diff suppressed because one or more lines are too long

View File

@ -3,40 +3,38 @@
{% block title %}irgendwas mit Doppelklinge{% endblock %} {% block title %}irgendwas mit Doppelklinge{% endblock %}
{% block content %} {% block content %}
<form action="/doppelklinge" method="post"> <form action="/doppelklinge" method="post">
<div class="form-floating"> <p>Gesamten Mainframe von Position X: 80 Y: 126 einfügen (strg-a, strg-c):</p>
<textarea class="form-control" name="progress" id="progress" style="height: 100px">{{ $progress }}</textarea> <textarea name="progress" rows="4" cols="60">{{ $progress }}</textarea>
<label for="progress">Gesamten Mainframe von Position X: 80 Y: 126 einfügen (strg-a, strg-c)</label> <br />
</div> <input type="submit" value="abschnalzen" />
<br> </form>
<input class="btn btn-primary" type="submit" value="abschnalzen">
</form>
{% if(isset($list)): %} {% if(isset($list)): %}
<hr /> <hr />
<table class="table table-sm table-striped"> <table class="table table-sm table-striped">
<thead> <thead>
<tr> <tr>
<th>Aufgabe</th> <th>Aufgabe</th>
<th>Fortschritt</th> <th>Fortschritt</th>
<th>Ziel</th> <th>Ziel</th>
<th>&uuml;brig</th> <th>&uuml;brig</th>
<th>Prozent</th> <th>Prozent</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for($i = 0; $i < count($list); $i++): %} {% for($i = 0; $i < count($list); $i++): %}
<tr style="background-color: {{ $i >= 5 ? 'red' : 'white' }}"> <tr style="background-color: {{ $i >= 5 ? 'red' : 'white' }}">
<td>{{ $list[$i]->task }}</td> <td>{{ $list[$i]->task }}</td>
<td>{{ number_format($list[$i]->act, 0, '', '.') }}</td> <td>{{ number_format($list[$i]->act, 0, '', '.') }}</td>
<td>{{ number_format($list[$i]->max, 0, '', '.') }}</td> <td>{{ number_format($list[$i]->max, 0, '', '.') }}</td>
<td>{{ number_format($list[$i]->left, 0, '', '.') }}</td> <td>{{ number_format($list[$i]->left, 0, '', '.') }}</td>
<td>{{ $list[$i]->percent }}</td> <td>{{ $list[$i]->percent }}</td>
</tr> </tr>
{% endfor; %} {% endfor; %}
</tbody> </tbody>
</table> </table>
<p>insgesamt {{ $percent }}% erledigt (&oslash; {{ $avg }}%).</p> <p>insgesamt {{ $percent }}% erledigt (&oslash; {{ $avg }}%).</p>
<p>Stand: {{ $dt }}</p> <p>Stand: {{ $dt }}</p>
{% endif; %} {% endif; %}
{% endblock %} {% endblock %}

View File

@ -1,11 +1,8 @@
<!doctype html> <!doctype html>
<html lang="de"> <html>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="Freewartools">
<meta name="keywords" content="fwtrash, Freewar, Browsergame, Browserspiel">
<base href="{{ $basepath ?? "https://fwtrash.de" }}"> <base href="{{ $basepath ?? "https://fwtrash.de" }}">
<title>{% yield title %}</title> <title>{% yield title %}</title>
<link rel="stylesheet" type="text/css" href="./css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="./css/bootstrap.min.css">
@ -14,7 +11,7 @@
<body> <body>
<header class="navbar navbar-dark sticky-top bg-dark flex-md-nowrap p-0 shadow"> <header class="navbar navbar-dark sticky-top bg-dark flex-md-nowrap p-0 shadow">
<a class="navbar-brand col-md-3 col-lg-2 me-0 px-3 fs-6" href="./"> <a class="navbar-brand col-md-3 col-lg-2 me-0 px-3 fs-6" href="./">
<img src="./img/logo.png" id="logo" alt="logo">&nbsp;&nbsp;fwtrash.de <img src="./img/logo-big.png" style="height: 38px">&nbsp;&nbsp;fwtrash.de
</a> </a>
<button class="navbar-toggler position-absolute d-md-none collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" aria-label="Toggle navigation"> <button class="navbar-toggler position-absolute d-md-none collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>

View File

@ -3,13 +3,11 @@
{% block title %}irgendwas mit Vermessungen{% endblock %} {% block title %}irgendwas mit Vermessungen{% endblock %}
{% block content %} {% block content %}
<form action="/vermessung" method="post"> <form action="/vermessung" method="post">
<div class="form-floating"> <p>Gesamtes Clanprotokoll einfügen (strg-a, strg-c):</p>
<textarea class="form-control" name="protocol" id="protocol" style="height: 100px">{{ $protocol }}</textarea> <textarea name="protocol" rows="4" cols="60">{{ $protocol }}</textarea>
<label for="protocol">Gesamtes Clanprotokoll einfügen (strg-a, strg-c)</label> <br />
</div> <input type="submit" value="abschnalzen" />
<br>
<input class="btn btn-primary" type="submit" value="abschnalzen">
</form> </form>
{% if(isset($newest)): %} {% if(isset($newest)): %}