diff options
| author | olf <olf@subsignal.org> | 2016-01-08 21:50:35 +0100 |
|---|---|---|
| committer | olf <olf@subsignal.org> | 2016-01-08 21:50:35 +0100 |
| commit | 42436861194144bf4d1b3eb8f86027342a565639 (patch) | |
| tree | e7e08b2c69d38fdb15c5f7d3cb1e2715dc838f61 | |
| parent | 995cf5b0798c5a1230fabdebb6108a5fb15a7fca (diff) | |
| parent | 982945d8abad6a740546571979896f3f13a02d53 (diff) | |
Merge branch 'master' of ssh://oberon.sublab.org/website into statusscript
| -rw-r--r-- | template/pages/account-creation-suspended/content.html | 4 | ||||
| -rw-r--r-- | template/pages/account-creation-suspended/desc_de | 1 | ||||
| -rw-r--r-- | template/pages/account-creation-suspended/desc_en | 1 | ||||
| -rw-r--r-- | template/pages/account-creation-suspended/keywords | 1 | ||||
| -rw-r--r-- | template/pages/new-wiki-page/content.html | 2 | ||||
| -rw-r--r-- | template/pages/wiki_template/content.html | 2 |
6 files changed, 9 insertions, 2 deletions
diff --git a/template/pages/account-creation-suspended/content.html b/template/pages/account-creation-suspended/content.html new file mode 100644 index 0000000..b93f1d4 --- /dev/null +++ b/template/pages/account-creation-suspended/content.html @@ -0,0 +1,4 @@ +<h2>Automatische Account-Erstellung ist derzeit deaktiviert</h2> +<p>Vielen Dank, dass Du zu unserem Wiki beitragen möchtest. Aus technischen +Gründen ist die Account-Erstellung derzeit deaktiviert.</p> +<p>Frage bitte einfach vor Ort und auf der <a href="/kontakt">Mailingliste</a> nach.</p> diff --git a/template/pages/account-creation-suspended/desc_de b/template/pages/account-creation-suspended/desc_de new file mode 100644 index 0000000..270e5d0 --- /dev/null +++ b/template/pages/account-creation-suspended/desc_de @@ -0,0 +1 @@ +Das sublab ist ein Hackerspace im Westwerk in Leipzig-Plagwitz. Meet your local Hackers here! diff --git a/template/pages/account-creation-suspended/desc_en b/template/pages/account-creation-suspended/desc_en new file mode 100644 index 0000000..fcdffda --- /dev/null +++ b/template/pages/account-creation-suspended/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/pages/account-creation-suspended/keywords b/template/pages/account-creation-suspended/keywords new file mode 100644 index 0000000..b9f685b --- /dev/null +++ b/template/pages/account-creation-suspended/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/pages/new-wiki-page/content.html b/template/pages/new-wiki-page/content.html index 1b2812a..02bc08b 100644 --- a/template/pages/new-wiki-page/content.html +++ b/template/pages/new-wiki-page/content.html @@ -1,7 +1,7 @@ <h2> [ <a href="/wiki/">wiki</a> | neue Seite anlegen ] </h2> -<form action="https://sublab.org/wiki/ikiwiki.cgi" method="GET"> +<form action="/wiki/ikiwiki.cgi" method="GET"> Name der neuen Seite: <input type="text" name="page"></input> <input type="hidden" name="do" value="create"></input><br></br> <input type="submit" value="Weiter"></input> diff --git a/template/pages/wiki_template/content.html b/template/pages/wiki_template/content.html index a6fd7b5..13658d4 100644 --- a/template/pages/wiki_template/content.html +++ b/template/pages/wiki_template/content.html @@ -18,7 +18,7 @@ <TMPL_IF GETSOURCEURL> <li><a href="<TMPL_VAR GETSOURCEURL>">Source</a></li> </TMPL_IF> -<li><a href="https://sublab.org/subdap/create">Registrieren</a></li> +<li><a href="/subdap/create">Registrieren</a></li> <!--<TMPL_IF PREFSURL> <li><a href="<TMPL_VAR PREFSURL>">Einstellungen</a></li> </TMPL_IF>--> |