fix colors

This commit is contained in:
Aron Petau 2025-09-17 20:26:44 +02:00
parent 242d3bd915
commit da5e765d49
13 changed files with 455 additions and 656 deletions

View file

@ -1,103 +1,56 @@
<!-- templates/about.html -->
<!DOCTYPE html>
<html lang="de">
<head>
<meta charset="UTF-8">
<title>Über uns Studio EinsZwoVier</title>
<link rel="stylesheet" href="/static/css/style.css">
<style>
/* Override colors for this page */
header {
background-color: #001F4D; /* navy */
color: #FFD600; /* yellow */
}
h1, h2, h3 {
color: #001F4D; /* navy headers */
}
a {
color: #E6007E; /* magenta links */
}
a:hover {
color: #FFD600;
}
.container {
max-width: 800px;
margin: 3em auto;
background: #fff;
padding: 2em;
border-radius: 10px;
box-shadow: 0 4px 12px rgba(0,0,0,0.1);
}
ul {
list-style-type: disc;
margin-left: 1.5em;
}
footer {
text-align: center;
margin-top: 4em;
color: #555;
padding-bottom: 2em;
}
</style>
</head>
<body>
<header>
<h1>Studio EinsZwoVier Makerspace</h1>
<p>Am Gabriele-von-Bülow-Gymnasium</p>
</header>
{% extends "base.html" %}
<div class="container">
{% block title %}Über uns Studio EinsZwoVier{% endblock %}
{% block content %}
<div class="container">
<section>
<h2>Über den Maker Space</h2>
<p>Seit Dezember 2024 trägt unser Maker Space den Namen <strong>studio einszwovier</strong>. Er ist ein innovativer, digitaler Lernraum, der Kreativität, Technik und Bildungsgerechtigkeit verbindet. Hier wird „Making“ erlebbar: Lernende gestalten ihren Lernprozess aktiv, entdecken individuelle Stärken und erleben durch Selbstwirksamkeit besondere Motivation.</p>
<h2>Über den Maker Space</h2>
<p>Seit Dezember 2024 trägt unser Maker Space den Namen <strong>studio einszwovier</strong>. Er ist ein innovativer, digitaler Lernraum, der Kreativität, Technik und Bildungsgerechtigkeit verbindet. Hier wird „Making“ erlebbar: Lernende gestalten ihren Lernprozess aktiv, entdecken individuelle Stärken und erleben durch Selbstwirksamkeit besondere Motivation.</p>
</section>
<section>
<h2>Ausstattung</h2>
<ul>
<li><strong>3D-Drucker:</strong> Für Modelle und Prototypen.</li>
<li><strong>Lasercutter:</strong> Präzises Schneiden und Gravieren von Materialien.</li>
<li><strong>Microcontroller:</strong> Elektronik und Programmierung.</li>
<li><strong>Holzbearbeitung:</strong> Handwerkliche Projekte.</li>
<li><strong>Textildruckgeräte:</strong> Kreative Designs auf Stoffen.</li>
</ul>
<h2>Ausstattung</h2>
<ul>
<li><strong>3D-Drucker:</strong> Für Modelle und Prototypen.</li>
<li><strong>Lasercutter:</strong> Präzises Schneiden und Gravieren von Materialien.</li>
<li><strong>Microcontroller:</strong> Elektronik und Programmierung.</li>
<li><strong>Holzbearbeitung:</strong> Handwerkliche Projekte.</li>
<li><strong>Textildruckgeräte:</strong> Kreative Designs auf Stoffen.</li>
</ul>
</section>
<section>
<h2>Betreuungsteam</h2>
<p>Betreut wird der Maker Space von <strong>Aron Petau</strong> und <strong>Friedrich Weber</strong>. Sie sind montags bis mittwochs von 11:00 bis 15:00 Uhr vor Ort. Einfach vorbeischauen, Ideen vorstellen und loslegen!</p>
<h2>Betreuungsteam</h2>
<p>Betreut wird der Maker Space von <strong>Aron Petau</strong> und <strong>Friedrich Weber</strong>. Sie sind montags bis mittwochs von 11:00 bis 15:00 Uhr vor Ort. Einfach vorbeischauen, Ideen vorstellen und loslegen!</p>
</section>
<section>
<h2>Öffnungszeiten</h2>
<p>Dienstag bis Donnerstag: 11:00 16:00 Uhr<br>
Raum 124, Gabriele-von-Bülow-Gymnasium</p>
<h2>Öffnungszeiten</h2>
<p>Dienstag bis Donnerstag: 11:00 16:00 Uhr<br>
Raum 124, Gabriele-von-Bülow-Gymnasium</p>
</section>
<section>
<h2>Kontakt</h2>
<p>E-Mail: <a href="mailto:einszwovier@gvb-gymnasium.de">einszwovier@gvb-gymnasium.de</a></p>
<h2>Kontakt</h2>
<p>E-Mail: <a href="mailto:einszwovier@gvb-gymnasium.de">einszwovier@gvb-gymnasium.de</a></p>
</section>
<section>
<h2>Aktuelle Kurse</h2>
<ul>
<li><strong>Löten und Leuchten:</strong> Herstellung von Nachttischleuchten mit 3D-Design und Löttechnik.</li>
<li><strong>Die Vogelvilla:</strong> Bau von Vogelhäusern mit Lasercutter und Holzbearbeitung.</li>
</ul>
<h2>Aktuelle Kurse</h2>
<ul>
<li><strong>Löten und Leuchten:</strong> Herstellung von Nachttischleuchten mit 3D-Design und Löttechnik.</li>
<li><strong>Die Vogelvilla:</strong> Bau von Vogelhäusern mit Lasercutter und Holzbearbeitung.</li>
</ul>
</section>
<section>
<h2>Standort</h2>
<p>Gabriele-von-Bülow-Gymnasium<br>
Tile-Brügge-Weg 63, 13509 Berlin (Tegel)<br>
Telefon: 030 21 00 52 460<br>
E-Mail: <a href="mailto:info@gvb-gymnasium.de">info@gvb-gymnasium.de</a></p>
<h2>Standort</h2>
<p>Gabriele-von-Bülow-Gymnasium<br>
Tile-Brügge-Weg 63, 13509 Berlin (Tegel)<br>
Telefon: 030 21 00 52 460<br>
E-Mail: <a href="mailto:info@gvb-gymnasium.de">info@gvb-gymnasium.de</a></p>
</section>
</div>
<footer>
&copy; 2025 Studio EinsZwoVier Gabriele-von-Bülow-Gymnasium
</footer>
</body>
</html>
</div>
{% endblock %}

View file

@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="en">
<html lang="de">
<head>
<meta charset="UTF-8">
<title>{% block title %}Studio Einszwovier{% endblock %}</title>
@ -11,14 +11,20 @@
<img src="/static/images/logo.png" alt="Studio Einszwovier Logo" class="logo">
</a>
<nav>
<a href="/">Home</a> |
<a href="/about">About</a> |
<a href="/cost">Cost Calculator</a>
<a href="/">Startseite</a> |
<a href="/about">Über uns</a> |
<a href="/cost">Kostenrechner</a> |
<a href="/">Zur Startseite</a>
</nav>
</header>
<main>
{% block content %}{% endblock %}
</main>
<footer>
<img src="/static/images/gvb-logo.png" alt="GVB Logo" class="footer-logo">
&copy; Studio Einszwovier @ GvB Berlin
</footer>
</body>
</html>

View file

@ -1,170 +1,74 @@
<!-- templates/index.html -->
<!DOCTYPE html>
<html lang="en">
{% extends "base.html" %}
<head>
<meta charset="UTF-8">
<title>Print Cost Calculator</title>
<link rel="stylesheet" href="/static/css/style.css">
<style>
body {
font-family: sans-serif;
margin: 2em;
background-color: #f9f9f9;
color: #333;
}
{% block title %}Kostenrechner Studio EinsZwoVier{% endblock %}
.container {
max-width: 900px;
margin: auto;
background: #fff;
padding: 2em;
border-radius: 10px;
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
}
h1,
h2 {
text-align: center;
}
form {
display: flex;
flex-direction: column;
gap: 1em;
margin-top: 1em;
}
input[type="file"] {
padding: 0.5em;
}
button {
padding: 0.7em;
background-color: #007bff;
color: #fff;
border: none;
border-radius: 6px;
font-size: 1em;
cursor: pointer;
}
button:hover {
background-color: #0056b3;
}
.rate-info {
text-align: center;
color: #555;
margin-top: 1em;
}
.error {
color: red;
font-weight: bold;
text-align: center;
margin-top: 1em;
}
table {
border-collapse: collapse;
width: 100%;
margin-top: 2em;
}
th,
td {
border: 1px solid #ccc;
padding: 0.5em;
text-align: center;
}
th {
background-color: #f2f2f2;
}
.color {
background-color: #ffdede;
}
.black {
background-color: #e0e0ff;
}
.totals {
font-weight: bold;
}
</style>
</head>
<body>
<div class="container">
<h1>Print Cost Calculator</h1>
{% block content %}
<div class="container">
<h1>Kostenrechner für Drucke</h1>
{% if error %}
<p class="error">{{ error }}</p>
{% endif %}
<form action="/upload" method="post" enctype="multipart/form-data">
<input type="file" name="file" accept="application/pdf" required />
<button type="submit">Upload & Calculate</button>
<input type="file" name="file" accept="application/pdf" required />
<button type="submit">Hochladen & Berechnen</button>
</form>
<p class="rate-info">
Rates are fixed via environment variables:<br>
B&W: {{ rate_black if rate_black else 'RATE_PER_M2_BLACK' }} € / m²,
Color: {{ rate_color if rate_color else 'RATE_PER_M2_COLOR' }} € / m²
Preise werden über Umgebungsvariablen festgelegt:<br>
S/W: {{ rate_black if rate_black else 'RATE_PER_M2_BLACK' }} € / m²,
Farbe: {{ rate_color if rate_color else 'RATE_PER_M2_COLOR' }} € / m²
</p>
{% if result %}
<h2>Results for {{ result.filename }}</h2>
<h2>Ergebnisse für {{ result.filename }}</h2>
<table>
<thead>
<tr>
<th>Page</th>
<th>Width (m)</th>
<th>Height (m)</th>
<th>Area (m²)</th>
<th>Ink %</th>
<th>Type</th>
<th>Cost (€)</th>
</tr>
</thead>
<tbody>
{% for page in result.pages %}
<tr class="{{ 'color' if page.is_color else 'black' }}">
<td>{{ page.page }}</td>
<td>{{ "%.3f"|format(page.width_m) }}</td>
<td>{{ "%.3f"|format(page.height_m) }}</td>
<td>{{ "%.4f"|format(page.area_m2) }}</td>
<td>{{ "%.1f"|format(page.ink_pct) if page.ink_pct is not none else '-' }}</td>
<td>{{ 'Color' if page.is_color else 'B&W' }}</td>
<td>{{ "%.2f"|format(page.cost) }}</td>
</tr>
{% endfor %}
</tbody>
<tfoot>
<tr class="totals">
<td colspan="3">Total Black Pages</td>
<td>{{ "%.4f"|format(result.total_area_black) }}</td>
<td colspan="2"></td>
<td>{{ "%.2f"|format(result.total_cost_black) }}</td>
</tr>
<tr class="totals">
<td colspan="3">Total Color Pages</td>
<td>{{ "%.4f"|format(result.total_area_color) }}</td>
<td colspan="2"></td>
<td>{{ "%.2f"|format(result.total_cost_color) }}</td>
</tr>
<tr class="totals">
<td colspan="6">Grand Total</td>
<td>{{ "%.2f"|format(result.grand_total) }}</td>
</tr>
</tfoot>
<thead>
<tr>
<th>Seite</th>
<th>Breite (m)</th>
<th>Höhe (m)</th>
<th>Fläche (m²)</th>
<th>Tinten %</th>
<th>Typ</th>
<th>Kosten (€)</th>
</tr>
</thead>
<tbody>
{% for page in result.pages %}
<tr class="{{ 'color' if page.is_color else 'black' }}">
<td>{{ page.page }}</td>
<td>{{ "%.3f"|format(page.width_m) }}</td>
<td>{{ "%.3f"|format(page.height_m) }}</td>
<td>{{ "%.4f"|format(page.area_m2) }}</td>
<td>{{ "%.1f"|format(page.ink_pct) if page.ink_pct is not none else '-' }}</td>
<td>{{ 'Farbe' if page.is_color else 'S/W' }}</td>
<td>{{ "%.2f"|format(page.cost) }}</td>
</tr>
{% endfor %}
</tbody>
<tfoot>
<tr class="totals">
<td colspan="3">Summe S/W</td>
<td>{{ "%.4f"|format(result.total_area_black) }}</td>
<td colspan="2"></td>
<td>{{ "%.2f"|format(result.total_cost_black) }}</td>
</tr>
<tr class="totals">
<td colspan="3">Summe Farbe</td>
<td>{{ "%.4f"|format(result.total_area_color) }}</td>
<td colspan="2"></td>
<td>{{ "%.2f"|format(result.total_cost_color) }}</td>
</tr>
<tr class="totals">
<td colspan="6">Gesamtsumme</td>
<td>{{ "%.2f"|format(result.grand_total) }}</td>
</tr>
</tfoot>
</table>
{% endif %}
</div>
</body>
</html>
</div>
{% endblock %}

View file

@ -1,122 +1,15 @@
<!-- templates/landing.html -->
<!DOCTYPE html>
<html lang="en">
{% extends "base.html" %}
<head>
<meta charset="UTF-8">
<title>Studio Einszwovier</title>
<link rel="stylesheet" href="/static/css/style.css">
<style>
/* Body & layout */
body {
font-family: 'BauPro', sans-serif;
background-color: #f0f4f8;
margin: 0;
padding: 0;
display: flex;
flex-direction: column;
align-items: center;
color: #001f3f;
/* navy text */
}
{% block title %}Studio EinsZwoVier{% endblock %}
/* Header with logo */
header {
width: 100%;
background-color: #001f3f;
/* navy */
color: #fff;
padding: 1.5em 0;
display: flex;
flex-direction: column;
align-items: center;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.2);
}
header h1 {
margin: 0.5em 0 0;
font-family: 'SISTEMAS', sans-serif;
font-size: 2em;
}
header p {
margin: 0;
font-size: 1em;
color: #ff00ff;
/* magenta accent for subtitle */
}
.logo-link img {
height: 80px;
margin-bottom: 0.5em;
cursor: pointer;
}
/* Main container with links */
.container {
max-width: 700px;
width: 90%;
margin: 3em auto;
display: flex;
flex-direction: column;
gap: 1.5em;
}
/* Link cards */
a.link-card {
display: block;
padding: 1.2em 1em;
background-color: #fff;
color: #001f3f;
/* navy text */
text-decoration: none;
border-left: 6px solid #ff00ff;
/* magenta accent */
border-radius: 10px;
box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1);
font-size: 1.2em;
text-align: center;
transition: all 0.3s ease;
}
a.link-card:hover {
background-color: #ff0;
/* yellow hover */
color: #001f3f;
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.2);
transform: translateY(-2px);
}
footer {
margin-top: 4em;
color: #555;
text-align: center;
font-size: 0.9em;
padding-bottom: 2em;
}
</style>
</head>
<body>
<header>
<a href="/" class="logo-link">
<img src="/static/images/logo.png" alt="Studio Einszwovier Logo">
</a>
<h1>Studio Einszwovier</h1>
<p>Welcome to the school makerspace portal at the GvB</p>
</header>
<div class="container">
<a class="link-card" href="/about">About us</a>
<a class="link-card" href="/cost">Print Cost Calculator</a>
<a class="link-card" href="mailto:einszwovier@gvb-gymnasium.de">Contact: einszwovier@gvb-gymnasium.de</a>
<a class="link-card" href="https://gvb-gymnasium.de">Log in to iServ</a>
<a class="link-card" href="https://www.gvb-berlin.de">School website</a>
</div>
<footer>
&copy; Studio Einszwovier @ GvB Berlin
</footer>
</body>
</html>
{% block content %}
<div class="container">
<a class="link-card" href="/about">Über uns</a>
<a class="link-card" href="/cost">Kostenrechner</a>
<a class="link-card" href="mailto:einszwovier@gvb-gymnasium.de">Kontakt: einszwovier@gvb-gymnasium.de</a>
<a class="link-card" href="https://gvb-gymnasium.de">iServ Login</a>
<a class="link-card" href="https://www.gvb-berlin.de">Schulseite</a>
<a class="link-card" href="https://outline.example.com">Wissenssammlung</a>
</div>
{% endblock %}

View file

@ -1,17 +1,13 @@
<!DOCTYPE html>
<html lang="en">
<!-- templates/result.html -->
{% extends "base.html" %}
<head>
<meta charset="UTF-8">
<title>Print Cost Result</title>
<link rel="stylesheet" href="/static/css/style.css">
</head>
{% block title %}Druckkosten Ergebnis Studio EinsZwoVier{% endblock %}
<body>
<div class="container">
<h1>Print Cost for {{ result.filename }}</h1>
{% block content %}
<div class="container">
<h1>Druckkosten für {{ result.filename }}</h1>
<!-- Success / Error Banner -->
<!-- Erfolg / Fehler Banner -->
{% if success %}
<div class="alert success">{{ success }}</div>
{% endif %}
@ -19,64 +15,67 @@
<div class="alert error">{{ error }}</div>
{% endif %}
<!-- Ergebnis Tabelle -->
<table>
<thead>
<tr>
<th>Page</th>
<th>Width (m)</th>
<th>Height (m)</th>
<th>Area (m²)</th>
<th>Ink %</th>
<th>Type</th>
<th>Cost (€)</th>
</tr>
</thead>
<tbody>
{% for page in result.pages %}
<tr class="{{ 'color' if page.is_color else 'black' }}">
<td>{{ page.page }}</td>
<td>{{ "%.3f"|format(page.width_m) }}</td>
<td>{{ "%.3f"|format(page.height_m) }}</td>
<td>{{ "%.4f"|format(page.area_m2) }}</td>
<td>{{ "%.1f"|format(page.ink_pct) if page.ink_pct is not none else '-' }}</td>
<td>{{ 'Color' if page.is_color else 'B&W' }}</td>
<td>{{ "%.2f"|format(page.cost) }}</td>
</tr>
{% endfor %}
</tbody>
<tfoot>
<tr class="totals">
<td colspan="3">Total Black Pages</td>
<td>{{ "%.4f"|format(result.total_area_black) }}</td>
<td colspan="2"></td>
<td>{{ "%.2f"|format(result.total_cost_black) }}</td>
</tr>
<tr class="totals">
<td colspan="3">Total Color Pages</td>
<td>{{ "%.4f"|format(result.total_area_color) }}</td>
<td colspan="2"></td>
<td>{{ "%.2f"|format(result.total_cost_color) }}</td>
</tr>
<tr class="totals">
<td colspan="6">Grand Total</td>
<td>{{ "%.2f"|format(result.grand_total) }}</td>
</tr>
</tfoot>
<thead>
<tr>
<th>Seite</th>
<th>Breite (m)</th>
<th>Höhe (m)</th>
<th>Fläche (m²)</th>
<th>Tinten %</th>
<th>Typ</th>
<th>Kosten (€)</th>
</tr>
</thead>
<tbody>
{% for page in result.pages %}
<tr class="{{ 'color' if page.is_color else 'black' }}">
<td>{{ page.page }}</td>
<td>{{ "%.3f"|format(page.width_m) }}</td>
<td>{{ "%.3f"|format(page.height_m) }}</td>
<td>{{ "%.4f"|format(page.area_m2) }}</td>
<td>{{ "%.1f"|format(page.ink_pct) if page.ink_pct is not none else '-' }}</td>
<td>{{ 'Farbe' if page.is_color else 'S/W' }}</td>
<td>{{ "%.2f"|format(page.cost) }}</td>
</tr>
{% endfor %}
</tbody>
<tfoot>
<tr class="totals">
<td colspan="3">Summe S/W</td>
<td>{{ "%.4f"|format(result.total_area_black) }}</td>
<td colspan="2"></td>
<td>{{ "%.2f"|format(result.total_cost_black) }}</td>
</tr>
<tr class="totals">
<td colspan="3">Summe Farbe</td>
<td>{{ "%.4f"|format(result.total_area_color) }}</td>
<td colspan="2"></td>
<td>{{ "%.2f"|format(result.total_cost_color) }}</td>
</tr>
<tr class="totals">
<td colspan="6">Gesamtsumme</td>
<td>{{ "%.2f"|format(result.grand_total) }}</td>
</tr>
</tfoot>
</table>
<!-- Send order form -->
<!-- Auftrag senden Formular -->
<form action="/send-order" method="post">
<input type="hidden" name="filename" value="{{ result.filename }}">
<label for="comment"><strong>Additional Instructions:</strong></label>
<textarea id="comment" name="comment"
placeholder="e.g. Please print double-sided, staple in top left corner..."></textarea>
<button type="submit">Send Order</button>
<input type="hidden" name="filename" value="{{ result.filename }}">
<label for="name"><strong>Name:</strong></label>
<input type="text" id="name" name="name" required placeholder="Dein Name">
<label for="comment"><strong>Zusätzliche Hinweise:</strong></label>
<textarea id="comment" name="comment" rows="4" placeholder="z. B. doppelseitig oder spezielles Papier"></textarea>
<button type="submit">Auftrag senden</button>
</form>
<div class="link">
<a href="/">Upload another PDF</a>
<div class="link" style="text-align:center; margin-top:1em;">
<a href="/">Neues PDF hochladen</a>
</div>
</div>
</body>
</html>
</div>
{% endblock %}