Week 14 of 2019

Development log of Elm Tree Workshop

8 items
  1. Add sign up, date and place of workshop.
  2. Merge branch 'second-workshop' into 'master'
  3. Fix typo.
  4. Merge branch 'second-workshop' into 'master'
  5. Link to hornbook.io and discuss.hornbook.io
  6. Titleize the subtitle of the home page
  7. Correct grammar.
  8. Merge branch 'hornbook' into 'master'

Add sign up, date and place of workshop.

On by Fana Mehari Hagos

index f1e1668..8ccd230 100644
--- a/content/second-workshop.txt
+++ b/content/second-workshop.txt
@@ -1,9 +1,15 @@
=| Title
=    Special Offer for University of Utrecht Students
=
-In collaboration with {Link|Career Services|url=https://students.uu.nl/en/careerservices} of the University of Utrecht we are running a second workshop. For the first five students it is free. If the 5 spots are filled, we have discounted price of 300 € (inc. 21% VAT) for the next 10 students.
+In collaboration with {Link|Career Services|url=https://students.uu.nl/en/careerservices} of the University of Utrecht we are running a second workshop. For the first five students it is free. For the next 10 students, we a have discounted price of 300 € (inc. 21% VAT).
+
+| Note
+    Monday 13 May - Friday 17,  2019 Marinus Ruppert room B Time 16:00 - 19:00
=
=| Emphasize
-    If you are interested please get in touch
+    {Link|Sign Up|url= https://fd21.formdesk.com/universiteitutrecht/CS-20190513-17-SoftwareGarden}
+    <>
+
+    If you have any questions don't hesitate to get in touch.
=
=    {Icon|name=phone} {Link|+31 638 216 166|url=tel:+31638216166} | {Icon|name=mail} {Link|fana@software.garden|url= mailto:fana@software.garden} | {Icon|name=home} {Link|Back|url=/}

Merge branch 'second-workshop' into 'master'

On by Fana Mehari Hagos

Add offer for the second-workshop.

See merge request software-garden/software-garden.gitlab.io!43

Fix typo.

On by Fana Mehari Hagos

index 8ccd230..0124dc1 100644
--- a/content/second-workshop.txt
+++ b/content/second-workshop.txt
@@ -1,7 +1,7 @@
=| Title
=    Special Offer for University of Utrecht Students
=
-In collaboration with {Link|Career Services|url=https://students.uu.nl/en/careerservices} of the University of Utrecht we are running a second workshop. For the first five students it is free. For the next 10 students, we a have discounted price of 300 € (inc. 21% VAT).
+In collaboration with {Link|Career Services|url=https://students.uu.nl/en/careerservices} of the University of Utrecht we are running a second workshop. For the first five students it is free. For the next 10 students, we have a discounted price of 300 € (inc. 21% VAT).
=
=| Note
=    Monday 13 May - Friday 17,  2019 Marinus Ruppert room B Time 16:00 - 19:00

Merge branch 'second-workshop' into 'master'

On by Fana Mehari Hagos

Fix typo.

See merge request software-garden/software-garden.gitlab.io!44

On by Tadeusz Łazurski

Reshuffle the content on home page. Make subtitles bold.

index d41b8f2..909aaf5 100644
--- a/content/index.txt
+++ b/content/index.txt
@@ -1,17 +1,16 @@
=| Title
=    Software Garden
=
-| Subtitle
-    A software development workshop for non-programmers
-
-Hello! We are running a workshop that will give you a glimpse into the way software is created. Our workshop is intended for people with no prior experience in programming and doesn't require any technical knowledge. Everybody is welcome!
-
=| Emphasize
-    Say hello {Icon|name=phone} {Link|+31 638 216 166|url=tel:+31638216166}
+    <>
=
-    or drop us a note at {Link|fana@software.garden|url= mailto:fana@software.garden}
+    A software development workshop for non-programmers
+    by {Link|Hornbook company|url=https://hornbook.io/}
+    in Amsterdam and Utrecht, the Netherlands
+
+Hello! We are running a workshop that will give you a glimpse into the way software is created. We think {Link|it's important|url=/motivation.html}.
=
-During this *5 days workshop* (3 hours each day) you will learn to solve problems using a functional programming language. We think {Link|it's important|url=/motivation.html}. Together, we will build a program that simulates growth of a tree, like this:
+During this *5 days workshop* (3 hours each day) you will learn to solve problems using a functional programming language.  Together, we will build a program that simulates growth of a tree, like this:
=
=| Window
=    | AnimatedTree
@@ -47,7 +46,21 @@ During this *5 days workshop* (3 hours each day) you will learn to solve problem
=                    color = olive
=                    rotation = -20
=
-Upon completion of the course your name, program that you will have created, photo and link to your website (or LinkedIn profile etc) will be posted {Link|here|url=/test-run.html}.  The price for participation is *500 €* (inc. 21% VAT).
+Our workshop is intended for people with no prior experience in programming and doesn't require any technical knowledge. Everybody is welcome!
+
+| Emphasize
+    Say hello {Icon|name=phone} {Link|+31 638 216 166|url=tel:+31638216166}
+
+    or drop us a note at {Link|fana@software.garden|url= mailto:fana@software.garden}
+
+
+
+| Subtitle
+    Next Round
+
+We are going to run the second workshop at the University of Utrecht from Monday, *13th of May* to Friday, 17th. The price for participation is *500<>€* (inc. 21% VAT).
+
+In addition to 15 hours of training you will get access to {Link|our discussion site|url=https://discuss.hornbook.io/} where you can ask questions. Upon completion of the course your name, program that you will have created and link to your website (or LinkedIn profile etc) will be posted {Link|here|url=/test-run.html}.
=
=| Coupon
=    icon = gift
index 2c9e0ce..e3164ab 100644
--- a/src/Mark/Custom.elm
+++ b/src/Mark/Custom.elm
@@ -502,6 +502,7 @@ subtitle =
=                    , Element.paddingXY 0 10
=                    , Element.width Element.fill
=                    , Element.spacing 10
+                    , Font.bold
=                    , content
=                        |> String.toLower
=                        |> String.words

Titleize the subtitle of the home page

On by Tadeusz Łazurski

index 909aaf5..3a3471f 100644
--- a/content/index.txt
+++ b/content/index.txt
@@ -4,8 +4,8 @@
=| Emphasize
=    <>
=
-    A software development workshop for non-programmers
-    by {Link|Hornbook company|url=https://hornbook.io/}
+    A Software Development Workshop for Non-Programmers
+    by {Link|Hornbook Company|url=https://hornbook.io/}
=    in Amsterdam and Utrecht, the Netherlands
=
=Hello! We are running a workshop that will give you a glimpse into the way software is created. We think {Link|it's important|url=/motivation.html}.

Correct grammar.

On by Fana Mehari Hagos

Update Fana's bio.

index 3a3471f..e85e578 100644
--- a/content/index.txt
+++ b/content/index.txt
@@ -58,7 +58,7 @@ Our workshop is intended for people with no prior experience in programming and
=| Subtitle
=    Next Round
=
-We are going to run the second workshop at the University of Utrecht from Monday, *13th of May* to Friday, 17th. The price for participation is *500<>€* (inc. 21% VAT).
+We are going to run the second workshop at the University of Utrecht from Monday, *13th of May* to Friday 17th. The price for participation is *500<>€* (inc. 21% VAT).
=
=In addition to 15 hours of training you will get access to {Link|our discussion site|url=https://discuss.hornbook.io/} where you can ask questions. Upon completion of the course your name, program that you will have created and link to your website (or LinkedIn profile etc) will be posted {Link|here|url=/test-run.html}.
=
@@ -103,6 +103,6 @@ Below is the material through which we will be going during the workshop. Only t
=
=I love the creativity of the software development and hope to share that passion with you.
=
-*Fana* is a junior software developer (an ex marine biologist {Icon|name=anchor}) and coordinator of our project. She keeps us on the right track. Also she is taking care of our media presence.
+*Fana* I'm a junior software developer and together with Ted a co-founder of {Link|Hornbook Company|url=https://hornbook.io/}. At the workshop I am going to be your teaching assistant. Previously I was teaching English in China and working as a marine biologist {Icon|name=anchor} in Eritrea, Italy, Finland, Azores and Spain.
=
=*Sam* is a co-author of the workshop. He is an Elm developer at {Link|itravel|url=https://www.itravel.de/} in Cologne, Germany.
index 0124dc1..63c686c 100644
--- a/content/second-workshop.txt
+++ b/content/second-workshop.txt
@@ -4,7 +4,7 @@
=In collaboration with {Link|Career Services|url=https://students.uu.nl/en/careerservices} of the University of Utrecht we are running a second workshop. For the first five students it is free. For the next 10 students, we have a discounted price of 300 € (inc. 21% VAT).
=
=| Note
-    Monday 13 May - Friday 17,  2019 Marinus Ruppert room B Time 16:00 - 19:00
+    Monday 13 May - Friday 17 May,  2019 Marinus Ruppert room B Time 16:00 - 19:00
=
=| Emphasize
=    {Link|Sign Up|url= https://fd21.formdesk.com/universiteitutrecht/CS-20190513-17-SoftwareGarden}

Merge branch 'hornbook' into 'master'

On by Tadeusz Łazurski

Link to hornbook.io and discuss.hornbook.io

See merge request software-garden/software-garden.gitlab.io!45