Korrigera bilder i projekt

civictechsweden · Apr 18, 2019 · ef53df1 · ef53df1
1 parent 7fcad78
commit ef53df1
Show file tree

Hide file tree

Showing 25 changed files with 155 additions and 52 deletions.
diff --git a/_config.yml b/_config.yml
@@ -52,6 +52,7 @@ defaults:
     path: ''
     type: posts
   values:
+    is_post: true
     layout: page
     lang: sv
     ref:
@@ -75,6 +76,7 @@ defaults:
     layout: event
     lang: sv
     ref:
+    group:
     image:
     excerpt:
     ingress-text:
@@ -95,6 +97,7 @@ t:
     event-title: Event
     more-events: Fler event
     project-title: Projekt
+    project-chat: Chatta om projektet
     more-projects: Fler projekt
     project-events: Deltar i
     participating-projects: Deltagande projekt
@@ -109,6 +112,7 @@ t:
     event-title: Events
     more-events: More events
     project-title: Projects
+    project-chat: Chat about the project
     more-projects: More projects
     project-events: Participating in
     participating-projects: Participating projects

diff --git a/_events/hackathon-3-en.md b/_events/hackathon-3-en.md
@@ -15,7 +15,7 @@ place: Goto10, Stockholm, Sweden
 #  url: "/en/form/register/"
 #  style: button
 #- title: Join the chat!
-#  url: "https://chat.civictech.se/channel/general"
+#  url: "https://chat.civictech.se/"
 ---
 ## CivicTechSweden's hackathons
 Civic tech is about creating technical solutions for the good of society. All around the world there are civic tech communities taking on challenges in society and offering their time and knowledge to solve them. We want a community like that to be strong in Sweden as well! We want to gather coders, designers, activists and anyone who thinks civic tech sounds exciting and important in this hackathon and our future hackathons.

diff --git a/_events/hackathon-3.md b/_events/hackathon-3.md
@@ -16,7 +16,7 @@ place: Goto10, Stockholm
 #  url: "/form/register/"
 #  style: button
 #- title: Gå med i chatten
-#  url: "https://chat.civictech.se/channel/general"
+#  url: "https://chat.civictech.se/"
 ---
 
 ## CivicTechSweden's hackathon

diff --git a/_events/meetup-1-en.md b/_events/meetup-1-en.md
@@ -11,7 +11,7 @@ event-date-desc: March 2nd 2019, 13-16
 place: Kollaboratoriet, Östra Ågatan 19, Uppsala
 links:
 - title: Join the chat
-  url: "https://chat.civictech.se/channel/general"
+  url: "https://chat.civictech.se/"
 #- title: Register here!
 #  url: "/en/form/meetupregister/"
 #  style: button

diff --git a/_events/meetup-1.md b/_events/meetup-1.md
@@ -10,7 +10,7 @@ event-date-desc: 2 mars 2019, kl 13-16
 place: Kollaboratoriet, Östra Ågatan 19, Uppsala
 links:
 - title: Gå med i chatten
-  url: "https://chat.civictech.se/channel/general"
+  url: "https://chat.civictech.se/"
 #- title: Anmäl dig här!
 #  url: "/form/meetupregister"
 #  style: button

diff --git a/_events/meetup-2-en.md b/_events/meetup-2-en.md
@@ -11,7 +11,7 @@ event-date-desc: March 21st 2019, 18-20
 place: Capsule Coworking, Smedsgränd 4, Uppsala
 links:
 - title: Join the chat
-  url: "https://chat.civictech.se/channel/general"
+  url: "https://chat.civictech.se/"
 - title: Register here!
   url: "/en/form/code-with-us-register/"
   style: button

diff --git a/_events/meetup-2.md b/_events/meetup-2.md
@@ -10,7 +10,7 @@ event-date-desc: 21 mars 2019, kl 18-20
 place: Capsule Coworking, Smedsgränd 4, Uppsala
 links:
 - title: Gå med i chatten
-  url: "https://chat.civictech.se/channel/general"
+  url: "https://chat.civictech.se/"
 - title: Anmäl dig här!
   url: "/form/code-with-us-register"
   style: button

diff --git a/_events/meetup-3-en.md b/_events/meetup-3-en.md
@@ -11,7 +11,7 @@ event-date-desc: March 24th 2019, 13-16
 place: House Blivande, Södra Hamnvägen 9, Stockholm
 links:
 - title: Join the chat
-  url: "https://chat.civictech.se/channel/general"
+  url: "https://chat.civictech.se/"
 - title: Register here!
   url: "/en/form/integrity-register/"
   style: button

diff --git a/_events/meetup-3.md b/_events/meetup-3.md
@@ -10,7 +10,7 @@ event-date-desc: 24 mars 2019, kl 13-16
 place: Blivande, Södra Hamnvägen 9, Stockholm
 links:
 - title: Gå med i chatten
-  url: "https://chat.civictech.se/channel/general"
+  url: "https://chat.civictech.se/"
 - title: Anmäl dig här!
   url: "/form/integrity-register"
   style: button

diff --git a/_events/meetup-4-en.md b/_events/meetup-4-en.md
@@ -11,7 +11,7 @@ place: Goto10, Hammarby Kaj 10D, Stockholm
 group: stockholm
 links:
 - title: Join the chat
-  url: "https://chat.civictech.se/channel/general"
+  url: "https://chat.civictech.se/"
 #- title: Register here!
 #  url: "/en/form/integrity-register/"
 #  style: button

diff --git a/_events/meetup-4.md b/_events/meetup-4.md
@@ -10,7 +10,7 @@ place: Goto10, Hammarby Kaj 10D, Stockholm
 group: stockholm
 links:
 - title: Gå med i chatten
-  url: "https://chat.civictech.se/channel/general"
+  url: "https://chat.civictech.se/"
 #- title: Anmäl dig här!
 #  url: "/form/integrity-register"
 #  style: button

diff --git a/_includes/header-project.html b/_includes/header-project.html
@@ -0,0 +1,27 @@
+<section class="hero is-info hero-cts is-small hero-project" >
+  <!-- Hero head: will stick at the top -->
+  <div class="hero-head">
+    <nav class="navbar">
+      <div class="container">
+        <div class="navbar-brand">
+          <a class="navbar-item" href="{{site.baseurl}}{% if page.lang == 'sv'%}/{% else %}/en{% endif %}">
+            <img src="{{site.baseurl}}/assets/images/cts-logo-h.svg" alt="Logo">
+          </a>
+          <span class="navbar-burger burger" data-target="navbarMenuHeroA">
+            <span></span>
+            <span></span>
+            <span></span>
+          </span>
+        </div>
+				{% include menu.html %}
+      </div>
+    </nav>
+  </div>
+
+  <!-- Hero content: will be in the middle -->
+  <div class="hero-body has-text-centered">
+    {% if page.image %}
+      <img src="{{site.baseurl}}{{page.image}}" alt="">
+    {% endif %}
+  </div>
+</section>
diff --git a/_includes/projects.html b/_includes/projects.html
@@ -11,7 +11,9 @@ <h3 class="title has-text-centered"><a href="{{site.baseurl}}{{post.url}}">{{pos
     </div>
     <div class="card-footer">
       {% if post.chat %}
-        <a class="card-footer-item left" href="https://chat.civictech.se/{{post.chat}}"><span class="icon is-medium"><i class="fab fa-rocketchat fa-2x"></i></span></a>
+        <a class="card-footer-item left has-text-weight-bold" href="https://chat.civictech.se/">
+          <span class="icon is-medium"><i class="fab fa-rocketchat fa-lg"></i></span>#{{post.chat}}
+        </a>
       {% endif %}
       <a class="card-footer-item right" href="{{site.baseurl}}{{post.url}}"><img src="{{site.baseurl}}/assets/images/pil.svg" alt="Läs mer"></a>
     </div>

diff --git a/_layouts/global.html b/_layouts/global.html
@@ -2,7 +2,11 @@
 layout: default
 ---
 
-{% include header.html %}
+{% if page.is_post %}
+  {% include header-project.html %}
+{% else %}
+  {% include header.html %}
+{% endif %}
 
 {{content}}
 

diff --git a/_layouts/page.html b/_layouts/page.html
@@ -25,8 +25,17 @@ <h2 class="title is-6">
       <div class="column is-three-quarters-tablet is-half-desktop">
         <div class="content">
           {{content}}
+
+          {% if page.chat %}
+            <h3>{{site.t[page.lang].project-chat}}</h3>
+            <a href="https://chat.civictech.se/">
+              <span class="icon is-medium"><i class="fab fa-rocketchat fa-lg"></i></span>#{{page.chat}}
+            </a>
+          {% endif %}
         </div>
 
+
+
         <!-- Contact -->
         {% if page.contact %}
           {% for item in page.contact %}

diff --git a/_posts/2018-08-08-cloudcoop-en.md b/_posts/2018-08-08-cloudcoop-en.md
@@ -13,6 +13,7 @@ tags:
 - Discussion
 lang: en
 ref: cloudcoop
+chat: cloudcoop
 excerpt: Free cloud services for social movements.
 ingress-text: Free cloud services for social movements.
 image: "/uploads/cloud.jpg"

diff --git a/_posts/2018-08-14-transparencydinriksdag-en.markdown b/_posts/2018-08-14-transparencydinriksdag-en.markdown
@@ -10,6 +10,7 @@ tags:
 - stockholm
 lang: en
 ref: Dinriksdag
+chat: dinriksdag
 excerpt: Visualise the governments documents and take Swedens work with open data
   to the next level
 ingress-text: Visualise the governments documents and take Swedens work with open

diff --git a/_posts/2018-08-14-transparensdinriksdag.markdown b/_posts/2018-08-14-transparensdinriksdag.markdown
@@ -9,6 +9,7 @@ tags:
 - demokrati
 - stockholm
 ref: Dinriksdag
+chat: dinriksdag
 excerpt: Visualisera regeringens arbete och ta Sveriges arbete med öppen data till
   nästa nivå
 ingress-text: Visualisera regeringens arbete och ta Sveriges arbete med öppen data

diff --git a/_posts/2018-12-13-mdgh-en.md b/_posts/2018-12-13-mdgh-en.md
@@ -10,6 +10,7 @@ tags:
 - Discussion
 ref: vemagerstaden
 lang: en
+chat: mdgh
 links:
 #- title: Chat about the project
 #  url: https://chat.civictech.se/channel/mdgh

diff --git a/_posts/2018-12-13-mdgh.md b/_posts/2018-12-13-mdgh.md
@@ -9,6 +9,7 @@ tags:
 - Design
 - Discussion
 ref: vemagerstaden
+chat: mdgh
 links:
 #- title: Chatta om projektet
 #  url: https://chat.civictech.se/channel/mdgh

diff --git a/_posts/2018-12-21-mangfaldsdata-en.md b/_posts/2018-12-21-mangfaldsdata-en.md
@@ -10,6 +10,7 @@ tags:
 - Discussion
 ref: mangfaldsdata
 lang: en
+chat: mangfaldsdata
 links:
 #- title: Chat about the project
 #  url: https://chat.civictech.se/channel/mangfaldsdata

diff --git a/_posts/2018-12-21-mangfaldsdata.md b/_posts/2018-12-21-mangfaldsdata.md
@@ -9,6 +9,7 @@ tags:
 - Design
 - Discussion
 ref: mangfaldsdata
+chat: mangfaldsdata
 links:
 #- title: Chatta om projektet!
 #  url: https://chat.civictech.se/channel/mangfaldsdata

diff --git a/_posts/2018-12-22-handlingar-en.md b/_posts/2018-12-22-handlingar-en.md
@@ -9,6 +9,7 @@ tags:
 - Design
 - Discussion
 ref: handlingar
+chat: 'handlingar.se'
 lang: en
 links:
 #- title: Chat about the project