Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add collaborators & Event section #10

Merged
merged 20 commits into from
May 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,5 @@ $RECYCLE.BIN/
*.msp
*.lnk
_site/feed.xml

.idea/
13 changes: 12 additions & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,15 @@ address:

# Build settings
markdown: kramdown
permalink: pretty
permalink: pretty

collections:
events:
output: true

defaults:
- scope:
path: ""
type: "events"
values:
layout: "event"
78 changes: 63 additions & 15 deletions _data/collaborators.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,73 @@
logos:
- name: "UNIDO"
logo: unido-logo.png
url: "https://www.unido.org/"
- name: "Space10"
logo: space10-logo.png
url: "https://space10.io/"
- name: "Fab Lab BCN"
logo: iaac.png
url: "https://fablabbcn.org/"
- name: "P2P Lab"
logo: P2P-Lab-Logo1.png
url: "http://www.p2plab.gr/en/"
- name: "CBA"
logo: logoCBA.jpg
url: "http://cba.mit.edu/"
- name: "Fab Foundation"
logo: fabfoundation2.png
url: "http://fabfoundation.org/"
- name: "Dansk Design Center"
logo: ddc-logo.png
url: "https://danskdesigncenter.dk/"
- name: "Paris City Council"
logo: paris-logo.png
url: "https://www.paris.fr/"
- name: "UNIDO"
logo: unido-logo.png
url: "https://www.unido.org/"
- name: "Barcelona City Council"
logo: ajuntament-barcelona.svg
logo: ajuntament-barcelona.png
url: "https://ajuntament.barcelona.cat/ca/"
- name: "Dansk Design Center"
logo: ddc-logo.png
url: "https://danskdesigncenter.dk/"
- name: "Fab Foundation"
logo: fabfoundation.svg
url: "http://fabfoundation.org/"
- name: "Fab City Grand Paris"
logo: fabcity-grandparis.png
url: "http://fabcity.paris/en/home/"
- name: "Fab Lab Santiago"
logo: fablab-santiago.png
url: "http://fablabsantiago.org/"
- name: "Materiom"
logo: materiom.png
url: "https://materiom.org/"
- name: "Metabolic"
logo: metabolic_logo.png
url: "https://www.metabolic.nl/"
- name: "Pakhuis de Zwijger"
logo: pakhuis-de-zwijger-logo.jpg
url: "https://dezwijger.nl/"
- name: "Machines Room"
logo: machinesroom.jpg
url: "https://machinesroom.co.uk/"
- name: "Under Broen"
logo: under-broen.png
url: "http://underbroen.com/"
- name: "Polifactory"
logo: polifactory.png
url: "http://www.polifactory.polimi.it/"
- name: "Waag"
logo: waag-logo.png
url: "https://waag.org/en/home"
logo: waag-logo.png
url: "https://waag.org/en/home"
- name: "Communautique"
logo: communautique.jpg
url: "https://www.communautique.quebec/"
- name: "Space10"
logo: space10-logo.png
url: "https://space10.io/"
- name: "Copenhagen Maker"
logo: maker.png
url: "http://www.copenhagenmaker.com/"
- name: "Seeed"
logo: seeed-logo.png
url: "https://www.seeedstudio.com/"
- name: "Szoil"
logo: SZOIL-logo.png
url: "https://www.szoil.org/"
- name: "Seoul Innovation Park"
logo: seoul-logo.png
url: "https://en.innovationpark.xyz/"
- name: "Urbanization"
logo: urbanization-logo.png
url: "http://urbanization.org/"
30 changes: 30 additions & 0 deletions _data/events-old.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
id: "events"
orientation: inverted
sectioncolor: 'red'
hascolorbg: true
image: 'uploads/events.jpg'
imgwidth: '428'
imgheight: '358'
haslargetitle: false
largetitle: ''
hassmalltitle: true
smalltitle: 'Events'
hasdescription: true
description: "Local and global Fab City events are hosted the world over. Find a local event or host one."
hasbutton: true
buttonaction: "Fab City"
buttontitle: "Summit"
buttonlink: "https://summit.fabcity.paris/"
hasdownload: false
filename:
haslogos: false
logostitle:
logos:
- name: ""
logo: ''
url: ""
hasextraaction: false
extraaction: ''
extraactionlink: ''
hasdivisionline: false
hasleftcolorblock: false
53 changes: 23 additions & 30 deletions _data/events.yml
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,30 +1,23 @@
id: "events"
orientation: inverted
sectioncolor: 'red'
hascolorbg: true
image: 'uploads/events.jpg'
imgwidth: '428'
imgheight: '358'
haslargetitle: false
largetitle: ''
hassmalltitle: true
smalltitle: 'Events'
hasdescription: true
description: "Local and global Fab City events are hosted the world over. Find a local event or host one."
hasbutton: true
buttonaction: "Fab City"
buttontitle: "Summit"
buttonlink: "https://summit.fabcity.paris/"
hasdownload: false
filename:
haslogos: false
logostitle:
logos:
- name: ""
logo: ''
url: ""
hasextraaction: false
extraaction: ''
extraactionlink: ''
hasdivisionline: false
hasleftcolorblock: false
- title: Fab City Campus at 5th Fab Asia Network Conference
location: Seoul City
start_date: "06"
end_date: "11"
month: May
year: 2019
url: "https://www.fan5.kr/"
- title: Fab City Summit at We Make The City
location: Amsterdam Metropolian Region
start_date: "20"
end_date: "21"
month: June
year: 2019
url: "https://wemakethe.city/en/"
- title: Fab City Track at Fab15 - El Gouna
location: El Gouna, Red Sea
start_date: "28"
end_date: "02"
month: July - August
year: 2019
url: "http://fab15.fabevent.org/"


Loading