New layout and text

_data/strings.yml

@@ -10,8 +10,8 @@ menu_item_2_da: "Hvornår"
 menu_item_2_en: "When"
 menu_item_3_da: "Hvor"
 menu_item_3_en: "Where"
-menu_item_4_da: "Adfærdskodeks"
-menu_item_4_en: "Code of Conduct"
+menu_code_da: "Adfærdskodeks"
+menu_code_en: "Code of Conduct"
 
 section_who_title_da: "Hvad er det?"
 section_who_title_en: "What is it?"

_layouts/base2.html

@@ -37,10 +37,10 @@
     <nav class="navbar navbar-static-top navbar-fixed-top cryptohagen-navbar">
       <div class="navbar-brand pull-xs-right">
         
-        <a class="nav-link" href="code.html">{{ site.data.strings[menu_item_4] }}</a>
+        <a class="nav-link" href="code.html">{{ site.data.strings[menu_code] }}</a>
 
           {% if page.language == 'da' %}
-              <a href="index_en.html" alt="English">
+              <a href="index2_en.html" alt="English">
                   <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 30" width="24" height="12" style="margin: 13px 0 0 13px;">
                   <clipPath id="t">
                     <path d="M30,15 h30 v15 z v15 h-30 z h-30 v-15 z v-15 h30 z"/>
@@ -53,7 +53,7 @@
                   </svg>
               </a>
           {% else %}
-              <a href="index.html" alt="Danish">
+              <a href="index2.html" alt="Danish">
                   <svg xmlns="http://www.w3.org/2000/svg" width="24" height="18" viewBox="1 1 37 28" style="margin: 10px 0 0 13px;">
                       <rect width="40" height="30" fill="#C60C30"/>
                       <g stroke="#fff" stroke-width="4"><line x1="15" y1="0" x2="15" y2="30"/><line x1="0" y1="15" x2="40" y2="15"/></g>
@@ -66,19 +66,19 @@
       </a>
       <ul class="nav navbar-nav">
         <li class="nav-item active">
-          <a class="nav-link" href="index2.html#">{{ site.data.strings[menu_item_1] }}</a>
+          <a class="nav-link" href="#">{{ site.data.strings[menu_item_1] }}</a>
         </li>
         
         <li class="nav-item">
-          <a class="nav-link" href="index2.html#where">{{ site.data.strings[menu_item_3] }}</a>
+          <a class="nav-link" href="#where">{{ site.data.strings[menu_item_3] }}</a>
         </li>
 
         <li class="nav-item active">
-          <a class="nav-link" href="index2.html#when">{{ site.data.strings[menu_item_2] }}</a>
+          <a class="nav-link" href="#when">{{ site.data.strings[menu_item_2] }}</a>
         </li>
         
         <li class="nav-item">
-          <a class="nav-link" href="index2.html#links">Links</a>
+          <a class="nav-link" href="#links">Links</a>
         </li>
         
       </ul>
@@ -99,8 +99,10 @@
         <div class="row">
           <div class="col-md-8">
             {{ section_who2 | markdownify }}
-            </div>
+          
+      	    <img src="assets/logo/cryto.jpg" width="750"/>  
           </div>
+        </div>
       </div>
     </section>
 
@@ -218,9 +220,7 @@
 
     <footer>
       <div class="container">
-        <div class="navbar-brand">
-            <small>Generously hosted by <a href="https://data.coop">data.coop<img src="assets/logo/DataCoop_Logo.png" /></a>  | <a href="code.html">{{ site.data.strings[menu_item_4] }}</a> | <a href="https://git.data.coop/cryptohagen.dk/website">Source code</a> | Site built: {{ "now" | date: "%Y-%m-%d %H:%M" }} UTC | Jekyll {{ jekyll.version }}</small>
-        </div>
+        <small>Generously hosted by <a href="https://data.coop">data.coop<img src="assets/logo/DataCoop_Logo.png" /></a>  | <a href="https://git.data.coop/cryptohagen.dk/website">Source code</a> | Site built: {{ "now" | date: "%Y-%m-%d %H:%M" }} UTC | Jekyll {{ jekyll.version }}</small>
       </div>
     </footer>
 

_layouts/code.html

@@ -84,20 +84,8 @@
       </ul>
     </nav>
 
-    <section id="logo">
-      <div class="container">
-        <div class="row">
-          <div class="col-md-8">
-      	    <img src="assets/logo/logo.png" />
-          </div>
-        </div>
-      </div>
-    </section>
-
     <section id="intro">
       <div class="container">
-      <h1>{{ site.data.strings[menu_item_4] }}</h1>
-      <hr>
         <div class="row">
           <div class="col-md-8">
             {{ section_code | markdownify }}

_sections/code_da.md

@@ -1,12 +1,48 @@
-We are committed to making the event an inclusive and welcoming event for everyone. 
+# Adfærdskodeks
+<i>(Code of Conduct)</i>
+(for English: please read below)
 
-The most important rule is: <b><i>Be excellent to each other.</i></b>
+Vi er forpligtede til at gøre #cryptohagen til et inkluderende og indbydende forum for alle. 
+Den vigtigste regel er: Vær åben og empatisk overfor hinanden.
 
-Sadly, technology events have a reputation for harassment. We've set these ground rules to make it abundantly clear that this kind of behaviour is not acceptable, so that everyone can feel comfortable attending.
+Desværre er teknologibegivenheder berygtede for chikane. Vi har derfor lavet nogle grundregler – for at gøre det klart, at chikane eller diskriminerende adfærd ikke er acceptabelt. Alle skal kunne føle sig trygge ved at deltage i #cryptohagen.
 
-Everyone who visits the event is required to abide by this code of conduct, both at the event and on any online channels. We will not tolerate harassment of participants or discriminatory behaviour of any form. Specifically:
-- Do not engage in homophobic, racist, transphobic, ableist, sexist, or otherwise prejudiced behaviour.
-- Do not harass people. Stalking, unconsented physical contact, or unwanted sexual attention is harassment. Dressing or acting in a certain way is not consent.
-- the event is a shared space, but every participant's personal space is their own. 
-- Some attendees may not want to be filmed or photographed. Respect their wishes.
-- Aggression and elitism are not welcome — nobody should be afraid to ask questions.
+Alle, der deltager i #cryptohagen, er forpligtede til at overholde vores adfærdskodeks (Code of Conduct) ved arrangementer og på alle onlinekanaler. 
+
+Specifikke regler:
+- Vi tager afstand fra homofobisk, transfobisk, sexistisk, racistisk og anden fordomsfuld adfærd (herunder chikane). 
+- #cryptohagen er et fælles forum, men hver deltagers personlige ”rum” skal respekteres. Hvis du bliver bedt om at lade nogen være i fred, eller om at forlade stedet, må du respektere dette.
+- Nogle deltagere ønsker ikke at blive filmet eller fotograferet. Respekter deres ønsker.
+- Aggressive eller arrogante kommentarer er ikke velkomne – ingen skal være bange for at stille spørgsmål.
+
+Hvis du bryder disse regler, kan vi udelukke dig fra fremtidige #cryptohagen-begivenheder.
+
+Café Mellemrummet, hvor vi mødes i København, er en frivilligt drevet nonprofitcafé. Vi forventer, at du også er åben og empatisk overfor de frivillige i caféen.
+
+Hvis du bliver chikaneret, eller du er vidne til brud på vores adfærdskodeks, skal du kontakte en fra kernegruppen.
+
+Vores adfærdskodeks er baseret på (”lånt” fra) vores venner på Bornhack og deres [adfærdskodeks][bornhackconduct]
+
+<hr>
+
+# Code of Conduct
+We are committed to making #cryptohagen an inclusive and welcoming get-together for everyone.
+The most important rule is: Be open and empathetic towards each other.
+
+Unfortunately, tech events are notorious for harassment. Thus, we have set up some basic rules to make it clear that harassment or discriminatory behavior will not be tolerated. Everyone should feel safe participating in #cryptohagen.
+
+Everyone participating in #cryptohagen is obliged to comply with our Code of Conduct at events as well as on all online channels. 
+
+Specific rules:
+- We denounce homophobic, transphobic, sexist, racist and other prejudiced behaviour (including harassment). 
+- #cryptohagen is a community, but each participant’s personal ”space” should be respected. If you are asked to leave someone alone, or to leave the place, then respect this. 
+- Some participants do not want to be filmed or photographed. Respect their wishes. 
+- Aggressive or arrogant comments are not welcome – no one should be afraid to ask questions.
+
+If you break these rules, we may exclude you from future #cryptohagen events.
+
+Café Mellemrummet, where we meet in Copenhagen, is a volunteer-run nonprofit café. We expect that you are open and empathetic towards the volunteers in the café as well. If you are being harassed, or if you witness a breach of our Code of Conduct, please contact someone from the core group.
+
+Our Code of Conduct is based on (”borrowed” from) our friends at Bornhack and their [Code of Conduct][bornhackconduct]
+
+[bornhackconduct]:https://bornhack.dk/conduct

_sections/code_en.md

@@ -1,12 +0,0 @@
-We are committed to making the event an inclusive and welcoming event for everyone. 
-
-The most important rule is: <b><i>Be excellent to each other.</i></b>
-
-Sadly, technology events have a reputation for harassment. We've set these ground rules to make it abundantly clear that this kind of behaviour is not acceptable, so that everyone can feel comfortable attending.
-
-Everyone who visits the event is required to abide by this code of conduct, both at the event and on any online channels. We will not tolerate harassment of participants or discriminatory behaviour of any form. Specifically:
-- Do not engage in homophobic, racist, transphobic, ableist, sexist, or otherwise prejudiced behaviour.
-- Do not harass people. Stalking, unconsented physical contact, or unwanted sexual attention is harassment. Dressing or acting in a certain way is not consent.
-- the event is a shared space, but every participant's personal space is their own. 
-- Some attendees may not want to be filmed or photographed. Respect their wishes.
-- Aggression and elitism are not welcome — nobody should be afraid to ask questions.

_sections/who2_da.md

@@ -1,5 +1,4 @@
 # Hvad er det
-## Et fysisk forum
 Cryptohagen er et hyggeligt og uformelt forum, som har fokus på digital
 privatlivsbeskyttelse. Cryptohagen er for alle, der bruger nettet i en eller anden form.
 Vi er et ”friendly community”, hvor der er plads til at vende tanker og idéer om
@@ -27,7 +26,6 @@ Der vil være tidspunkter, hvor du har brug for at kunne bevæge dig rundt på n
 eller kommunikere med andre, uden at nogen ”lytter med”. Det gælder også dig, som
 ikke mener, du har noget at skjule.
 
-
 Måske hører du til på et af disse niveauer:
 - Du er studerende og skal søge oplysninger eller lave research om følsomme emner.
 - Du er i et problematisk parforhold og vil kunne søge hjælp og oplysninger, uden at din partner bliver opmærksom på det.
@@ -37,18 +35,13 @@ Måske hører du til på et af disse niveauer:
 Vi kan hjælpe dig på alle niveauer. Vi er ikke modstandere af digitaliseringen, men
 værdsætter retten til privatliv – også på nettet.
 
-
 ## Kom i kontakt
-
 Vi har en [Twitterkonto][twitter]. Du er velkommen til at skrive til os på Twitter, men vær opmærksom på, at DM’er (direct messages) ikke læses. Derfor er det bedst at tagge os. 
 
 Vi har også en [Mastodonkonto][mastodon] / [Kom på mastodon][joinmastodon]
 
 Den bedste måde, du kan kontakte os, er at komme og hilse på os den sidste
-søndag i måneden. [Se, hvornår vi mødes næste gang.][#where]
-
-Vi har en [Twitterkonto][twitter]. Du er velkommen til, at skrive til os der men vær opmærksom på at DM'er ikke læses. Derfor er det bedst at tagge os.
-
+søndag i måneden.
 
 [cryptoaarhus]:https://cryptoaarhus.dk
 [adfærdskodeks]:https://cryptohagen.dk/code.html

_sections/who2_en.md

@@ -0,0 +1,51 @@
+# About us
+Cryptohagen is a cozy and informal community with a focus on digital privacy. Cryptohagen
+is for anyone who uses the Internet in one form or another. We are a ”friendly community”
+where you can share thoughts and ideas about privacy, online safety, encryption, and
+similar topics. Everyone is welcome.
+
+We can help you with many kinds of questions about digital privacy. We can also help you
+get started using some of the popular and recognized security tools on your smartphone
+and on your computer. We can talk about that when we meet. Your specific needs are our
+starting point.
+
+We get together every last Sunday of the month in Copenhagen. There is a similar event in
+[Aarhus][cryptoaarhus]. So come and say hi, have a chat and a good cup of coffee. Ask for Thomas, Rolf,
+Ove, or Helle. We’ll have a talk about your specific needs and come up with some ideas to
+help you get started. All you need to bring is a friendly smile and a wish to get to know some
+nice people in a relaxed environment.
+
+Now and then we invite a speaker, or we update each other on new knowledge. We also
+organize an annual event on Tor Project and other anonymous browsers (based on State of
+the Onion).
+
+Read our [adfærdskodeks][Code of Conduct].
+
+# Who are you?
+Sometimes you need to surf the Internet or communicate with others without anybody
+”listening in”. This also applies to you who think you have nothing to hide.
+
+Maybe you belong at one of these levels:
+
+- You are a student and need to research sensitive topics.
+- You are in a problematic relationship and need a way to get help without alerting
+your partner.
+- You may be a future whistleblower.
+- You have been hacked.
+We can help you at all the above-mentioned levels. We are not against digitization, but we
+do appreciate the rights of privacy – also on the Internet.
+
+# Get in touch
+We have a [Twitter account][twitter]Twitter account. Please, feel free to contact us there. A few of us have access to
+the account, but please note: We don’t read DMs (direct messages) very often, so tagging us
+is better. We also have a [Mastodon account][mastodon] / [Get on mastodon][joinmastodon]
+The best way to get in touch: Come and meet us every last Sunday of the month in
+Copenhagen!
+
+[cryptoaarhus]:https://cryptoaarhus.dk
+[adfærdskodeks]:https://cryptohagen.dk/code.html
+[#where]:https://cryptohagen.dk/#where
+[twitter]:https://twitter.com/cryptohagen
+[mastodon]:@cryptohagen@social.data.coop
+[joinmastodon]: https://joinmastodon.org/
+

index2_en.html

@@ -0,0 +1,4 @@
+---
+layout: base2
+language: en
+---