From 3aa0f9d8a3298121959db6f1a420a3492ead78fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Mon, 27 Jun 2016 23:37:53 +0200 Subject: [PATCH 1/3] Add link to Facebook and extract contact info into an include --- bornhack/templates/contact.html | 15 +-------------- bornhack/templates/frontpage.html | 10 +++------- bornhack/templates/includes/contact.html | 18 ++++++++++++++++++ 3 files changed, 22 insertions(+), 21 deletions(-) create mode 100644 bornhack/templates/includes/contact.html diff --git a/bornhack/templates/contact.html b/bornhack/templates/contact.html index f433602a..0b1e2e31 100644 --- a/bornhack/templates/contact.html +++ b/bornhack/templates/contact.html @@ -6,20 +6,7 @@ You can get in contact with the BornHack organisers via multiple channels:

- +{% include 'includes/contact.html' %}
diff --git a/bornhack/templates/frontpage.html b/bornhack/templates/frontpage.html index 992e5a91..73b29aa2 100644 --- a/bornhack/templates/frontpage.html +++ b/bornhack/templates/frontpage.html @@ -26,15 +26,11 @@

- You are very welcome to ask questions and show your interest on IRC at - #bornhack on 6nbtgccn5nbcodn3.onion or - irc.baconsvin.org, both using TLS on port 6697. + You are very welcome to ask questions and show your interest on our different channels:

- + {% include 'includes/contact.html' %}

- We also have a Twitter account at - @bornhax which you can follow - to get updates about the camp. + Follow and like us to get updates about the camp.

diff --git a/bornhack/templates/includes/contact.html b/bornhack/templates/includes/contact.html new file mode 100644 index 00000000..3f440d80 --- /dev/null +++ b/bornhack/templates/includes/contact.html @@ -0,0 +1,18 @@ +

From fafdde800368adbdb258b91a76c42d14b2f2404f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Mon, 27 Jun 2016 23:48:03 +0200 Subject: [PATCH 2/3] Duplicate of Twitter. --- bornhack/templates/includes/contact.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bornhack/templates/includes/contact.html b/bornhack/templates/includes/contact.html index 3f440d80..d870a76f 100644 --- a/bornhack/templates/includes/contact.html +++ b/bornhack/templates/includes/contact.html @@ -12,7 +12,7 @@ @bornhax
  • - Twitter: + Facebook: @BornHax
    • From fb58ede2461f1a79db6d1fa0565064b153c91e4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?= Date: Mon, 27 Jun 2016 23:50:45 +0200 Subject: [PATCH 3/3] Fix casing --- bornhack/templates/includes/contact.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bornhack/templates/includes/contact.html b/bornhack/templates/includes/contact.html index d870a76f..da3b33c5 100644 --- a/bornhack/templates/includes/contact.html +++ b/bornhack/templates/includes/contact.html @@ -9,7 +9,7 @@
  • Twitter: - @bornhax + @BornHax
  • Facebook: