Dev changes

civictechsweden · Sep 12, 2017 · a8a9183 · a8a9183
1 parent 9366ccb
commit a8a9183
Show file tree

Hide file tree

Showing 18 changed files with 262 additions and 191 deletions.
diff --git a/_config.yml b/_config.yml
@@ -1,5 +1,56 @@
-title: Civic Tech Gbg
+title: CivicTechGbg
 description: Hackathons för Civic Tech-communitiet i Göteborg
 theme: jekyll-theme-cayman
 plugins:
 - jemoji
+
+project-title:
+  sv: Kommande hackathons
+  en: Hackathons
+contact:
+  sv:
+    title: Kontakta oss!
+    text: Det här är ett första utkast till ett samarbete och gemensamma event. Kontakta gärna oss om din organisation vill vara med, eller om du har idéer och förslag.
+  en:
+    title: Get in touch!
+    text: Digidem Lab is a non-profit organisation promoting participatory democracy
+      on all levels of society. Get in touch to see how we can help your movement
+      or organisation to find new processes and tools for participation.
+collections:
+  crew:
+    title: Crew
+    output: false
+  posts:
+    title: Posts
+    output: true
+  hackathons:
+    title: Hackathons
+    output: true
+    permalink: "/hackathon/:title/"
+  uploads:
+    title: Uploads
+    output: true
+defaults:
+- scope:
+    path: ''
+    type: pages
+  values:
+    layout: page
+    lang: sv
+- scope:
+    path: en
+    type: pages
+  values:
+    layout: page
+    lang: en
+- scope:
+    path: ''
+    type: hackathons
+  values:
+    layout: project
+    lang: sv
+- scope:
+    path: ''
+    type: crew
+  values:
+    lang: sv
diff --git a/_hackathons/i-like-to-move-it.md b/_hackathons/i-like-to-move-it.md
@@ -0,0 +1,12 @@
+---
+title: I Like To Move It
+event-date: 2018-02-01 00:00
+event-date-desc: Februari 2018
+ref: move
+excerpt: Tema hållbara transporter, resande och rörlighet.
+ingress-text:  Tema hållbara transporter, resande och rörlighet.
+partner-links:
+- name: Ideella samåkningsrörelsen Skjutsgruppen
+  logo: "holder.js/100x100"
+  link: http://skjutsgruppen.se/
+---
diff --git a/_hackathons/power-to-the-people.md b/_hackathons/power-to-the-people.md
@@ -0,0 +1,20 @@
+---
+title: Power To The People
+event-date: 2017-12-09 00:00
+event-date-desc: 9 december 2017 (preliminärt)
+ref: power
+excerpt: Tema demokrati, deltagande och transparens.
+ingress-text: Tema demokrati, deltagande och transparens.
+links:
+  - title: Anmälan
+    url: '#'
+    style: button
+partner-links:
+- name: Digidem Lab
+  logo: "holder.js/100x100"
+  link: http://digidemlab.org/
+---
+
+
+
+9 december 2017 (preliminärt)
diff --git a/_hackathons/sharing-is-caring.md b/_hackathons/sharing-is-caring.md
@@ -0,0 +1,22 @@
+---
+title: Sharing Is Caring
+event-date: 2017-10-28 00:00
+event-date-desc: 28 oktober 2017 (preliminärt)
+ref: sharing
+excerpt: Tema kollaborativ ekonomi, gemensamma resurser och hållbar konsumtion.
+ingress-text:  Tema kollaborativ ekonomi, gemensamma resurser och hållbar konsumtion.
+partner-links:
+- name: Solidariskt Kylskåp
+  logo: "holder.js/100x100"
+  link: http://solikyl.se/
+- name: Smarta Kartan
+  logo: "holder.js/100x100"
+  link: http://smartakartan.se/
+---
+
+Bygg en delningsplattform i Yunity
+
+Vi utvecklar en med delningsplattformen Yunity, eller bygger vidare på foodsaving.world.
+Smarta kartan (?)
+
+Vi tar Smarta Kartan till nästa nivå genom att göra den open source.
diff --git a/_includes/content/page-header.html b/_includes/content/page-header.html
@@ -3,16 +3,6 @@
     <h1>{{page.title}}</h1>
   </div>
 </div>
-<div class="row mb-2 mb-lg-3">
-  <div class="col-lg-6 push-lg-6 offset-xl-2 push-xl-4">
-    <div class="lead text-primary">{{ page.ingress-text | markdownify }}</div>
-  </div>
-  {% if page.links %}
-    <div class="col-lg-5 pull-lg-6 col-xl-4 pull-xl-8 mt-2 mt-lg-0">
-      {% include content/page-links.html links=page.links %}
-    </div>
-  {% endif %}
-</div>
 {% if page.image-top %}
   <div class="row mt-1 mb-3 mb-lg-5">
     <div class="col-10 offset-1 col-lg-5 offset-lg-4 text-center">

diff --git a/_includes/footer.html b/_includes/footer.html
@@ -1,11 +1,38 @@
-<footer id="footer" class=" bg-success">
-  <div class="container pt-2 pb-1">
-    {% include panels/social.html %}
-
+<section id="partners" class="">
+
+  <div class="container py-3">
     <div class="row">
-      <div class="col text-center text-primary">
-        <p class="small">Registered in Sweden as Non-Profit 802500-2638</p>
+      <div class="col-4">
+        <h2 class="display-3">Ett initiativ från</a>
+        <img data-src="holder.js/300x120?text=DigidemLab&auto=yes" class="img-fluid">
+      </div>
+      <div class="col-8">
+        <h2 class="display-3">I samarbete med</a>
+        <div class="row">
+          <div class="col-4 pb-1">
+            <img data-src="holder.js/300x200?text=DigidemLab&auto=yes" class="img-fluid">
+          </div>
+          <div class="col-4">
+            <img data-src="holder.js/300x200?text=DigidemLab&auto=yes" class="img-fluid">
+          </div>
+          <div class="col-4">
+            <img data-src="holder.js/300x200?text=DigidemLab&auto=yes" class="img-fluid">
+          </div>
+          <div class="col-4">
+            <img data-src="holder.js/300x200?text=DigidemLab&auto=yes" class="img-fluid">
+          </div>
+          <div class="col-4">
+            <img data-src="holder.js/300x200?text=DigidemLab&auto=yes" class="img-fluid">
+          </div>
+        </div>
       </div>
     </div>
   </div>
+</section>
+
+<footer id="footer" class="bg-danger">
+
+  <div class="container pt-2 pb-1">
+    {% include panels/social.html %}
+  </div>
 </footer>
diff --git a/_includes/panels/contact.html b/_includes/panels/contact.html
@@ -1,36 +1,18 @@
-<section id="contact" class="bg-info">
-  <div class="container pt-3b pb-3 pb-lg-0">
-
+<section id="contact" class="bg-primary">
+  <div class="container py-3">
     <div class="row">
       <div class="col-lg-10 offset-lg-1 text-center px-3">
-
-        <h2 class="display-2 text-white mb-lg-1">{{site.contact[page.lang].title}}</h2>
+        <h2 class="display-2 text-white mb-lg-1">Vill du vara med?</h2>
         <p class="text-white">{{site.contact[page.lang].text}}</p>
-
       </div>
     </div>
 
     <div class="row">
       <div class="col">
-        <ul class="list-unstyled list-random mt-2">
-
-          {% assign crew=site.crew | where:"lang", page.lang %}
-
-          {% for item in crew %}
-            <li class="media text-white text-center list-random-item  list-random-item-{{forloop.index}} {% cycle 'mb-lg-6', '' %}">
-              <div class="media-body pt-2 pb-3">
-                <strong>{{item.title}}</strong>,
-                {{item.job}},
-                {{item.phone}},
-                <a href="mailto:{{item.mail}}" class="text-white">{{item.mail}}</a>
-              </div>
-              <img class="list-random-image list-random-image-{{forloop.index}} hidden-md-down" src="{{site.baseurl}}{{item.image}}" width="150">
-            </li>
-          {% endfor %}
-
-        </ul>
+        <p class="text-white text-center" style="font-size:1rem;">
+          Petter Joelson, <a  class="text-white" href="http://digidemlab.org">Digidem Lab</a>, <a class="text-white" href="mailto:petter@digidemlab.org">petter@digidemlab.org</a><br>
+          Bruno Chies, <a  class="text-white" href="http://solikyl.se/">Solidariskt Kylskåp</a>, <a class="text-white" href="mailto:bruno@solikyl.se">bruno@solikyl.se</a></p>
       </div>
     </div>
-
   </div>
 </section> <!-- /contact -->
diff --git a/_includes/panels/menu-lang.html b/_includes/panels/menu-lang.html
@@ -1,12 +1,7 @@
-{% assign posts=site.projects | where:"ref", page.ref | sort: 'lang' %}
-{% for post in posts %}
-  <li class="nav-item {% if post.lang == page.lang %}active{% endif %}">
-    <a class="nav-link py-0 text-uppercase {{ post.lang }}" href="{{ site.baseurl }}{{ post.url }}">{{ post.lang }}</a>
-  </li>
-{% endfor %}
+
 {% assign pages=site.pages | where:"ref", page.ref | sort: 'lang' %}
 {% for item in pages %}
   <li class="nav-item {% if item.lang == page.lang %}active{% endif %}">
-    <a class="nav-link py-0 text-uppercase {{ item.lang }}" href="{{ site.baseurl }}{{ item.url }}">{{ item.lang }}</a>
+    <a class="nav-link text-danger py-0 text-uppercase {{ item.lang }}" href="{{ site.baseurl }}{{ item.url }}">{{ item.lang }}</a>
   </li>
 {% endfor %}
diff --git a/_includes/panels/navbar.html b/_includes/panels/navbar.html
@@ -4,16 +4,11 @@
     <span class="navbar-toggler-icon"></span>
   </button>
 
-  <a class="navbar-brand p-0" href="{{site.baseurl}}{% if page.lang == 'sv'%}/{% else %}/en{% endif %}"><img src="{{site.baseurl}}/assets/images/logotyp.svg" width="250" height="70" class="d-inline-block align-top"></a>
+  <a class="navbar-brand p-0" href="{{site.baseurl}}{% if page.lang == 'sv'%}/{% else %}/en{% endif %}">
+    {{site.title}}
+  </a>
 
   <div class="collapse navbar-collapse justify-content-end mb-auto" id="main-menu">
-    <ul class="navbar-nav nav-menu-main">
-      {% for item in site.data.menu[page.lang] %}
-        <li class="nav-item">
-          <a class="nav-link px-2 py-0" href="{% unless item.url contains 'http' %}{{site.baseurl}}{% endunless %}{{item.url}}">{{item.title}}</a>
-        </li>
-      {% endfor %}
-    </ul>
     <ul class="navbar-nav nav-menu-secondary ml-4">
       {% include panels/menu-lang.html %}
     </ul>

diff --git a/_includes/panels/projects.html b/_includes/panels/projects.html
@@ -1,17 +1,18 @@
-{% assign projects=site.projects | where:"lang", page.lang %}
+{% assign hackathons=site.hackathons | where:"lang", page.lang | sort:'event-date'%}
 
-{% for item in projects %}
+{% for item in hackathons %}
   <div class="{% cycle 'bg-faded', '' %}">
     <div class="container py-3b py-lg-3c">
       <div class="row">
         <div class="col">
-          <h2 class="display-2 mb-0b mb-lg-2b"><a href="{{site.baseurl}}{{item.url}}" class="{% cycle 'text-info', '' %}">{{item.title}}</a></h2>
+          <h2 class="display-2 mb-0b mb-lg-2b"><a href="{{site.baseurl}}{{item.url}}" class="text-primary">{{item.title}}</a></h2>
         </div>
       </div>
       <div class="row mb-3">
         <div class="col-lg-9">
-          <p class="lead">{{item.excerpt}}</p>
-          <p>{{ item.ingress-text | strip_html }}</p>
+          <h3 class="mb-0">{{item.event-date-desc}}</h3>
+          <p class="lead text-primary">{{item.excerpt}}</p>
+          <p class="">{{ item.ingress-text | strip_html }}</p>
         </div>
       </div>
       <div class="row">

diff --git a/_includes/panels/social.html b/_includes/panels/social.html
@@ -1,7 +1,7 @@
 <div class="d-flex justify-content-center">
-  <div class="py-2 px-1 px-sm-2"><a href="https://medium.com/digidemlab" class="text-primary"><i class="fa fa-medium fa-3x" aria-hidden="true"></i></a></div>
-  <div class="py-2 px-1 px-sm-2"><a href="https://www.instagram.com/digidemlab/" class="text-primary"><i class="fa fa-instagram fa-3x" aria-hidden="true"></i></a></div>
-  <div class="py-2 px-1 px-sm-2"><a href="https://www.facebook.com/digidemlab" class="text-primary"><i class="fa fa-facebook-official fa-3x" aria-hidden="true"></i></a></div>
-  <div class="py-2 px-1 px-sm-2"><a href="https://twitter.com/digidemlab" class="text-primary"><i class="fa fa-twitter fa-3x" aria-hidden="true"></i></a></div>
-  <div class="py-2 px-1 px-sm-2"><a href="https://github.com/digidemlab" class="text-primary"><i class="fa fa-github fa-3x" aria-hidden="true"></i></a></div>
+  <div class="py-2 px-1 px-sm-2"><a href="https://medium.com/digidemlab" class="text-white"><i class="fa fa-medium fa-3x" aria-hidden="true"></i></a></div>
+  <div class="py-2 px-1 px-sm-2"><a href="https://www.instagram.com/digidemlab/" class="text-white"><i class="fa fa-instagram fa-3x" aria-hidden="true"></i></a></div>
+  <div class="py-2 px-1 px-sm-2"><a href="https://www.facebook.com/digidemlab" class="text-white"><i class="fa fa-facebook-official fa-3x" aria-hidden="true"></i></a></div>
+  <div class="py-2 px-1 px-sm-2"><a href="https://twitter.com/digidemlab" class="text-white"><i class="fa fa-twitter fa-3x" aria-hidden="true"></i></a></div>
+  <div class="py-2 px-1 px-sm-2"><a href="https://github.com/digidemlab" class="text-white"><i class="fa fa-github fa-3x" aria-hidden="true"></i></a></div>
 </div>
diff --git a/_layouts/global.html b/_layouts/global.html
@@ -4,7 +4,23 @@
 
 <header class="site-header" role="banner">
   <div class="container">
-    {% include panels/navbar.html %}
+    <nav class="navbar navbar-toggleable-md navbar-light pt-2 pt-lg-3 pb-0">
+      <button class="navbar-toggler navbar-toggler-right border-0" type="button" data-toggle="modal" data-target="#menuModal" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+        <!-- <i class="fa fa-bars fa-3x" aria-hidden="true"></i> -->
+        <span class="navbar-toggler-icon"></span>
+      </button>
+
+      <a class="navbar-brand text-primary text-uppercase p-0" href="{{site.baseurl}}{% if page.lang == 'sv'%}/{% else %}/en{% endif %}">
+        {{site.title}}
+      </a>
+
+      <div class="collapse navbar-collapse justify-content-end mb-auto" id="main-menu">
+        <ul class="navbar-nav nav-menu-secondary ml-4">
+          {% include panels/menu-lang.html %}
+        </ul>
+
+      </div>
+    </nav>
   </div>
 </header>
 {{content}}