diff options
| author | Florian <florianraemisch@web.de> | 2011-03-31 15:44:33 +0200 |
|---|---|---|
| committer | Florian <florianraemisch@web.de> | 2011-03-31 15:44:33 +0200 |
| commit | 9cb35eb1e07e4b06aeee6dd98ff00684fa00f6f1 (patch) | |
| tree | e77d7ecdd62421bc2952ff4c38347f476b358137 | |
| parent | 2da08031a1f4e62aef7e17f6947908d9ceaa20c0 (diff) | |
| parent | 41dd0c1f23eba3e8bb272f2a0df51f937e4d95d0 (diff) | |
Merge branch 'master' of oberon.sublab.org:website
| -rw-r--r-- | public/img/favicon.png | bin | 0 -> 316 bytes | |||
| -rw-r--r-- | public/img/trieste.jpg | bin | 0 -> 51089 bytes | |||
| -rw-r--r-- | public/robots.txt | 3 | ||||
| -rwxr-xr-x | scripts/template.py | 2 | ||||
| -rw-r--r-- | template/404.content.html | 10 | ||||
| -rw-r--r-- | template/404.desc_de | 1 | ||||
| -rw-r--r-- | template/404.desc_en | 1 | ||||
| -rw-r--r-- | template/404.keywords | 1 | ||||
| -rw-r--r-- | template/template.html | 22 | ||||
| -rw-r--r-- | template/termine.content.html | 2 |
10 files changed, 29 insertions, 13 deletions
diff --git a/public/img/favicon.png b/public/img/favicon.png Binary files differnew file mode 100644 index 0000000..ae20cc3 --- /dev/null +++ b/public/img/favicon.png diff --git a/public/img/trieste.jpg b/public/img/trieste.jpg Binary files differnew file mode 100644 index 0000000..6814395 --- /dev/null +++ b/public/img/trieste.jpg diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 0000000..bb01aaf --- /dev/null +++ b/public/robots.txt @@ -0,0 +1,3 @@ +User-Agent: * +Allow: / + diff --git a/scripts/template.py b/scripts/template.py index ca1870a..c488db4 100755 --- a/scripts/template.py +++ b/scripts/template.py @@ -63,7 +63,7 @@ print ("chattopic read") datenow = time.strftime("%Y-%m-%dT%H:%M:%S +0100") print ("Set date: " + datenow) -prefixes = ['index', 'neues', 'termine', 'raeume', 'lage', 'kontakt', 'verein', 'impressum', 'webcam', 'zensusinfo'] +prefixes = ['index', 'neues', 'termine', 'raeume', 'lage', 'kontakt', 'verein', 'impressum', 'webcam', 'zensusinfo', '404', ] for prefix in prefixes: readfiles(contentpath + prefix) diff --git a/template/404.content.html b/template/404.content.html new file mode 100644 index 0000000..dc1bb57 --- /dev/null +++ b/template/404.content.html @@ -0,0 +1,10 @@ +<h2> + [ 404 - File not Found ] +</h2> +<!--<img src="img/trieste.jpg" class="contentimage" alt="Bild: Trieste">--> +<p> + Leider konnten wir die Datei zu Deiner Anfrage nicht finden. + Eventuell ist der Link den Du benutzt hast fehlerhaft oder veraltet. + Falls Du der Meinung bist, dass dieser Link funktionieren sollte, kontaktiere bitte kontakt [at] sublab.org.<br/> + Hier geht es zur <a href="/">Startseite</a>. +</p> diff --git a/template/404.desc_de b/template/404.desc_de new file mode 100644 index 0000000..270e5d0 --- /dev/null +++ b/template/404.desc_de @@ -0,0 +1 @@ +Das sublab ist ein Hackerspace im Westwerk in Leipzig-Plagwitz. Meet your local Hackers here! diff --git a/template/404.desc_en b/template/404.desc_en new file mode 100644 index 0000000..fcdffda --- /dev/null +++ b/template/404.desc_en @@ -0,0 +1 @@ +The sublab is a Hackerspacelocated at the Westwerk in Leipzig-Plagwitz (Germany). Meet your local Hackers here! diff --git a/template/404.keywords b/template/404.keywords new file mode 100644 index 0000000..b9f685b --- /dev/null +++ b/template/404.keywords @@ -0,0 +1 @@ +Chaos Computer Club, CCC, Chaostreff, Chaostreff Leipzig, Arbeitskreis Vorratsdatenspeicherung, AK Vorrat, AK, Vorrat, Freifunk, Elektronik Runde, Multimedia, Lab, Linux Multimedia Lab diff --git a/template/template.html b/template/template.html index 91a48b2..55eba03 100644 --- a/template/template.html +++ b/template/template.html @@ -21,7 +21,7 @@ <link rel="stylesheet" href="css/taifun.status.css" type="text/css"> <link rel="stylesheet" href="css/trieste.status.css" type="text/css"> <link rel="stylesheet" href="css/nautilus.status.css" type="text/css"> - + <link rel="shortcut icon" href="img/favicon.png"> </head> <body> @@ -43,34 +43,34 @@ <div class="menu"> <ul id="menu"> <li> - <a href="index.html">Home</a> + <a href="/">Home</a> </li> <li> - <a href="neues.html">Neues</a> + <a href="/neues">Neues</a> </li> <li> - <a href="termine.html">Termine</a> + <a href="/termine">Termine</a> </li> <li> - <a href="raeume.html">Räume</a> + <a href="/raeume">Räume</a> </li> <li> - <a href="webcam.html">Webcams</a> + <a href="/webcam">Webcams</a> </li> <li> - <a href="lage.html">Lage</a> + <a href="/lage">Lage</a> </li> <li> <a href="http://wiki.sublab.org">Wiki</a> </li> <li> - <a href="kontakt.html">Kontakt</a> + <a href="/kontakt">Kontakt</a> </li> <li> - <a href="verein.html">Verein</a> + <a href="/verein">Verein</a> </li> <li> - <a href="impressum.html">Impressum</a> + <a href="/impressum">Impressum</a> </li> </ul> </div> @@ -114,7 +114,7 @@ $template_chattopic </p> <hr> - <a href="webcam.html" class="img"><img src="img/thumb.rack.webcam.jpg" alt="Webcam am Rack" class="webcamthumb"></a> + <a href="/webcam" class="img"><img src="img/thumb.rack.webcam.jpg" alt="Webcam am Rack" class="webcamthumb"></a> </div> <div class="content"> diff --git a/template/termine.content.html b/template/termine.content.html index fd1ab31..e83117f 100644 --- a/template/termine.content.html +++ b/template/termine.content.html @@ -8,7 +8,7 @@ Im März im sublab </h3> <p> - 28. März - 20 Uhr - <a href="zensusinfo.html">Info und Diskussionsverastaltung zum Zensus 2011</a><br> + 28. März - 20 Uhr - <a href="/zensusinfo">Info und Diskussionsverastaltung zum Zensus 2011</a><br> 31. März - 21 Uhr - sub:lounge - Mit kühlen Getränken und dubbiger Musik </p> <h3> |
