commit 19fb1afd1b5151b4e7b3b32846371394c46aa917
parent c1ad1d5586801672f2a832e977e841624cb31275
author: nathanael <nathanael@dalliard.ch>
date: Sun, 19 Oct 2025 11:55:07 +0000
s0(c): simpler & reorg
diffstat:
7 files changed, 209 insertions(+), 218 deletions(-)
diff --git a/s0/cockpit/config.toml b/s0/cockpit/config.toml
@@ -1,2 +0,0 @@
-defaultContentLanguage = "de"
-title = 'cockpit'
diff --git a/s0/cockpit/config/_default/config.toml b/s0/cockpit/config/_default/config.toml
@@ -0,0 +1,3 @@
+defaultContentLanguage = "de"
+disableKinds = ['taxonomy']
+title = 'cockpit'
diff --git a/s0/cockpit/layouts/_default/bill.html b/s0/cockpit/layouts/_default/bill.html
@@ -1,100 +0,0 @@
-{{ define "main" }}
-<img class="logo" src="/logo.png">
-<h2>Dalliard IT</h2>
-<p>Nathanael Dalliard<br>
-Breiten 82<br>
-3983 Mörel-Filet<br>
-nathanael@dalliard.ch</p>
-<p class="date">Mörel-Filet, den {{ time.Now | time.Format ":date_long" }}</p>
-<h1 contenteditable>Rechnung #1000</h1>
-<table>
- <thead>
- <tr>
- <th>Bezeichnung</th>
- <th>Betrag</th>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td>Jahresgebühr</td>
- <td>{{ .Site.Data.bill.amount }}</td>
- </tr>
- <tr>
- <td></td>
- <td></td>
- </tr>
- </tbody>
- <tfoot>
- <tr>
- <td>TOTAL / ZAHLBAR BIS AM {{ time.Now.AddDate 0 0 +10 | time.Format ":date_short"}}</td>
- <td>{{ .Site.Data.bill.amount }}</td>
- </tr>
- </tfoot>
-</table>
-<img class="bg" src="/qrbill.svg">
-<style>
-body {
- font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
- margin: 2rem;
- max-width: 46rem;
-}
-img.logo {
- width: 6rem;
- height: 6rem;
- margin-bottom: .5rem;
- float: right;
-}
-img.bg {
- position: absolute;
- top: 0;
- left: 0;
- z-index: -1;
-}
-h1 {
- margin-top: 10rem;
-}
-p, h2 {
- margin: 0;
-}
-p.date {
- margin: 2rem 0;
- font-size: .9rem;
-}
-table {
- width: 100%;
- margin-top: 3rem;
- border-collapse: collapse;
-}
-table th {
- text-transform: uppercase;
- font-weight: normal;
- font-size: .8rem;
- border-bottom: 2px solid black;
-}
-table th:first-child {
- text-align: left;
-}
-table th:last-child {
- text-align: right;
-}
-table td {
- padding: .3rem 0;
-}
-table tbody tr:first-child td {
- padding-top: .5rem;
-}
-table tbody tr:last-child td {
- padding-top: 11rem;
-}
-table td:last-child {
- text-align: right;
- padding-right: .2rem;
-}
-table tfoot td:last-child {
- border: 2px solid black;
-}
-table tfoot td:first-child {
- text-align: left;
-}
-</style>
-{{ end }}
diff --git a/s0/cockpit/layouts/_default/report.html b/s0/cockpit/layouts/_default/report.html
@@ -1,116 +0,0 @@
-{{ define "main" }}
-<h2>Jahresabschluss {{ .Site.Data.report.cur.cur_year }}</h2>
-<p><b>Dalliard IT</b><br>
-Nathanael Dalliard<br>
-Breiten 82<br>
-3983 Mörel-Filet</p>
-<table>
-<tr>
- <td></td>
- <td>{{ .Site.Data.report.prev.prev_year }}</td>
- <td><b>{{ .Site.Data.report.cur.cur_year }}</b></td>
-</tr>
-<tr>
- <td><b>Einkommen aus dem Geschäftsbetrieb</b></td>
- <td></td>
- <td></td>
-</tr>
-<tr>
- <td><b>Total Einnahmen</b></td>
- <td>{{ .Site.Data.report.prev.prev_inc }}</td>
- <td><b>{{ .Site.Data.report.cur.cur_inc }}</b></td>
-</tr>
-<tr>
- <td><b>Geschäftsaufwand</b></td>
- <td></td>
- <td></td>
-</tr>
-<tr>
- <td>Direkter Aufwand</td>
- <td>{{ substr (.Site.Data.report.prev.prev_dir) 1 }}</td>
- <td>{{ substr (.Site.Data.report.cur.cur_dir) 1 }}</td>
-</tr>
-<tr>
- <td>Büromaterial, EDV, Telefon, Porti</td>
- <td>{{ substr (.Site.Data.report.prev.prev_edv) 1 }}</td>
- <td>{{ substr (.Site.Data.report.cur.cur_edv) 1 }}</td>
-</tr>
-<tr>
- <td><b>Total Geschäftsaufwand</b></td>
- <td>{{ substr (.Site.Data.report.prev.prev_exp) 1 }}</td>
- <td><b>{{ substr (.Site.Data.report.cur.cur_exp) 1 }}</b></td>
-</tr>
-<tr>
- <td><b>Einkommen aus selbständiger Erwärbstätigkeit</b></td>
- <td></td>
- <td></td>
-</tr>
-<tr>
- <td><b>Gewinn</b></td>
- <td>{{ .Site.Data.report.prev.prev_tot }}</td>
- <td><b>{{ .Site.Data.report.cur.cur_tot }}</b></td>
-</tr>
-</table>
-<p>Geschäftsinhaber: Nathanael Dalliard</p>
-<div>
-<p>Mörel-Filet, 01.01.{{ add (int .Site.Data.report.cur.cur_year) 1 }}</p>
-<img src="/signature.png">
-<p>Ort und Datum</p>
-<p>Unterschrift</p>
-</div>
-<style>
-body {
- font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
- margin: 4rem;
- max-width: 42rem;
-}
-h2 ~ p {
- line-height: 1.4rem;
-}
-table {
- border-collapse: collapse;
- margin: 5rem 0 3rem 0;
- width: 100%;
-}
-table tr {
- border-bottom: 2px solid black;
-}
-table tr:nth-of-type(5) {
- border-bottom: 1px solid black;
-}
-table tr td:first-child {
- padding-left: 1rem;
-}
-table tr:nth-of-type(2) td:first-child,
-table tr:nth-of-type(4) td:first-child,
-table tr:nth-of-type(8) td:first-child
-{
- padding-left: 0;
-}
-table td:last-child {
- padding-left: 2rem;
-}
-table td:not(:first-child) {
- text-align: right;
-}
-div {
- display: grid;
- grid-template-columns: auto auto;
- max-width: 30rem;
- margin-top: 4rem;
-}
-div p {
- margin: 0;
- display: inline-block;
-}
-div p:first-of-type {
- align-self: end;
-}
-div img {
- width: 8rem;
-}
-div p:not(:first-of-type) {
- border-top: 1.5px solid black;
-}
-</style>
-{{ end }}
diff --git a/s0/cockpit/layouts/_default/baseof.html b/s0/cockpit/layouts/baseof.html
diff --git a/s0/cockpit/layouts/bill.html b/s0/cockpit/layouts/bill.html
@@ -0,0 +1,100 @@
+{{ define "main" }}
+<img class="logo" src="/logo.png">
+<h2>Dalliard IT</h2>
+<p>Nathanael Dalliard<br>
+Breiten 82<br>
+3983 Mörel-Filet<br>
+nathanael@dalliard.ch</p>
+<p class="date">Mörel-Filet, den {{ time.Now | time.Format ":date_long" }}</p>
+<h1 contenteditable>Rechnung #1000</h1>
+<table>
+ <thead>
+ <tr>
+ <th>Bezeichnung</th>
+ <th>Betrag</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>Jahresgebühr</td>
+ <td contenteditable></td>
+ </tr>
+ <tr>
+ <td></td>
+ <td></td>
+ </tr>
+ </tbody>
+ <tfoot>
+ <tr>
+ <td>TOTAL / ZAHLBAR BIS AM {{ time.Now.AddDate 0 0 +10 | time.Format ":date_short"}}</td>
+ <td contenteditable></td>
+ </tr>
+ </tfoot>
+</table>
+<img class="bg" src="/qrbill.svg">
+<style>
+body {
+ font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+ margin: 2rem;
+ max-width: 46rem;
+}
+img.logo {
+ width: 6rem;
+ height: 6rem;
+ margin-bottom: .5rem;
+ float: right;
+}
+img.bg {
+ position: absolute;
+ top: 0;
+ left: 0;
+ z-index: -1;
+}
+h1 {
+ margin-top: 10rem;
+}
+p, h2 {
+ margin: 0;
+}
+p.date {
+ margin: 2rem 0;
+ font-size: .9rem;
+}
+table {
+ width: 100%;
+ margin-top: 3rem;
+ border-collapse: collapse;
+}
+table th {
+ text-transform: uppercase;
+ font-weight: normal;
+ font-size: .8rem;
+ border-bottom: 2px solid black;
+}
+table th:first-child {
+ text-align: left;
+}
+table th:last-child {
+ text-align: right;
+}
+table td {
+ padding: .3rem 0;
+}
+table tbody tr:first-child td {
+ padding-top: .5rem;
+}
+table tbody tr:last-child td {
+ padding-top: 11rem;
+}
+table td:last-child {
+ text-align: right;
+ padding-right: .2rem;
+}
+table tfoot td:last-child {
+ border: 2px solid black;
+}
+table tfoot td:first-child {
+ text-align: left;
+}
+</style>
+{{ end }}
diff --git a/s0/cockpit/layouts/report.html b/s0/cockpit/layouts/report.html
@@ -0,0 +1,106 @@
+{{ define "main" }}
+<h2>Jahresabschluss {{ .Site.Data.report.cur.cur_year }}</h2>
+<p><b>Dalliard IT</b><br>
+Nathanael Dalliard<br>
+Breiten 82<br>
+3983 Mörel-Filet</p>
+<table>
+<tr>
+ <td></td>
+ <td>{{ .Site.Data.report.prev.prev_year }}</td>
+ <td><b>{{ .Site.Data.report.cur.cur_year }}</b></td>
+</tr>
+<tr>
+ <td><b>Einkommen aus dem Geschäftsbetrieb</b></td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td><b>Total Einnahmen</b></td>
+ <td>{{ .Site.Data.report.prev.prev_inc }}</td>
+ <td><b>{{ .Site.Data.report.cur.cur_inc }}</b></td>
+</tr>
+<tr>
+ <td><b>Geschäftsaufwand</b></td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td><b>Total Geschäftsaufwand</b></td>
+ <td>{{ substr (.Site.Data.report.prev.prev_exp) 1 }}</td>
+ <td><b>{{ substr (.Site.Data.report.cur.cur_exp) 1 }}</b></td>
+</tr>
+<tr>
+ <td><b>Einkommen aus selbständiger Erwärbstätigkeit</b></td>
+ <td></td>
+ <td></td>
+</tr>
+<tr>
+ <td><b>Gewinn</b></td>
+ <td>{{ .Site.Data.report.prev.prev_tot }}</td>
+ <td><b>{{ .Site.Data.report.cur.cur_tot }}</b></td>
+</tr>
+</table>
+<p>Geschäftsinhaber: Nathanael Dalliard</p>
+<div>
+<p>Mörel-Filet, 01.01.{{ add (int .Site.Data.report.cur.cur_year) 1 }}</p>
+<img src="/signature.png">
+<p>Ort und Datum</p>
+<p>Unterschrift</p>
+</div>
+<style>
+body {
+ font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+ margin: 4rem;
+ max-width: 42rem;
+}
+h2 ~ p {
+ line-height: 1.4rem;
+}
+table {
+ border-collapse: collapse;
+ margin: 5rem 0 3rem 0;
+ width: 100%;
+}
+table tr {
+ border-bottom: 2px solid black;
+}
+table tr:nth-of-type(5) {
+ border-bottom: 1px solid black;
+}
+table tr td:first-child {
+ padding-left: 1rem;
+}
+table tr:nth-of-type(2) td:first-child,
+table tr:nth-of-type(4) td:first-child,
+table tr:nth-of-type(6) td:first-child
+{
+ padding-left: 0;
+}
+table td:last-child {
+ padding-left: 2rem;
+}
+table td:not(:first-child) {
+ text-align: right;
+}
+div {
+ display: grid;
+ grid-template-columns: auto auto;
+ max-width: 30rem;
+ margin-top: 4rem;
+}
+div p {
+ margin: 0;
+ display: inline-block;
+}
+div p:first-of-type {
+ align-self: end;
+}
+div img {
+ width: 8rem;
+}
+div p:not(:first-of-type) {
+ border-top: 1.5px solid black;
+}
+</style>
+{{ end }}
