Site update

civictechsweden · Oct 3, 2017 · 4e3bdfd · 4e3bdfd
1 parent b167dcd
commit 4e3bdfd
Show file tree

Hide file tree

Showing 12 changed files with 63 additions and 253 deletions.
diff --git a/_config.yml b/_config.yml
@@ -79,9 +79,9 @@ partner:
     initiative: An initiative from
     partnership: In partnership with
 partners:
-- title: Ideella samåkningsrörelsen Skjutsgruppen
-  logo: "/uploads/logo-skjutsgruppen.jpg"
-  link: http://skjutsgruppen.se/
+- title: Göteborgs Stad - Förvaltningen för konsument- och medborgarservice
+  logo: "/uploads/logo-goteborg.png"
+  link: http://goteborg.se/wps/portal/start/kommun-o-politik/kommunens-organisation/forvaltningar/forvaltningar/forvaltningen-for-konsument--och-medborgarservice-/!ut/p/z1/hU7NCoMwGHsar_1q_Wm7WxlD0P3ALrpehrpOZauVWjfY00-Pg40FcghJSEBCAbIvH11Tus705X3WJxmfQ5JgPw39LNkIikW0JtFufwiyI4H8X0DONv4BgSEF2VUaPWuNMCIkoowwzhkNGY85XfZFXwWsAWnVVVll0WTnW61zw7jysIcvU31b2BhUG-3hb5XWjA6KzyQMunhtVS7e-Y0waA!!/dz/d5/L2dBISEvZ0FBIS9nQSEh/
 - title: Solidariskt Kylskåp
   logo: "/uploads/logo-solikyl.jpg"
   link: http://solikyl.se/
diff --git a/_hackathons/i-like-to-move-it-en.md b/_hackathons/i-like-to-move-it-en.md
@@ -2,35 +2,11 @@
 title: I Like To Move It
 permalink: "/en/hackathon/i-like-to-move-it"
 event-date: 2018-02-01 00:00
-event-date-desc: februari 2018
-place: Göteborg
+event-date-desc: Spring 2018
+place: Gothenburg
 ref: move
 lang: en
-links:
-- title: Anmälan
-  url: "#"
-  style: button
 image-top: "/uploads/move-it.gif"
-excerpt: Hållbara transporter, resande och rörlighet.
-ingress-text: Cras mattis consectetur purus sit amet fermentum. Aenean eu leo quam.
-  Pellentesque ornare sem lacinia quam venenatis vestibulum.
-projects:
-- title: Skjutsgruppen goes open source
-  text: Var med och gör en unik svenskt samåkningstjänst open source!
-  image: "/uploads/logo-skjutsgruppen.jpg"
-  links:
-  - title: Skjutsgruppen
-    url: http://www.skjutsgruppen.nu/
-- title: Mobility as a service
-  text: Blockchainbaserat resande FTW.
-- title: Cykelköket
-  text: Passa på att laga din cykel hos Cykelköket!
-partner-text: I Like To Move It arrangeras av Ideella Järngänget Skjutsgruppen och
-  vestibulum id ligula porta felis euismod semper.
-partner-links:
-- name: Ideella samåkningsrörelsen Skjutsgruppen
-  logo: "/uploads/logo-skjutsgruppen.jpg"
-  link: http://skjutsgruppen.se/
+excerpt: Sustainable transportation, travel and mobility.
+ingress-text: New innovations for sustainable transportation, car-pooling and mobility as a service.
 ---
-
-Cras justo odio, dapibus ac facilisis in, egestas eget quam. Curabitur blandit tempus porttitor. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec ullamcorper nulla non metus auctor fringilla. Donec ullamcorper nulla non metus auctor fringilla. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.
diff --git a/_hackathons/i-like-to-move-it.md b/_hackathons/i-like-to-move-it.md
@@ -1,34 +1,10 @@
 ---
 title: I Like To Move It
 event-date: 2018-02-01 00:00
-event-date-desc: februari 2018
+event-date-desc: Våren 2018
 place: Göteborg
 ref: move
-links:
-- title: Anmälan
-  url: "#"
-  style: button
 image-top: "/uploads/move-it.gif"
 excerpt: Hållbara transporter, resande och rörlighet.
-ingress-text: Cras mattis consectetur purus sit amet fermentum. Aenean eu leo quam.
-  Pellentesque ornare sem lacinia quam venenatis vestibulum.
-projects:
-- title: Skjutsgruppen goes open source
-  text: Var med och gör en unik svenskt samåkningstjänst open source!
-  image: "/uploads/logo-skjutsgruppen.jpg"
-  links:
-  - title: Skjutsgruppen
-    url: http://www.skjutsgruppen.nu/
-- title: Mobility as a service
-  text: Blockchainbaserat resande FTW.
-- title: Cykelköket
-  text: Passa på att laga din cykel hos Cykelköket!
-partner-text: I Like To Move It arrangeras av Ideella Järngänget Skjutsgruppen och
-  vestibulum id ligula porta felis euismod semper.
-partner-links:
-- name: Ideella samåkningsrörelsen Skjutsgruppen
-  logo: "/uploads/logo-skjutsgruppen.jpg"
-  link: http://skjutsgruppen.se/
+ingress-text: Nya tjänster för hållbara transporter, samåkning och mobility as a service.
 ---
-
-Cras justo odio, dapibus ac facilisis in, egestas eget quam. Curabitur blandit tempus porttitor. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec ullamcorper nulla non metus auctor fringilla. Donec ullamcorper nulla non metus auctor fringilla. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.
diff --git a/_hackathons/power-to-the-people-en.md b/_hackathons/power-to-the-people-en.md
@@ -1,47 +1,11 @@
 ---
 title: Power To The People
 permalink: "/en/hackathon/power-to-the-people"
-event-date: 2017-12-09 00:00
-event-date-desc: 9 december 2017 (preliminärt)
-place: Göteborg
+event-date: 2018-04-09 00:00
+event-date-desc: Spring 2018
+place: Gothenburg
 ref: power
 lang: en
-excerpt: Demokrati, deltagande och transparens.
-ingress-text: Curabitur blandit tempus porttitor. Maecenas sed diam eget risus varius
-  blandit sit amet non magna.
-links:
-- title: Anmälan
-  url: "#"
-  style: button
-projects:
-- title: Medborgarplattformen Consul
-  text: Vi installerar, testar och översätter Consul, Madrids plattform för deltagarbudget
-    och Europas mest använda medborgarplattform.
-  image: "/uploads/consul-share.png"
-  links:
-  - title: Making Madrid´s citizen platform accessible to a wider audience
-    url: https://medium.com/digidemlab/making-madrid-s-citizen-platform-accessible-to-a-wider-audience-f452dd59a394
-- title: Visualisering av Göteborgs öppna data
-  text: Alla inköp från Göteborgs stad finns som öppen data, vi labbar med Open Spending
-    och andra verktyg för att visualisera den data som finns.
-  image: "/uploads/logo-openspending.png"
-  links:
-  - title: Open Spending
-    url: http://openspending.org/
-  - title: Göteborgs öppna data
-    url: http://data.goteborg.se/
-- title: Folkomröstning med Blockchain
-  text: Democracy Earth presenterar sitt projekt med blockchainbaserade omröstningar.
-  image: "/uploads/logo-democracyearth2.png"
-  links:
-  - title: Democracy Earth
-    url: http://democracy.earth/
-partner-text: Power To The People arrangeras av Digidem Lab och vestibulum id ligula
-  porta felis euismod semper.
-partner-links:
-- name: Digidem Lab
-  logo: "/uploads/logo-digidemlab.png"
-  link: http://digidemlab.org/
+excerpt: Democracy, participation and transparency.
+ingress-text: Deliberative democracy, participatory budgeting and blockchain based voting.
 ---
-
-Curabitur blandit tempus porttitor. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Nulla vitae elit libero, a pharetra augue. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Donec ullamcorper nulla non metus auctor fringilla. Donec id elit non mi porta gravida at eget metus.
diff --git a/_hackathons/power-to-the-people.md b/_hackathons/power-to-the-people.md
@@ -1,45 +1,9 @@
 ---
 title: Power To The People
-event-date: 2017-12-09 00:00
-event-date-desc: 9 december 2017 (preliminärt)
+event-date: 2018-04-09 00:00
+event-date-desc: Våren 2018
 place: Göteborg
 ref: power
 excerpt: Demokrati, deltagande och transparens.
-ingress-text: Curabitur blandit tempus porttitor. Maecenas sed diam eget risus varius
-  blandit sit amet non magna.
-links:
-- title: Anmälan
-  url: "#"
-  style: button
-projects:
-- title: Medborgarplattformen Consul
-  text: Vi installerar, testar och översätter Consul, Madrids plattform för deltagarbudget
-    och Europas mest använda medborgarplattform.
-  image: "/uploads/consul-share.png"
-  links:
-  - title: Making Madrid´s citizen platform accessible to a wider audience
-    url: https://medium.com/digidemlab/making-madrid-s-citizen-platform-accessible-to-a-wider-audience-f452dd59a394
-- title: Visualisering av Göteborgs öppna data
-  text: Alla inköp från Göteborgs stad finns som öppen data, vi labbar med Open Spending
-    och andra verktyg för att visualisera den data som finns.
-  image: "/uploads/logo-openspending.png"
-  links:
-  - title: Open Spending
-    url: http://openspending.org/
-  - title: Göteborgs öppna data
-    url: http://data.goteborg.se/
-- title: Folkomröstning med Blockchain
-  text: Democracy Earth presenterar sitt projekt med blockchainbaserade omröstningar.
-  image: "/uploads/logo-democracyearth2.png"
-  links:
-  - title: Democracy Earth
-    url: http://democracy.earth/
-partner-text: Power To The People arrangeras av Digidem Lab och vestibulum id ligula
-  porta felis euismod semper.
-partner-links:
-- name: Digidem Lab
-  logo: "/uploads/logo-digidemlab.png"
-  link: http://digidemlab.org/
+ingress-text: Deltagande demokrati, medborgarbudgetar och blockchainbaserade omröstningar.
 ---
-
-Curabitur blandit tempus porttitor. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Nulla vitae elit libero, a pharetra augue. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Donec ullamcorper nulla non metus auctor fringilla. Donec id elit non mi porta gravida at eget metus.
diff --git a/_hackathons/sharing-is-caring-en.md b/_hackathons/sharing-is-caring-en.md
@@ -1,48 +1,13 @@
 ---
 title: Sharing Is Caring
 permalink: "/en/hackathon/sharing-is-caring/"
-event-date: 2017-10-28 00:00
-event-date-desc: 28 oktober 2017 (preliminärt)
-place: Göteborg
+event-date: 2018-03-28 00:00
+event-date-desc: Spring 2018
+place: Gothenburg
 ref: sharing
 lang: en
-excerpt: Kollaborativ ekonomi, gemensamma resurser och hållbar konsumtion.
-ingress-text: Smarta lösningar för ett hållbart samhälle. Donec ullamcorper nulla
-  non metus auctor fringilla. Curabitur blandit tempus porttitor.
-links:
-- title: Anmälan
-  url: "#"
-  style: button
-projects:
-- title: Bygg en delningsplattform i Yunity
-  text: Nullam quis risus eget urna mollis ornare vel eu leo. Sed posuere consectetur
-    est at lobortis. Praesent commodo cursus magna, vel scelerisque nisl consectetur
-    et. Maecenas sed diam eget risus varius blandit sit amet non magna. Fusce dapibus,
-    tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo
-    sit amet risus. Donec sed odio dui. Etiam porta sem malesuada magna mollis euismod.
-  image: "/uploads/yunity-orange.svg"
-  links:
-  - title: Läs om Yunity
-    url: https://yunity.org/en
-- title: Gör Smarta Kartan open source
-  text: Etiam porta sem malesuada magna mollis euismod. Morbi leo risus, porta ac
-    consectetur ac, vestibulum at eros. Vivamus sagittis lacus vel augue laoreet rutrum
-    faucibus dolor auctor. Nullam quis risus eget urna mollis ornare vel eu leo. Donec
-    ullamcorper nulla non metus auctor fringilla. Etiam porta sem malesuada magna
-    mollis euismod. Nullam id dolor id nibh ultricies vehicula ut id elit.
-  image: "/uploads/smarta-kartan-logo.svg"
-  links:
-  - title: Smartakartan.se
-    url: http://smartakartan.se/
-partner-text: Sharing is Caring arrangeras av Digidem Lab och Solidariskt Kylskåp
-  Vestibulum id ligula porta felis euismod semper.
-partner-links:
-- name: Solidariskt Kylskåp
-  logo: "/uploads/logo-solikyl.jpg"
-  link: http://solikyl.se/
-- name: Smarta Kartan
-  logo: "/uploads/logo-solikyl.jpg"
-  link: http://smartakartan.se/
+excerpt: Collaborative economy, the commons and sustainable consumption.
+ingress-text: New smart solutions for a sustainable and fair society.
 ---
 
-Collaborative economy, the real sharing economy, the commons and sustainable consumption. Etiam porta sem malesuada magna mollis euismod. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Etiam porta sem malesuada magna mollis euismod. Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Etiam porta sem malesuada magna mollis euismod. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.
+Collaborative economy, the real sharing economy, the commons and sustainable consumption.
diff --git a/_hackathons/sharing-is-caring.md b/_hackathons/sharing-is-caring.md
@@ -1,46 +1,11 @@
 ---
 title: Sharing Is Caring
-event-date: 2017-10-28 00:00
-event-date-desc: 28 oktober 2017 (preliminärt)
+event-date: 2018-03-28 00:00
+event-date-desc: Våren 2018
 place: Göteborg
 ref: sharing
 excerpt: Kollaborativ ekonomi, gemensamma resurser och hållbar konsumtion.
-ingress-text: Smarta lösningar för ett hållbart samhälle. Donec ullamcorper nulla
-  non metus auctor fringilla. Curabitur blandit tempus porttitor.
-links:
-- title: Anmälan
-  url: "#"
-  style: button
-projects:
-- title: Bygg en delningsplattform i Yunity
-  text: Nullam quis risus eget urna mollis ornare vel eu leo. Sed posuere consectetur
-    est at lobortis. Praesent commodo cursus magna, vel scelerisque nisl consectetur
-    et. Maecenas sed diam eget risus varius blandit sit amet non magna. Fusce dapibus,
-    tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo
-    sit amet risus. Donec sed odio dui. Etiam porta sem malesuada magna mollis euismod.
-  image: "/uploads/yunity-orange.svg"
-  links:
-  - title: Läs om Yunity
-    url: https://yunity.org/en
-- title: Gör Smarta Kartan open source
-  text: Etiam porta sem malesuada magna mollis euismod. Morbi leo risus, porta ac
-    consectetur ac, vestibulum at eros. Vivamus sagittis lacus vel augue laoreet rutrum
-    faucibus dolor auctor. Nullam quis risus eget urna mollis ornare vel eu leo. Donec
-    ullamcorper nulla non metus auctor fringilla. Etiam porta sem malesuada magna
-    mollis euismod. Nullam id dolor id nibh ultricies vehicula ut id elit.
-  image: "/uploads/smarta-kartan-logo.svg"
-  links:
-  - title: Smartakartan.se
-    url: http://smartakartan.se/
-partner-text: Sharing is Caring arrangeras av Digidem Lab och Solidariskt Kylskåp
-  Vestibulum id ligula porta felis euismod semper.
-partner-links:
-- name: Solidariskt Kylskåp
-  logo: "/uploads/logo-solikyl.jpg"
-  link: http://solikyl.se/
-- name: Smarta Kartan
-  logo: "/uploads/logo-solikyl.jpg"
-  link: http://smartakartan.se/
+ingress-text: Vi utvecklar nya smarta lösningar för ett hållbart och rättvist samhälle.
 ---
 
-Collaborative economy, the real sharing economy, the commons and sustainable consumption. Etiam porta sem malesuada magna mollis euismod. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Etiam porta sem malesuada magna mollis euismod. Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Etiam porta sem malesuada magna mollis euismod. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.
+På hackathonet Sharing Is Caring samlas vi för att utveckla tjänster för ett ett hållbart samhälle för alla.
diff --git a/_includes/projects.html b/_includes/projects.html
@@ -5,7 +5,7 @@
     <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="text-primary">{{item.title}}</a></h2>
+          <h2 class="display-2 mb-0b mb-lg-2b">{{item.title}}</h2>
         </div>
       </div>
       <div class="row mb-3">

diff --git a/_layouts/project.html b/_layouts/project.html
@@ -12,33 +12,35 @@
     </div>
   </div>
 
-  {% for item in page.projects %}
-    <div class="{% cycle 'bg-faded', '' %}">
-      <div class="container py-4">
-        <div class="row">
-          <div class="col-lg-10 offset-lg-2">
-            <div class="row">
-              <div class="col-8 offset-2 offset-sm-0 col-sm-4 text-center mb-2">
-                <img class="w-100" src="{{site.baseurl}}{{item.image}}">
-              </div>
-              <div class="col-12 col-sm-8">
-                  <h2 class="mb-1">{{item.title}}</h2>
-                <p>
-                  {{item.text}}
-                </p>
-                <p>
-                  {% for link in item.links %}
-                    <a class="text-danger" href="{{link.url}}">{{link.title}}</a>
-                    {% unless forloop.last %}, {% endunless %}
-                  {% endfor %}
-                </p>
+  {% if page.projects > 0 %}
+    {% for item in page.projects %}
+      <div class="{% cycle 'bg-faded', '' %}">
+        <div class="container py-4">
+          <div class="row">
+            <div class="col-lg-10 offset-lg-2">
+              <div class="row">
+                <div class="col-8 offset-2 offset-sm-0 col-sm-4 text-center mb-2">
+                  <img class="w-100" src="{{site.baseurl}}{{item.image}}">
+                </div>
+                <div class="col-12 col-sm-8">
+                    <h2 class="mb-1">{{item.title}}</h2>
+                  <p>
+                    {{item.text}}
+                  </p>
+                  <p>
+                    {% for link in item.links %}
+                      <a class="text-danger" href="{{link.url}}">{{link.title}}</a>
+                      {% unless forloop.last %}, {% endunless %}
+                    {% endfor %}
+                  </p>
+                </div>
               </div>
             </div>
           </div>
         </div>
       </div>
-    </div>
-  {% endfor %}
+    {% endfor %}
+  {% endif %}
 
 
   {% if page.contact %}
@@ -70,15 +72,17 @@ <h2 class="text-uppercase text-white">{{site.questions[page.lang]}}</h2>
     </div>
   {% endif %}
 
-  <div class="{% cycle 'bg-faded', '' %} py-3 py-lg-4">
-    <div class="container">
-      <div class="row">
-        <div class="col-lg-7 offset-lg-3">
-          {% include partners.html partners=page.partner-links partner-text=page.partner-text %}
+  {% if page.partner-text %}
+    <div class="{% cycle 'bg-faded', '' %} py-3 py-lg-4">
+      <div class="container">
+        <div class="row">
+          <div class="col-lg-7 offset-lg-3">
+            {% include partners.html partners=page.partner-links partner-text=page.partner-text %}
+          </div>
         </div>
       </div>
     </div>
-  </div>
+  {% endif %}
 
 </div>
 </article>
diff --git a/_uploads/logo-goteborg.png b/_uploads/logo-goteborg.png