Merge branch 'master' of sublab.org:website

Conflicts:
	template/topic/topic

31 files changed, 8 insertions, 0 deletions

diff --git a/public/css/sublab-2011-11-02.css b/public/css/sublab-2011-11-02.css
index 309363d..20e9c5b 100644
--- a/public/css/sublab-2011-11-02.css
+++ b/public/css/sublab-2011-11-02.css
@@ -265,6 +265,14 @@ span.header {
 	margin-right: 10px;
 	}
 
+.member	{
+	line-height: 20px;
+	font-weight: bold;
+	margin-left: 10px;
+	margin-right: 10px;
+	text-align: center;
+	}
+
 a       {
 	text-decoration: none;
 	border-bottom: 1px dotted;
diff --git a/public/img/onewire/digitemp.jpg b/public/img/onewire/digitemp.jpg
new file mode 100644
index 0000000..dc0597c
--- /dev/null
+++ b/public/img/onewire/digitemp.jpg
diff --git a/public/img/phantomspeisung/phantomspeisung_1.jpg b/public/img/phantomspeisung/phantomspeisung_1.jpg
new file mode 100644
index 0000000..9fb9aa4
--- /dev/null
+++ b/public/img/phantomspeisung/phantomspeisung_1.jpg
diff --git a/public/img/phantomspeisung/phantomspeisung_1_klein.jpg b/public/img/phantomspeisung/phantomspeisung_1_klein.jpg
new file mode 100644
index 0000000..e32e2d0
--- /dev/null
+++ b/public/img/phantomspeisung/phantomspeisung_1_klein.jpg
diff --git a/public/img/phantomspeisung/phantomspeisung_2.jpg b/public/img/phantomspeisung/phantomspeisung_2.jpg
new file mode 100644
index 0000000..11b59db
--- /dev/null
+++ b/public/img/phantomspeisung/phantomspeisung_2.jpg
diff --git a/public/img/phantomspeisung/phantomspeisung_2_klein.jpg b/public/img/phantomspeisung/phantomspeisung_2_klein.jpg
new file mode 100644
index 0000000..b250c20
--- /dev/null
+++ b/public/img/phantomspeisung/phantomspeisung_2_klein.jpg
diff --git a/public/img/phantomspeisung/phantomspeisung_3.jpg b/public/img/phantomspeisung/phantomspeisung_3.jpg
new file mode 100644
index 0000000..4187e07
--- /dev/null
+++ b/public/img/phantomspeisung/phantomspeisung_3.jpg
diff --git a/public/img/phantomspeisung/phantomspeisung_3_klein.jpg b/public/img/phantomspeisung/phantomspeisung_3_klein.jpg
new file mode 100644
index 0000000..a57e70d
--- /dev/null
+++ b/public/img/phantomspeisung/phantomspeisung_3_klein.jpg
diff --git a/public/img/phantomspeisung/phantomspeisung_4.jpg b/public/img/phantomspeisung/phantomspeisung_4.jpg
new file mode 100644
index 0000000..327eb68
--- /dev/null
+++ b/public/img/phantomspeisung/phantomspeisung_4.jpg
diff --git a/public/img/phantomspeisung/phantomspeisung_4_klein.jpg b/public/img/phantomspeisung/phantomspeisung_4_klein.jpg
new file mode 100644
index 0000000..785c1bb
--- /dev/null
+++ b/public/img/phantomspeisung/phantomspeisung_4_klein.jpg
diff --git a/public/img/sfppcb1-small.jpg b/public/img/sfppcb1-small.jpg
new file mode 100644
index 0000000..0e63ebb
--- /dev/null
+++ b/public/img/sfppcb1-small.jpg
diff --git a/public/img/sfppcb1.jpg b/public/img/sfppcb1.jpg
new file mode 100644
index 0000000..3b3dd35
--- /dev/null
+++ b/public/img/sfppcb1.jpg
diff --git a/public/img/subconf/subconf_1.jpg b/public/img/subconf/subconf_1.jpg
new file mode 100644
index 0000000..0f3a77b
--- /dev/null
+++ b/public/img/subconf/subconf_1.jpg
diff --git a/public/img/subconf/subconf_1_klein.jpg b/public/img/subconf/subconf_1_klein.jpg
new file mode 100644
index 0000000..90ef87e
--- /dev/null
+++ b/public/img/subconf/subconf_1_klein.jpg
diff --git a/public/img/subconf/subconf_2.jpg b/public/img/subconf/subconf_2.jpg
new file mode 100644
index 0000000..b9425ad
--- /dev/null
+++ b/public/img/subconf/subconf_2.jpg
diff --git a/public/img/subconf/subconf_2_klein.jpg b/public/img/subconf/subconf_2_klein.jpg
new file mode 100644
index 0000000..4dbce38
--- /dev/null
+++ b/public/img/subconf/subconf_2_klein.jpg
diff --git a/public/img/subconf/subconf_3.jpg b/public/img/subconf/subconf_3.jpg
new file mode 100644
index 0000000..c1bdae8
--- /dev/null
+++ b/public/img/subconf/subconf_3.jpg
diff --git a/public/img/subconf/subconf_3_klein.jpg b/public/img/subconf/subconf_3_klein.jpg
new file mode 100644
index 0000000..84d828f
--- /dev/null
+++ b/public/img/subconf/subconf_3_klein.jpg
diff --git a/public/img/subconf/subconf_4.jpg b/public/img/subconf/subconf_4.jpg
new file mode 100644
index 0000000..a316eb2
--- /dev/null
+++ b/public/img/subconf/subconf_4.jpg
diff --git a/public/img/subconf/subconf_4_klein.jpg b/public/img/subconf/subconf_4_klein.jpg
new file mode 100644
index 0000000..31925b2
--- /dev/null
+++ b/public/img/subconf/subconf_4_klein.jpg
diff --git a/public/img/subconf/subconf_5.jpg b/public/img/subconf/subconf_5.jpg
new file mode 100644
index 0000000..2b50b8d
--- /dev/null
+++ b/public/img/subconf/subconf_5.jpg
diff --git a/public/img/subconf/subconf_5_klein.jpg b/public/img/subconf/subconf_5_klein.jpg
new file mode 100644
index 0000000..6b084b7
--- /dev/null
+++ b/public/img/subconf/subconf_5_klein.jpg
diff --git a/public/img/subconf/subconf_6.jpg b/public/img/subconf/subconf_6.jpg
new file mode 100644
index 0000000..50ed6cf
--- /dev/null
+++ b/public/img/subconf/subconf_6.jpg
diff --git a/public/img/subconf/subconf_6_klein.jpg b/public/img/subconf/subconf_6_klein.jpg
new file mode 100644
index 0000000..ad61e8a
--- /dev/null
+++ b/public/img/subconf/subconf_6_klein.jpg
diff --git a/public/img/westpaket.jpg b/public/img/westpaket.jpg
new file mode 100644
index 0000000..dfc8e52
--- /dev/null
+++ b/public/img/westpaket.jpg
diff --git a/public/img/westpaket_klein.jpg b/public/img/westpaket_klein.jpg
new file mode 100644
index 0000000..8e504c4
--- /dev/null
+++ b/public/img/westpaket_klein.jpg
diff --git a/public/inc/sublab_ev_geldspendenquittung.pdf b/public/inc/sublab_ev_geldspendenquittung.pdf
new file mode 100644
index 0000000..ff3d513
--- /dev/null
+++ b/public/inc/sublab_ev_geldspendenquittung.pdf
diff --git a/public/inc/sublab_ev_geschaeftsordnung.pdf b/public/inc/sublab_ev_geschaeftsordnung.pdf
new file mode 100644
index 0000000..254d279
--- /dev/null
+++ b/public/inc/sublab_ev_geschaeftsordnung.pdf
diff --git a/public/inc/sublab_ev_mitgliedsantrag.pdf b/public/inc/sublab_ev_mitgliedsantrag.pdf
new file mode 100644
index 0000000..007d541
--- /dev/null
+++ b/public/inc/sublab_ev_mitgliedsantrag.pdf
diff --git a/public/inc/sublab_ev_sachspendenquittung.pdf b/public/inc/sublab_ev_sachspendenquittung.pdf
new file mode 100644
index 0000000..d7a24bb
--- /dev/null
+++ b/public/inc/sublab_ev_sachspendenquittung.pdf
diff --git a/public/inc/sublab_ev_satzung.pdf b/public/inc/sublab_ev_satzung.pdf
new file mode 100644
index 0000000..b462089
--- /dev/null
+++ b/public/inc/sublab_ev_satzung.pdf