From 93d9f79221bb23f30dd306aea7dec8fd357774de Mon Sep 17 00:00:00 2001 From: Wout Schellaert Date: Tue, 10 Oct 2017 16:17:33 +0200 Subject: [PATCH 1/6] Add a different intro text --- content/about.erb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/content/about.erb b/content/about.erb index 23ffaf4..1df21f1 100644 --- a/content/about.erb +++ b/content/about.erb @@ -5,19 +5,25 @@ order: 0 narrow_page: true --- <%= render '/partials/_about_sub_navbar.*', selected: 'about' %> -

Over Zeus WPI

+

About Zeus WPI

- Zeus WPI is de werkgroep informatica van de Universiteit Gent. Oorspronkelijk stond WPI voor Werkgroep Publieke Informatica en hostten wij de eerste mailserver van de UGent. + Zeus WPI is the student association for Computer Science at Ghent University. + Our goal is to provide a stimulating environment for motivated students looking to expand their skills by engaging in interesting real-world projects.

- Wij zijn studenten die het gebruik van Free and Open Source Software (FOSS) promoten, lessen geven over nuttige software als LaTeX en introducties geven tot programmeertalen zoals Python, Ruby of Rust. Daarnaast bieden we ook enkele diensten aan zoals shell-accounts, web-hosting, git-repositories, enz. Doorheen het academiejaar engageren we ons ook in verschillende projecten, zo zijn we sinds enkele jaren verantwoordelijk voor het telsysteem van de 12urenloop of ondersteunen we het FaculteitenKonvent bij ICT-projecten. + We organize various tech related talks by experts (eg. professors, PhD's, Richard Stallman, Julia Roberts, ...), hands-on coding events and introductory lectures for cool technologies. + Together we build interesting applications for Ghent University students (Hydra), for FaculteitenKonvent and 12Urenloop, and ofcourse for ourselves.

- Iedereen is welkom bij Zeus WPI, ook al studeer je geen informatica. Het enige wat je nodig hebt is een gezonde dosis interesse en een beetje geeky aanleg. + Be sure to check out the project-page! +

+ +

+ Everybody is welcom at Zeus WPI, even if you don't study computer science. The only requirement is a healthy dose of motivation and some (toleration for) geekyness.

Het bestuur

From 597afe9ed72fb7b90c839ad2b069a41b8a7bf242 Mon Sep 17 00:00:00 2001 From: Wout Schellaert Date: Tue, 10 Oct 2017 16:31:42 +0200 Subject: [PATCH 2/6] More english --- content/about.erb | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/content/about.erb b/content/about.erb index 1df21f1..c613831 100644 --- a/content/about.erb +++ b/content/about.erb @@ -26,18 +26,18 @@ narrow_page: true Everybody is welcom at Zeus WPI, even if you don't study computer science. The only requirement is a healthy dose of motivation and some (toleration for) geekyness.

-

Het bestuur

+

The board

- Het bestuur zorgt ervoor dat alle wieltjes blijven draaien en organiseert regelmatig activiteiten voor de leden. - Het bestuur voor het academiejaar <%= pretty_year @config[:academic_year] %> van Zeus WPI is: + The board is the oil in the machine and is the driving force behind the organization of events and projects. + The Zeus WPI board for the <%= pretty_year @config[:academic_year] %> academic year is:

- - + + @@ -64,44 +64,44 @@ narrow_page: true
FunctieNaamFunctionName E-mail
-

Zeus waar? Zeus daar!

+

Contact

- Zeus WPI heeft een lokaal in de kelder van gebouw S9 op campus de Sterre, die door de leden liefkozend “de kelder” genoemd wordt. Daar staat het volledige computerpark van Zeus WPI. + Zeus WPI is located in the basement of the S9 building on Campus Sterre, by it's members often named “de kelder”.

-

Zeus bereik je zo:

+

Reach us:

  • - kom naar de kelder en spring eens binnen (ons vinden doe je hier). + come to “de kelder” and say hi! (find us here).
  • - stuur een mailtje naar het bestuur + mail the board (bestuur@zeus.ugent.be), or some specific members
  • - join ons Slack team (via *ugent.be mail of invite) + join our Slack team (by *ugent.be mail or invite)
  • - stuur een gele briefkaart naar “Zeus WPI – Krijgslaan 281, S9 – 9000 Gent” + send a yellow postcard “Zeus WPI – Krijgslaan 281, S9 – 9000 Gent”
  • - blijf op de hoogte via onze mailinglist + keep up to date trough our mailinglist
  • - bezoek ons IRC-kanaalserver + check out our IRC-channel
  • - bel naar 09 264 4751 (intern: 4751) + call us at 09 264 4751 (intern: 4751)
  • - stort op BE32 9799 9370 6502 (BIC: ARSP BE 22) + deposit at BE32 9799 9370 6502 (BIC: ARSP BE 22)
  • - volg ons op Twitter: @ZeusWPI + follow us on Twitter: @ZeusWPI
  • - word fan op Facebook + like us on Facebook
From 010e6f1e5549587da0ec131014fdf8d5973ac81f Mon Sep 17 00:00:00 2001 From: Wout Schellaert Date: Tue, 10 Oct 2017 16:57:01 +0200 Subject: [PATCH 3/6] Split contact and about --- content/about.erb | 103 +------------------------ content/about/about.erb | 65 ++++++++++++++++ content/about/contact.erb | 49 ++++++++++++ layouts/partials/_about_sub_navbar.erb | 3 +- 4 files changed, 117 insertions(+), 103 deletions(-) create mode 100644 content/about/about.erb create mode 100644 content/about/contact.erb diff --git a/content/about.erb b/content/about.erb index c613831..652e0ed 100644 --- a/content/about.erb +++ b/content/about.erb @@ -4,105 +4,4 @@ title: About order: 0 narrow_page: true --- -<%= render '/partials/_about_sub_navbar.*', selected: 'about' %> -

About Zeus WPI

- -
-

- Zeus WPI is the student association for Computer Science at Ghent University. - Our goal is to provide a stimulating environment for motivated students looking to expand their skills by engaging in interesting real-world projects. -

- -

- We organize various tech related talks by experts (eg. professors, PhD's, Richard Stallman, Julia Roberts, ...), hands-on coding events and introductory lectures for cool technologies. - Together we build interesting applications for Ghent University students (Hydra), for FaculteitenKonvent and 12Urenloop, and ofcourse for ourselves. -

- -

- Be sure to check out the project-page! -

- -

- Everybody is welcom at Zeus WPI, even if you don't study computer science. The only requirement is a healthy dose of motivation and some (toleration for) geekyness. -

- -

The board

- -

- The board is the oil in the machine and is the driving force behind the organization of events and projects. - The Zeus WPI board for the <%= pretty_year @config[:academic_year] %> academic year is: -

- - - - - - - - - - - - <% current_bestuur.each do |lid| %> - - - - - - - <% end %> - -
FunctionNameE-mail
- <%= lid[:rol] %> - - <%= lid[:naam] %> - - <%= lid[:mail] %> - - - <%= fa :envelope %> - -
- -

Contact

- -

- Zeus WPI is located in the basement of the S9 building on Campus Sterre, by it's members often named “de kelder”. -

- -

Reach us:

- -
    -
  • - come to “de kelder” and say hi! (find us here). -
    • -
  • - mail the board (bestuur@zeus.ugent.be), or some specific members -
    • -
  • - join our Slack team (by *ugent.be mail or invite) -
    • -
  • - send a yellow postcard “Zeus WPI – Krijgslaan 281, S9 – 9000 Gent” -
    • -
  • - keep up to date trough our mailinglist -
    • -
  • - check out our IRC-channel -
    • -
  • - call us at 09 264 4751 (intern: 4751) -
    • -
  • - deposit at BE32 9799 9370 6502 (BIC: ARSP BE 22) -
    • -
  • - follow us on Twitter: @ZeusWPI -
    • -
  • - like us on Facebook -
    • -
- -
+ diff --git a/content/about/about.erb b/content/about/about.erb new file mode 100644 index 0000000..cb639dd --- /dev/null +++ b/content/about/about.erb @@ -0,0 +1,65 @@ +--- +narrow_page: true +--- + +<%= render '/partials/_about_sub_navbar.*', selected: 'about' %> +

About Zeus WPI

+ +
+

+ Zeus WPI is the student association for Computer Science at Ghent University. + Our goal is to provide a stimulating environment for motivated students looking to expand their skills by engaging in interesting real-world projects. +

+ +

+ We organize various tech related talks by experts (eg. professors, PhD's, Richard Stallman, Julia Roberts, ...), hands-on coding events and introductory lectures for cool technologies. + Together we build interesting applications for Ghent University students (Hydra), for FaculteitenKonvent and 12Urenloop, and ofcourse for ourselves. +

+ +

+ Be sure to check out the project-page! +

+ +

+ Everybody is welcom at Zeus WPI, even if you don't study computer science. The only requirement is a healthy dose of motivation and some (toleration for) geekyness. +

+ +

The board

+ +

+ The board is the oil in the machine and is the driving force behind the organization of events and projects. + The Zeus WPI board for the <%= pretty_year @config[:academic_year] %> academic year is: +

+ + + + + + + + + + + + <% current_bestuur.each do |lid| %> + + + + + + + <% end %> + +
FunctionNameE-mail
+ <%= lid[:rol] %> + + <%= lid[:naam] %> + + <%= lid[:mail] %> + + + <%= fa :envelope %> + +
+ +
\ No newline at end of file diff --git a/content/about/contact.erb b/content/about/contact.erb new file mode 100644 index 0000000..348363c --- /dev/null +++ b/content/about/contact.erb @@ -0,0 +1,49 @@ +--- +narrow_page: true +--- + +<%= render '/partials/_about_sub_navbar.*', selected: 'contact' %> +

Contact

+ +
+ +

+ Zeus WPI is located in the basement of the S9 building on Campus Sterre, by it's members often named “de kelder”. +

+ +

Reach us:

+ +
    +
  • + come to “de kelder” and say hi! (find us here). +
    • +
  • + mail the board (bestuur@zeus.ugent.be), or some specific members +
    • +
  • + join our Slack team (by *ugent.be mail or invite) +
    • +
  • + send a yellow postcard “Zeus WPI – Krijgslaan 281, S9 – 9000 Gent” +
    • +
  • + keep up to date trough our mailinglist +
    • +
  • + check out our IRC-channel +
    • +
  • + call us at 09 264 4751 (intern: 4751) +
    • +
  • + deposit at BE32 9799 9370 6502 (BIC: ARSP BE 22) +
    • +
  • + follow us on Twitter: @ZeusWPI +
    • +
  • + like us on Facebook +
    • +
+ +
\ No newline at end of file diff --git a/layouts/partials/_about_sub_navbar.erb b/layouts/partials/_about_sub_navbar.erb index 181b2dc..f2e3572 100644 --- a/layouts/partials/_about_sub_navbar.erb +++ b/layouts/partials/_about_sub_navbar.erb @@ -1,6 +1,7 @@
    -
  • Over
    • +
  • Contact
    • +
  • About
  • Statuten
  • Historiek
  • Verslagen (soon)
    • From ada67a3cccb6b05932bf02c6ff81689ed077b293 Mon Sep 17 00:00:00 2001 From: Wout Schellaert Date: Tue, 10 Oct 2017 17:03:14 +0200 Subject: [PATCH 4/6] Make about default instead of contact --- content/about.erb | 2 +- layouts/partials/_about_sub_navbar.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/about.erb b/content/about.erb index 652e0ed..cf4f7ac 100644 --- a/content/about.erb +++ b/content/about.erb @@ -4,4 +4,4 @@ title: About order: 0 narrow_page: true --- - + diff --git a/layouts/partials/_about_sub_navbar.erb b/layouts/partials/_about_sub_navbar.erb index f2e3572..5dcbe8c 100644 --- a/layouts/partials/_about_sub_navbar.erb +++ b/layouts/partials/_about_sub_navbar.erb @@ -1,7 +1,7 @@
      -
    • Contact
    • About
      • +
    • Contact
    • Statuten
    • Historiek
    • Verslagen (soon)
      • From 04a25e5afc3155c098aafebcc127e676e477b28f Mon Sep 17 00:00:00 2001 From: Wout Schellaert Date: Wed, 11 Oct 2017 20:56:09 +0200 Subject: [PATCH 5/6] Fix broken link --- content/about/about.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/about.erb b/content/about/about.erb index cb639dd..694261a 100644 --- a/content/about/about.erb +++ b/content/about/about.erb @@ -17,7 +17,7 @@ narrow_page: true

      - Be sure to check out the project-page! + Be sure to check out the project-page!

      From ccb151ed907cdc6715d330c749d50ad0e96a73ae Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Fri, 13 Oct 2017 22:12:34 +0200 Subject: [PATCH 6/6] small fixes --- content/about/about.erb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/content/about/about.erb b/content/about/about.erb index 694261a..18753ee 100644 --- a/content/about/about.erb +++ b/content/about/about.erb @@ -12,16 +12,16 @@ narrow_page: true

      - We organize various tech related talks by experts (eg. professors, PhD's, Richard Stallman, Julia Roberts, ...), hands-on coding events and introductory lectures for cool technologies. + 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 (Hydra), for FaculteitenKonvent and 12Urenloop, and ofcourse for ourselves.

      - Be sure to check out the project-page! + Be sure to check out the project page!

      - Everybody is welcom at Zeus WPI, even if you don't study computer science. The only requirement is a healthy dose of motivation and some (toleration for) geekyness. + Everybody is welcome at Zeus WPI, even if you don't study computer science. The only requirement is a healthy dose of motivation and some (toleration for) geekyness.

      The board

      @@ -53,13 +53,15 @@ narrow_page: true <%= lid[:mail] %> + <% if lid[:mail] %> <%= fa :envelope %> + <% end %> <% end %> -
    \ No newline at end of file +