summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rw-r--r--source/_navigation.html.erb2
-rw-r--r--source/_status.html.erb57
-rw-r--r--source/layouts/layout.erb1
3 files changed, 59 insertions, 1 deletions
diff --git a/source/_navigation.html.erb b/source/_navigation.html.erb
index 61ef0e4..f4922b1 100644
--- a/source/_navigation.html.erb
+++ b/source/_navigation.html.erb
@@ -4,7 +4,7 @@
<a href="/">Home</a>
</li>
<li>
- <a href="/neues.html">Archiv</a>
+ <a href="/archiv.html">Archiv</a>
</li>
<li>
<a href="/termine.html">Termine</a>
diff --git a/source/_status.html.erb b/source/_status.html.erb
new file mode 100644
index 0000000..8b3c2db
--- /dev/null
+++ b/source/_status.html.erb
@@ -0,0 +1,57 @@
+<div>
+
+ <h4>
+ Statusdisplay
+ </h4>
+
+ <hr>
+
+ <table>
+ <tbody>
+ <tr>
+ <td>sublab:</td>
+ <td>Offen</td>
+ </tr>
+ <tr>
+ <td>Taifun:</td>
+ <td>Online</td>
+ </tr>
+ <tr>
+ <td>Trieste:</td>
+ <td>Online</td>
+ </tr>
+ </tbody>
+ </table>
+
+ <hr>
+
+ <p>
+ <a href="http://void.subsignal.org:9000/status.xsl"><b>Livestream</b></a>
+ </p>
+
+ <hr>
+
+ <p>
+ 22. bis 25. Mai: <a href="/cryptocon14">CryptoCon</a>
+ </p>
+
+ <hr>
+
+ <p>
+ <a href="/webcam" class="img"><img src="/img/thumb.street.webcam.jpg" alt="Webcam im Fenster" class="webcamthumb"></a>
+ </p>
+
+ <hr>
+
+ <p>
+ <a href="/img/tempgraph.png" class="img"><img src="/img/thumb.tempgraph.png" alt="Temperaturen im sublab" class="webcamthumb">Temperaturen</a>
+ <!-- <object data="http://reeknersprook.de/sublog/graph-small?width=180" type="image/png" title="sublog/graph"></object> -->
+ </p>
+
+ <hr>
+
+ <p>
+ <a href="/inc/sublab_ev_mitgliedsantrag.pdf">Mitglied werden</a>
+ </p>
+
+</div>
diff --git a/source/layouts/layout.erb b/source/layouts/layout.erb
index dc454c0..894679a 100644
--- a/source/layouts/layout.erb
+++ b/source/layouts/layout.erb
@@ -16,5 +16,6 @@
<body class="<%= page_classes %>">
<%= partial "navigation" %>
<%= yield %>
+ <%= partial "status" %>
</body>
</html>