From ec7bc435b19f50529933356ce2bbbf0c8841a187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elo=C3=AFse=20Piret?= Date: Tue, 13 Sep 2016 17:13:43 +0200 Subject: [PATCH 1/7] add img to events --- .bundle/config | 2 + .../stylesheets/includes/eventpage.scss | 8 ++++ layouts/eventpost.erb | 41 ++++++++++++------- 3 files changed, 36 insertions(+), 15 deletions(-) create mode 100644 .bundle/config diff --git a/.bundle/config b/.bundle/config new file mode 100644 index 0000000..37a9f45 --- /dev/null +++ b/.bundle/config @@ -0,0 +1,2 @@ +--- +BUNDLE_WITHOUT: "production" diff --git a/content/assets/stylesheets/includes/eventpage.scss b/content/assets/stylesheets/includes/eventpage.scss index 1aeb2e1..7eaccc2 100644 --- a/content/assets/stylesheets/includes/eventpage.scss +++ b/content/assets/stylesheets/includes/eventpage.scss @@ -11,3 +11,11 @@ height: 400px; } } + +.banner-image{ + justify-content: center; + display: flex; + img{ + height: 256px; + } +} diff --git a/layouts/eventpost.erb b/layouts/eventpost.erb index d2c748f..fe3702e 100644 --- a/layouts/eventpost.erb +++ b/layouts/eventpost.erb @@ -9,22 +9,33 @@
<%= render '/partials/_navbar.*', zeus_logo_color: :white %>
-
+
+
-

- - <%= item[:title] %> - -

-

- <%= item[:description] %> -

-

-

    -
  • <%= fa 'clock-o', li: true %><%= item[:time] %>
    • -
  • <%= fa 'globe', li: true %><%= item[:location] %>
    • -
-

+
+ +
+

+ + <%= item[:title] %> + +

+

+ <%= item[:description] %> +

+

+

    +
  • <%= fa 'clock-o', li: true %><%= item[:time] %>
    • +
  • <%= fa 'globe', li: true %><%= item[:location] %>
    • +
+

+
+ + + +
From 3bd6424aacb0ed04daf9641328004b44588ce99f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elo=C3=AFse=20Piret?= Date: Tue, 13 Sep 2016 17:28:14 +0200 Subject: [PATCH 2/7] add test-LAN event --- content/events/16-17/LAN.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 content/events/16-17/LAN.md diff --git a/content/events/16-17/LAN.md b/content/events/16-17/LAN.md new file mode 100644 index 0000000..b7bb0c5 --- /dev/null +++ b/content/events/16-17/LAN.md @@ -0,0 +1,14 @@ +--- +title: Geeks, Attack! V +banner: https://scontent.xx.fbcdn.net/v/t1.0-9/13903431_1277596932251344_3927837466166230371_n.jpg?oh=bdda0d18a635c49893a097fba6aa99b9&oe=587C7886 +description: Zeus' vijfde LAN-Party +created_at: 13-09-2016 +time: 4-11-2016 +location: Therminal, Hoveniersberg 24 9000 Gent +description: Zeus' vijfde LAN-Party +--- + +De vijfde editie van Zeus WPI's LAN-Party komt eraan! +Hou alvast de datum vrij! + +Wij houden jullie op de hoogte! From ab72313db2b9dc7b8238c0023456cfd731518da5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elo=C3=AFse=20Piret?= Date: Tue, 13 Sep 2016 18:12:52 +0200 Subject: [PATCH 3/7] generalize maps --- content/events/15-16/awk.md | 1 + content/events/16-17/LAN.md | 1 + layouts/eventpost.erb | 3 +-- lib/helpers/events.rb | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/content/events/15-16/awk.md b/content/events/15-16/awk.md index 6b93e13..5207aba 100644 --- a/content/events/15-16/awk.md +++ b/content/events/15-16/awk.md @@ -5,6 +5,7 @@ description: Een AWK-les voor AWK gerelateerde dingen created_at: 01-02-2016 time: 23-02-2016 location: Auditorium A1, Campus Sterre, Gebouw S9 +locationlink: Zeus WPI,Ghent Belgium description: Dit is een description van het awk event! --- diff --git a/content/events/16-17/LAN.md b/content/events/16-17/LAN.md index b7bb0c5..6cb52d9 100644 --- a/content/events/16-17/LAN.md +++ b/content/events/16-17/LAN.md @@ -5,6 +5,7 @@ description: Zeus' vijfde LAN-Party created_at: 13-09-2016 time: 4-11-2016 location: Therminal, Hoveniersberg 24 9000 Gent +locationlink: Therminal,Ghent Belgium description: Zeus' vijfde LAN-Party --- diff --git a/layouts/eventpost.erb b/layouts/eventpost.erb index fe3702e..d895d83 100644 --- a/layouts/eventpost.erb +++ b/layouts/eventpost.erb @@ -52,8 +52,7 @@
diff --git a/lib/helpers/events.rb b/lib/helpers/events.rb index 181806c..e278544 100644 --- a/lib/helpers/events.rb +++ b/lib/helpers/events.rb @@ -1,3 +1,4 @@ +require 'uri' module EventsHelper def all_events @items.find_all('/events/*/*') + grouped_events @@ -17,4 +18,8 @@ module EventsHelper [] end end + + def locationlink(location) + "https://www.google.com/maps/embed/v1/place?key=AIzaSyBDTmw7LtDG28o9QjCnNucAJv2zTZpLjJU&q=#{URI.escape(location)}" if location + end end From f9ec6f32c0f133dd829637f956ed9dbc453191c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elo=C3=AFse=20Piret?= Date: Tue, 13 Sep 2016 18:51:58 +0200 Subject: [PATCH 4/7] add photos to overview --- layouts/partials/_event_preview.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/partials/_event_preview.erb b/layouts/partials/_event_preview.erb index dc3f208..3b8d715 100644 --- a/layouts/partials/_event_preview.erb +++ b/layouts/partials/_event_preview.erb @@ -1,6 +1,6 @@
- +
From d15104e7678d7328c01363b0ce55462f2ee8b906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elo=C3=AFse=20Piret?= Date: Tue, 13 Sep 2016 19:26:17 +0200 Subject: [PATCH 5/7] styling events page --- content/assets/stylesheets/includes/events.scss | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/content/assets/stylesheets/includes/events.scss b/content/assets/stylesheets/includes/events.scss index 86462ab..feba55c 100644 --- a/content/assets/stylesheets/includes/events.scss +++ b/content/assets/stylesheets/includes/events.scss @@ -8,14 +8,15 @@ .box.event-preview { border-radius: 0px; display: flex; - align-items: center; + align-items: baseline; box-shadow : none; margin-bottom: 0px; + padding-left:20px // border-top: 1px solid lighten(gray, 40%); .image-holder { - border-radius: 50%; + //border-radius: 50%; padding: 10px; border: 1px solid lighten(gray, 30%); width: 15%; @@ -23,7 +24,7 @@ } .image { - border-radius: 50%; + //border-radius: 50%; vertical-align: middle; border: 1px solid gray; } From 80fd52b4e4a551904fd6ac5b70a4643883aba76d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elo=C3=AFse=20Piret?= Date: Tue, 13 Sep 2016 19:56:55 +0200 Subject: [PATCH 6/7] moar styling events page --- content/assets/stylesheets/includes/events.scss | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/content/assets/stylesheets/includes/events.scss b/content/assets/stylesheets/includes/events.scss index feba55c..32d2c17 100644 --- a/content/assets/stylesheets/includes/events.scss +++ b/content/assets/stylesheets/includes/events.scss @@ -8,16 +8,15 @@ .box.event-preview { border-radius: 0px; display: flex; - align-items: baseline; box-shadow : none; margin-bottom: 0px; - padding-left:20px + padding-left:20px; // border-top: 1px solid lighten(gray, 40%); .image-holder { //border-radius: 50%; - padding: 10px; + //padding: 10px; border: 1px solid lighten(gray, 30%); width: 15%; height: 15%; @@ -25,7 +24,7 @@ .image { //border-radius: 50%; - vertical-align: middle; + vertical-align: baseline; border: 1px solid gray; } From 4561a858c3db32054d6aa212612f001ef3c4d827 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elo=C3=AFse=20Piret?= Date: Wed, 14 Sep 2016 16:11:48 +0200 Subject: [PATCH 7/7] finish proposed styling --- content/assets/stylesheets/includes/events.scss | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/content/assets/stylesheets/includes/events.scss b/content/assets/stylesheets/includes/events.scss index 32d2c17..6fcabf2 100644 --- a/content/assets/stylesheets/includes/events.scss +++ b/content/assets/stylesheets/includes/events.scss @@ -9,14 +9,15 @@ border-radius: 0px; display: flex; box-shadow : none; - margin-bottom: 0px; - padding-left:20px; + margin: 0px; + padding:20px; + padding-top:0px; // border-top: 1px solid lighten(gray, 40%); .image-holder { //border-radius: 50%; - //padding: 10px; + padding: 10px; border: 1px solid lighten(gray, 30%); width: 15%; height: 15%; @@ -29,7 +30,8 @@ } .info { - margin: 1.5em; + padding:20px; + padding-top:0px; box-shadow : none; width: 60%;