Merge remote-tracking branch 'origin/master' into old-boards
# Conflicts: # content/about/contact.erb
This commit is contained in:
commit
3ce3f15dc6
7 changed files with 187 additions and 172 deletions
|
|
@ -13,7 +13,7 @@ narrow_page: true
|
|||
|
||||
<p>
|
||||
We organize various tech related talks by experts (eg. professors, PhD's, Richard Stallman, Julia Reda, ...), hands-on coding events and introductory lectures for cool technologies.
|
||||
Together we build interesting applications for Ghent University students (<a href='https://hydra.ugent.be/'>Hydra</a>), for <a href='http://www.fkgent.be/'>FaculteitenKonvent</a> and <a href='https://12urenloop.be/'>12Urenloop</a>, and ofcourse for ourselves.
|
||||
Together we build interesting applications for Ghent University students (<a href='https://hydra.ugent.be/'>Hydra</a>), for <a href='http://www.fkgent.be/'>FaculteitenKonvent</a> and <a href='https://12urenloop.be/'>12urenloop</a>, and ofcourse for ourselves.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
|
|
@ -34,37 +34,6 @@ narrow_page: true
|
|||
Mail us all at: <a href='mailto:bestuur@zeus.ugent.be'>bestuur@zeus.ugent.be</a>
|
||||
</blockquote>
|
||||
|
||||
<table class="table board-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Function</th>
|
||||
<th>Name</th>
|
||||
<th>E-mail</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<% current_bestuur.each do |lid| %>
|
||||
<tr>
|
||||
<td>
|
||||
<%= lid[:rol] %>
|
||||
</td>
|
||||
<td>
|
||||
<%= lid[:naam] %>
|
||||
</td>
|
||||
<td>
|
||||
<%= lid[:mail] %>
|
||||
</td>
|
||||
<td>
|
||||
<% if lid[:mail] %>
|
||||
<a href="mailto:<%= lid[:mail] %>">
|
||||
<%= fa :envelope %>
|
||||
</a>
|
||||
<% end %>
|
||||
</td>
|
||||
</tr>
|
||||
<% end %>
|
||||
</tbody>
|
||||
</table>
|
||||
<%= render '/partials/_current_bestuur.*' %>
|
||||
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,135 +0,0 @@
|
|||
---
|
||||
narrow_page: true
|
||||
icon_size: 2x
|
||||
contact_links:
|
||||
- icon: facebook
|
||||
link: https://www.facebook.com/zeus.wpi/
|
||||
description: Facebook
|
||||
action: Like us
|
||||
- icon: envelope
|
||||
link: ../about#board
|
||||
description: Email
|
||||
action: Mail us
|
||||
- icon: twitter
|
||||
link: https://twitter.com/zeuswpi
|
||||
description: Twitter
|
||||
action: Follow us
|
||||
- icon: comments
|
||||
link: https://mattermost.zeus.gent/
|
||||
description: Mattermost
|
||||
action: Message us
|
||||
- icon: inbox
|
||||
link: http://lists.zeus.ugent.be/mailman/listinfo/leden
|
||||
description: Mailinglist
|
||||
action: Keep up to date
|
||||
- icon: github
|
||||
link: https://github.com/ZeusWPI/
|
||||
description: GitHub
|
||||
action: Fork us
|
||||
- icon: phone
|
||||
link: 'tel:+3292644751'
|
||||
description: Phone
|
||||
action: Call us
|
||||
---
|
||||
|
||||
<% content_for :head do %>
|
||||
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.3.4/dist/leaflet.css" />
|
||||
<script src="https://unpkg.com/leaflet@1.3.4/dist/leaflet.js"></script>
|
||||
<% end %>
|
||||
|
||||
<%= render '/partials/_about_sub_navbar.*', selected: 'contact' %>
|
||||
<h1 class='title is-1 has-text-centered'>Contact us</h1>
|
||||
<h2 class='subtitle is-4 has-text-centered has-text-weight-light'>bleep bloop</h2>
|
||||
|
||||
<!-- Contact buttons -->
|
||||
<ul id='contact-icons' class='columns is-centered is-multiline'>
|
||||
<% @item[:contact_links].each do |option| %>
|
||||
<div class='column is-one-quarter-desktop is-one-third-tablet is-half-mobile'>
|
||||
<div id='<%= option[:description] %>' class='contact-circle-option'>
|
||||
<a href='<%= option[:link] %>' class='contact-circle-wrapper'>
|
||||
<div class='contact-circle is-centered'>
|
||||
<div class='contact-circle-pulse grow'></div>
|
||||
<%= fa option[:icon], size: @item[:icon_size], class: 'grow-large' %>
|
||||
</div>
|
||||
</a>
|
||||
<h4 class='contact-description is-uppercase'><%= option[:description] %></h4>
|
||||
<p class='has-text-centered'>
|
||||
<a href='<%= option[:link] %>' class='contact-text-link is-link'><%= option[:action] %></a>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<% end %>
|
||||
</ul>
|
||||
|
||||
<!-- Extra information tiles -->
|
||||
<div id='contact-info' class='tile is-ancestor is-vertical'>
|
||||
<div class='tile is-parent'>
|
||||
<div class='tile is-parent is-vertical'>
|
||||
|
||||
<!-- Payment information -->
|
||||
<div id='payment-info' class='tile is-child box content has-text-centered'>
|
||||
<h1 class='title has-text-centered'>Pay us</h1>
|
||||
<div class='is-divider'></div>
|
||||
<p id='banknumber' class='is-size-5'>
|
||||
BE32 9799 9370 6502
|
||||
</p>
|
||||
<p class='is-size-5'>
|
||||
<b>Please include your Tab name in the description of the transaction</b>
|
||||
</p>
|
||||
<a class='button' href='https://zeus.ugent.be/tab/'>
|
||||
<%= fa :euro, fw: true %> Use Tab
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<!-- Calling information -->
|
||||
<div id='calling-info' class='tile is-child box content has-text-centered'>
|
||||
<h1 class='title has-text-centered'>Call us</h1>
|
||||
<div class='is-divider'></div>
|
||||
<p id='phone-number' class='is-size-5'>
|
||||
+32 9 264 47 51<br/>
|
||||
Intern: 4751
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Address information -->
|
||||
<div id='address-info' class='tile is-parent'>
|
||||
<div class='tile is-child box content'>
|
||||
<h1 class='title has-text-centered'>Find us</h1>
|
||||
<div class='is-divider'></div>
|
||||
<p class='is-size-5'>
|
||||
You can find our hiding place, or what we call <strong>'de kelder'</strong> at the basement level of following address:
|
||||
</p>
|
||||
<blockquote id='address' class='is-size-5'>
|
||||
Krijgslaan 281<br/>
|
||||
Campus Sterre S9<br/>
|
||||
9000 Gent<br/>
|
||||
</blockquote>
|
||||
<div id='contact-location-buttons'>
|
||||
<a class='button' href='https://www.google.com/maps/place/Zeus+WPI/@51.023115,3.7103,17z/data=!4m5!3m4!1s0x0:0x49fd54f81cafeb5f!8m2!3d51.0231149!4d3.7103?hl=en-US'>
|
||||
<%= fa :'map-marker', fw: true %> Google Maps
|
||||
</a>
|
||||
<a class='button' href='https://soleway.ugent.be/routes/4370'>
|
||||
<%= fa :'map-signs', fw: true %> Soleway
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Mattermost information -->
|
||||
<div id='mattermost-info' class='tile is-parent'>
|
||||
<div class='tile is-child box content'>
|
||||
<h1 class='title has-text-centered'>Mattermost info</h1>
|
||||
<div class='is-divider'></div>
|
||||
<p id='mattermost-info-text' class='is-size-5'>
|
||||
You can register with any valid email address.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Embedded Google Maps -->
|
||||
<div class="map-wrapper box">
|
||||
<%= render '/partials/_map.erb', location: "Zeus WPI" %>
|
||||
</div>
|
||||
|
|
@ -13,4 +13,4 @@ De codenights zijn ook een ideaal moment om Zeus te leren kennen! Er zal wel alt
|
|||
|
||||
De codenights gaan officieel van start op **Dinsdag 3 juli 17:00**, en gaan de hele zomervakantie door op dinsdagen (uitgezonderd op dinsdag 17 juli, tijdens de Gentse Feesten). Deze blogpost zal een update krijgen indien er een codenight niet door gaat, en bekijk zeker onze [Slack](https://zeuswpi.slack.com/) in de #zeus en #codenight kanalen.
|
||||
|
||||
Alle codenights gaan door in de [Zeus kelder](/about/contact/)!
|
||||
Alle codenights gaan door in de [Zeus kelder](/contact/)!
|
||||
|
|
|
|||
|
|
@ -78,5 +78,5 @@ title: Cammie
|
|||
Send to kelder
|
||||
</a>
|
||||
</div>
|
||||
<div>
|
||||
</div>
|
||||
</section>
|
||||
|
|
|
|||
150
content/contact.erb
Normal file
150
content/contact.erb
Normal file
|
|
@ -0,0 +1,150 @@
|
|||
---
|
||||
navigable: true
|
||||
title: Contact
|
||||
order: 10
|
||||
narrow_page: true
|
||||
icon_size: 2x
|
||||
contact_links:
|
||||
- icon: facebook
|
||||
link: https://www.facebook.com/zeus.wpi/
|
||||
description: Facebook
|
||||
action: Like us
|
||||
- icon: envelope
|
||||
link: ../contact#board
|
||||
description: Email
|
||||
action: Mail us
|
||||
- icon: twitter
|
||||
link: https://twitter.com/zeuswpi
|
||||
description: Twitter
|
||||
action: Follow us
|
||||
- icon: comments
|
||||
link: https://mattermost.zeus.gent/
|
||||
description: Mattermost
|
||||
action: Message us
|
||||
- icon: inbox
|
||||
link: http://lists.zeus.ugent.be/mailman/listinfo/leden
|
||||
description: Mailinglist
|
||||
action: Keep up to date
|
||||
- icon: github
|
||||
link: https://github.com/ZeusWPI/
|
||||
description: GitHub
|
||||
action: Fork us
|
||||
- icon: phone
|
||||
link: 'tel:+3292644751'
|
||||
description: Phone
|
||||
action: Call us
|
||||
---
|
||||
|
||||
<% content_for :head do %>
|
||||
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.3.4/dist/leaflet.css" />
|
||||
<script src="https://unpkg.com/leaflet@1.3.4/dist/leaflet.js"></script>
|
||||
<script src="https://unpkg.com/leaflet@1.3.4/dist/leaflet.js"></script>
|
||||
<% end %>
|
||||
|
||||
|
||||
<div class="content">
|
||||
<h1 class='title is-1 has-text-centered'>Contact us</h1>
|
||||
<h2 class='subtitle is-4 has-text-centered has-text-weight-light'>bleep bloop</h2>
|
||||
|
||||
<!-- Contact buttons -->
|
||||
<ul id='contact-icons' class='columns is-centered is-multiline'>
|
||||
<% @item[:contact_links].each do |option| %>
|
||||
<li id='<%= option[:description] %>' class='contact-circle-option column is-one-quarter-desktop is-one-third-tablet is-half-mobile'>
|
||||
<a href='<%= option[:link] %>' class='contact-circle-wrapper'>
|
||||
<div class='contact-circle is-centered'>
|
||||
<div class='contact-circle-pulse grow'></div>
|
||||
<%= fa option[:icon], size: @item[:icon_size], class: 'grow-large' %>
|
||||
</div>
|
||||
</a>
|
||||
<h4 class='contact-description is-uppercase'><%= option[:description] %></h4>
|
||||
<p class='has-text-centered'>
|
||||
<a href='<%= option[:link] %>' class='contact-text-link is-link'><%= option[:action] %></a>
|
||||
</p>
|
||||
</li>
|
||||
<% end %>
|
||||
</ul>
|
||||
|
||||
<div id="board">
|
||||
<h2>The board (<%= pretty_year @config[:academic_year] %>)</h2>
|
||||
<blockquote>
|
||||
Mail us all at: <a href='mailto:bestuur@zeus.ugent.be'>bestuur@zeus.ugent.be</a>
|
||||
</blockquote>
|
||||
|
||||
<%= render '/partials/_current_bestuur.*' %>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- Extra information tiles -->
|
||||
<h2>Varia</h2>
|
||||
<div id='contact-info' class='tile is-ancestor is-vertical'>
|
||||
<div class='tile is-parent'>
|
||||
<div class='tile is-parent is-vertical'>
|
||||
|
||||
<!-- Payment information -->
|
||||
<div id='payment-info' class='tile is-child box content has-text-centered'>
|
||||
<h1 class='title has-text-centered'>Pay us</h1>
|
||||
<div class='is-divider'></div>
|
||||
<p id='banknumber' class='is-size-5'>
|
||||
BE32 9799 9370 6502
|
||||
</p>
|
||||
<p class='is-size-5'>
|
||||
<b>Please include your Tab name in the description of the transaction</b>
|
||||
</p>
|
||||
<a class='button' href='https://zeus.ugent.be/tab/'>
|
||||
<%= fa :euro, fw: true %> Use Tab
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<!-- Calling information -->
|
||||
<div id='calling-info' class='tile is-child box content has-text-centered'>
|
||||
<h1 class='title has-text-centered'>Call us</h1>
|
||||
<div class='is-divider'></div>
|
||||
<p id='phone-number' class='is-size-5'>
|
||||
+32 9 264 47 51<br/>
|
||||
Intern: 4751
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Address information -->
|
||||
<div id='address-info' class='tile is-parent'>
|
||||
<div class='tile is-child box content'>
|
||||
<h1 class='title has-text-centered'>Find us</h1>
|
||||
<div class='is-divider'></div>
|
||||
<p class='is-size-5'>
|
||||
You can find our hiding place, or what we call <strong>'de kelder'</strong> at the basement level of following address:
|
||||
</p>
|
||||
<blockquote id='address' class='is-size-5'>
|
||||
Krijgslaan 281<br/>
|
||||
Campus Sterre S9<br/>
|
||||
9000 Gent<br/>
|
||||
</blockquote>
|
||||
<div id='contact-location-buttons'>
|
||||
<a class='button' href='https://www.google.com/maps/place/Zeus+WPI/@51.023115,3.7103,17z/data=!4m5!3m4!1s0x0:0x49fd54f81cafeb5f!8m2!3d51.0231149!4d3.7103?hl=en-US'>
|
||||
<%= fa :'map-marker', fw: true %> Google Maps
|
||||
</a>
|
||||
<a class='button' href='https://soleway.ugent.be/routes/4370'>
|
||||
<%= fa :'map-signs', fw: true %> Soleway
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Mattermost information -->
|
||||
<div id='mattermost-info' class='tile is-parent'>
|
||||
<div class='tile is-child box content'>
|
||||
<h1 class='title has-text-centered'>Mattermost info</h1>
|
||||
<div class='is-divider'></div>
|
||||
<p id='mattermost-info-text' class='is-size-5'>
|
||||
You can register with any valid email address.
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Embedded Google Maps -->
|
||||
<div class="map-wrapper box">
|
||||
<%= render '/partials/_map.erb', location: "Zeus WPI" %>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
<div class="subnav tabs">
|
||||
<ul>
|
||||
<li class="<%= 'is-active' if @selected == 'about'%>"><a href="/about/about">About</a></li>
|
||||
<li class="<%= 'is-active' if @selected == 'contact'%>"><a href="/about/contact">Contact</a></li>
|
||||
<li class="<%= 'is-active' if @selected == 'about'%>"><a href="/about/about">Zeus WPI</a></li>
|
||||
<li class="<%= 'is-active' if @selected == 'statuten'%>"><a href="/about/statuten">Statuten</a></li>
|
||||
<li class="<%= 'is-active' if @selected == 'historiek'%>"><a href="/about/historiek">Historiek</a></li>
|
||||
<li class="<%= 'is-active' if @selected == 'oud-bestuur'%>"><a href="/about/oud-bestuur">Oud-bestuur</a></li>
|
||||
|
|
|
|||
32
layouts/partials/_current_bestuur.erb
Normal file
32
layouts/partials/_current_bestuur.erb
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
<table class="table board-table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Function</th>
|
||||
<th>Name</th>
|
||||
<th>E-mail</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<% current_bestuur.each do |lid| %>
|
||||
<tr>
|
||||
<td>
|
||||
<%= lid[:rol] %>
|
||||
</td>
|
||||
<td>
|
||||
<%= lid[:naam] %>
|
||||
</td>
|
||||
<td>
|
||||
<%= lid[:mail] %>
|
||||
</td>
|
||||
<td>
|
||||
<% if lid[:mail] %>
|
||||
<a href="mailto:<%= lid[:mail] %>">
|
||||
<%= fa :envelope %>
|
||||
</a>
|
||||
<% end %>
|
||||
</td>
|
||||
</tr>
|
||||
<% end %>
|
||||
</tbody>
|
||||
</table>
|
||||
Loading…
Reference in a new issue