From 993366bb600e03066907ed2aed39582d6ead1e7b Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Thu, 7 Jun 2018 00:31:27 +0200
Subject: [PATCH 1/8] removed file upload example form from home

---
 templates/home.hamlet | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/templates/home.hamlet b/templates/home.hamlet
index 33b9c741f..fa3f84243 100644
--- a/templates/home.hamlet
+++ b/templates/home.hamlet
@@ -43,21 +43,3 @@
       ^{modal ".toggler2" (Just "Test Inhalt für Modal")}
       <div .btn.toggler2>Klick mich für Content-Test
         <noscript>(Für Modals bitte JS aktivieren)</noscript>
-
-    <li><br>
-      Multi-File-Input für bereits hochgeladene Dateien:
-      <form>
-        <div .form-group>
-          <label .form-group__label>Datei(en)
-          $# file 1
-          <div .file-checkbox__container>
-            <label .file-checkbox__label.reactive-label.btn for="f2-1">Datenschutz.txt
-            <div .checkbox>
-              <input .file-checkbox id="f2-1" name="f2" value="Datenschutz.txt" type="checkbox">
-              <label for="f2-1">
-          $# file 2
-          <div .file-checkbox__container>
-            <label .file-checkbox__label.reactive-label.btn for="f2-2">fill-db.hs
-            <div .checkbox>
-              <input .file-checkbox id="f2-2" name="f2" value="fill-db.hs" type="checkbox">
-              <label for="f2-2">

From 99643ff0896de5672f5e33b2b7838f042cab0506 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Thu, 7 Jun 2018 00:32:58 +0200
Subject: [PATCH 2/8] page title above page actions -wip

---
 src/Foundation.hs               | 2 ++
 templates/default-layout.hamlet | 5 +++++
 templates/terms.hamlet          | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/src/Foundation.hs b/src/Foundation.hs
index b29f42d2a..4827ad443 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -439,6 +439,8 @@ instance Yesod UniWorX where
             navbar = $(widgetFile "widgets/navbar")
             asidenav :: Widget
             asidenav = $(widgetFile "widgets/asidenav")
+            contentHeadline :: Maybe String
+            contentHeadline = Just "Some Headline" -- should be coming from the currently viewed page
             breadcrumbs :: Widget
             breadcrumbs = $(widgetFile "widgets/breadcrumbs")
             pageactionprime :: Widget
diff --git a/templates/default-layout.hamlet b/templates/default-layout.hamlet
index b628912f0..99b24bfca 100644
--- a/templates/default-layout.hamlet
+++ b/templates/default-layout.hamlet
@@ -13,6 +13,11 @@
       $with status2 <- bool status "info" (status == "")
         <div class="alert alert-#{status2}">#{msg}
 
+    <!-- workaround for pageactionprime not visible inside of ^{widget}. see terms.hamlet-->
+    <h1>
+      #{fromMaybe "default headline" contentHeadline}
+      <!-- maybe #{pageTitle pc} ? -->
+
     <!-- prime page actions -->
     ^{pageactionprime}
 
diff --git a/templates/terms.hamlet b/templates/terms.hamlet
index 4d5e14631..df30fd90f 100644
--- a/templates/terms.hamlet
+++ b/templates/terms.hamlet
@@ -1,4 +1,6 @@
 <div .container>
   <h1>Semesterübersicht
 
+  <!-- pass widget ^{pageactionprime} down to this widget from default-layout? -->
+
   ^{table}

From 2883dedff77addaa6fb14fbbf86843bd99b72b03 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Thu, 7 Jun 2018 00:34:07 +0200
Subject: [PATCH 3/8] input field styles and less navigation items

---
 src/Foundation.hs                        | 14 ++---
 static/css/icons.css                     |  3 ++
 templates/default-layout.lucius          | 37 +++++++------
 templates/standalone/inputs.lucius       | 69 ++++++++++++++++++------
 templates/widgets/asidenav.hamlet        |  3 +-
 templates/widgets/pageactionprime.lucius |  2 +-
 6 files changed, 83 insertions(+), 45 deletions(-)

diff --git a/src/Foundation.hs b/src/Foundation.hs
index 4827ad443..9373de9f8 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -713,21 +713,15 @@ defaultLinks = -- Define the menu items of the header.
       , menuItemAccessCallback' = isJust <$> maybeAuthPair
       }
   , NavbarAside $ MenuItem
-      { menuItemLabel = "Aktuelle Veranstaltungen"
+      { menuItemLabel = "Veranstaltungen"
       , menuItemIcon = Just "book"
       , menuItemRoute = CourseListR -- should be CourseListActiveR or similar in the future
       , menuItemAccessCallback' = return True
       }
   , NavbarAside $ MenuItem
-      { menuItemLabel = "Alte Veranstaltungen"
-      , menuItemIcon = Just "book"
-      , menuItemRoute = CourseListR -- should be CourseListInactiveR or similar in the future
-      , menuItemAccessCallback' = return True
-      }
-  , NavbarAside $ MenuItem
-      { menuItemLabel = "Veranstaltungen"
-      , menuItemIcon = Just "book"
-      , menuItemRoute = CourseListR
+      { menuItemLabel = "Semester"
+      , menuItemIcon = Nothing
+      , menuItemRoute = CourseListR -- should be TermListR ,,,
       , menuItemAccessCallback' = return True
       }
   , NavbarAside $ MenuItem
diff --git a/static/css/icons.css b/static/css/icons.css
index b836de6e3..e5fdd191d 100644
--- a/static/css/icons.css
+++ b/static/css/icons.css
@@ -32,3 +32,6 @@
 .glyphicon--logout::before {
   content: '\e163';
 }
+.glyphicon--none::before {
+  content: '';
+}
diff --git a/templates/default-layout.lucius b/templates/default-layout.lucius
index ad20ae148..abfcc19a2 100644
--- a/templates/default-layout.lucius
+++ b/templates/default-layout.lucius
@@ -126,12 +126,11 @@ table {
 
 th, td {
   text-align: left;
-  padding: 0 13px 0 7px;
+  padding: 7px;
   vertical-align: baseline;
 }
 th:first-child,
 td:first-child {
-  padding-left: 0;
   border-left: 0;
 }
 th {
@@ -189,21 +188,15 @@ button,
   transition: all .1s;
   font-size: 16px;
   cursor: pointer;
-  border-radius: 4px;
   display: inline-block;
-}
-input.btn-primary,
-button.btn-primary,
-a.btn.btn-primary,
-.btn.btn-primary {
-  background-color: var(--primarybase);
-}
 
-input.btn-info,
-button.btn-info,
-a.btn.btn-info,
-.btn.btn-info {
-  background-color: var(--infobase)
+  a {
+    color: white;
+  }
+
+  a:hover {
+    color: white;
+  }
 }
 
 input[type="submit"][disabled],
@@ -226,6 +219,20 @@ a.btn:not([disabled]):hover,
   color: white;
 }
 
+input.btn-primary,
+button.btn-primary,
+a.btn.btn-primary,
+.btn.btn-primary {
+  background-color: var(--primarybase);
+}
+
+input.btn-info,
+button.btn-info,
+a.btn.btn-info,
+.btn.btn-info {
+  background-color: var(--infobase)
+}
+
 input[type="submit"].btn-info:hover,
 input[type="button"].btn-info:hover,
 button.btn-info:hover,
diff --git a/templates/standalone/inputs.lucius b/templates/standalone/inputs.lucius
index 550fe84ac..1ef824d13 100644
--- a/templates/standalone/inputs.lucius
+++ b/templates/standalone/inputs.lucius
@@ -13,7 +13,7 @@ form {
   grid-gap: 5px;
   justify-content: flex-start;
   align-items: center;
-  margin: 10px 0;
+  margin: 17px 0;
   padding-left: 10px;
   border-left: 2px solid transparent;
 }
@@ -44,6 +44,7 @@ input[type="password"],
 input[type="url"],
 input[type="number"],
 input[type="email"] {
+  /*
   background-color: rgba(0, 0, 0, 0.05);
   padding: 7px 3px 7px;
   outline: 0;
@@ -54,6 +55,30 @@ input[type="email"] {
   transition: all .1s;
   font-size: 16px;
   min-width: 400px;
+  */
+
+  /* from bulma */
+  background-color: #fff;
+  border-color: #dbdbdb;
+  color: #363636;
+  box-shadow: inset 0 1px 2px rgba(10,10,10,.1);
+  min-width: 400px;
+  width: 100%;
+  -webkit-appearance: none;
+  align-items: center;
+  border: 1px solid transparent;
+  border-radius: 4px;
+  display: inline-flex;
+  font-size: 1rem;
+  height: 2.25em;
+  justify-content: flex-start;
+  line-height: 1.5;
+  padding-bottom: calc(.375em - 1px);
+  padding-left: calc(.625em - 1px);
+  padding-right: calc(.625em - 1px);
+  padding-top: calc(.375em - 1px);
+  position: relative;
+  vertical-align: top;
 }
 
 .form-group--required {
@@ -82,32 +107,42 @@ input[type="password"]:focus,
 input[type="url"]:focus,
 input[type="number"]:focus,
 input[type="email"]:focus {
-  border-bottom-color: var(--lightbase);
+  /* border-bottom-color: var(--lightbase);
   background-color: transparent;
-  box-shadow: 0 0 13px var(--lighterbase);
+  box-shadow: 0 0 13px var(--lighterbase); */
+  border-color: #3273dc;
+  box-shadow: 0 0 0 0.125em rgba(50,115,220,.25);
+  outline: 0;
 }
 
 /* BUTTON STYLE SEE default-layout.lucius */
 
 /* TEXTAREAS */
 textarea {
-  outline: 0;
-  border: 0;
-  padding: 7px 4px;
-  min-width: 400px;
-  min-height: 100px;
-  font-family: var(--fontfamilybase);
-  font-size: 16px;
-  color: var(--fontbase);
-  background-color: rgba(0, 0, 0, 0.05);
-  box-shadow: 0 2px 13px rgba(0, 0, 0, 0.05);
-  border-bottom: 2px solid var(--darkbase);
+  -webkit-appearance: none;
+  border: 1px solid transparent;
+  border-radius: 2px;
+  display: inline-flex;
+  font-size: 1rem;
+  height: 170px;
+  width: 400px;
+  line-height: 1.5;
+  padding-bottom: calc(.375em - 1px);
+  padding-left: calc(.625em - 1px);
+  padding-right: calc(.625em - 1px);
+  padding-top: calc(.375em - 1px);
+  position: relative;
+  vertical-align: top;
+  background-color: #fff;
+  border-color: #dbdbdb;
+  color: #363636;
+  box-shadow: inset 0 1px 2px rgba(10,10,10,.1);
 }
 
 textarea:focus {
-  background-color: transparent;
-  border-bottom-color: var(--lightbase);
-  box-shadow: 0 0 13px var(--lighterbase);
+  border-color: #3273dc;
+  box-shadow: 0 0 0 0.125em rgba(50,115,220,.25);
+  outline: 0;
 }
 
 /* CUSTOM LEGACY CHECKBOX AND RADIO BOXES */
diff --git a/templates/widgets/asidenav.hamlet b/templates/widgets/asidenav.hamlet
index 8126fd770..b34145640 100644
--- a/templates/widgets/asidenav.hamlet
+++ b/templates/widgets/asidenav.hamlet
@@ -8,8 +8,7 @@ $newline never
             $of NavbarAside (MenuItem label mIcon route _)
               <li .asidenav__list-item :Just route == mcurrentRoute:.asidenav__list-item--active>
                 <a .asidenav__link-wrapper href=@{route}>
-                  $if isJust mIcon
-                    <div .glyphicon.glyphicon--#{fromMaybe "" mIcon}>
+                  <div .glyphicon.glyphicon--#{fromMaybe "none" mIcon}>
                   <div .asidenav__link-label>#{label}
             $of _
 
diff --git a/templates/widgets/pageactionprime.lucius b/templates/widgets/pageactionprime.lucius
index 564603fdf..a1769478d 100644
--- a/templates/widgets/pageactionprime.lucius
+++ b/templates/widgets/pageactionprime.lucius
@@ -1,10 +1,10 @@
 .page-nav-prime {
   background-color: var(--lightgreybase);
   padding: 13px;
+  margin-top: 30px;
 }
 
 .page-nav-prime .pagenav__list {
-  margin: 7px 0 0;
   display: block;
 }
 .page-nav-prime .pagenav__list-item {

From 07eeb32caf6f93c2538e740325d225a7e760fc01 Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Thu, 7 Jun 2018 00:34:42 +0200
Subject: [PATCH 4/8] more space for course registration

---
 templates/course.hamlet | 9 +++++++--
 templates/course.lucius | 3 +++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/templates/course.hamlet b/templates/course.hamlet
index 958e4024a..7d50e73ec 100644
--- a/templates/course.hamlet
+++ b/templates/course.hamlet
@@ -31,8 +31,13 @@
           \ bis #{formatTimeGerWD regTo}
 
         $# if allowed to register
-        <div .course__registration>
-          <a href="#">Anmelden
+        <div .course__registration.container>
+          <button class="btn btn-primary">
+            <a href="#">Anmelden
+        $# if already registered
+        <div .course__registration.container>
+          <button class="btn btn-info">
+            <a href="#">Abmelden
 
   $# <form method=post action=@{CourseR tid csh CShow} enctype=#{regEnctype}>
   $#   ^{regWidget}
diff --git a/templates/course.lucius b/templates/course.lucius
index e69de29bb..a645d15fd 100644
--- a/templates/course.lucius
+++ b/templates/course.lucius
@@ -0,0 +1,3 @@
+.course__registration {
+  margin-top: 20px;
+}

From 0d2c5696c5c419fe4916c2e91bdd05f002cc501f Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Thu, 7 Jun 2018 11:06:23 +0200
Subject: [PATCH 5/8] slight refinments for inputs and

---
 src/Foundation.hs                  |  2 +-
 static/css/tabber.css              |  2 --
 templates/course.hamlet            | 12 +++---------
 templates/default-layout.lucius    |  1 -
 templates/standalone/inputs.lucius | 24 ++++++++----------------
 5 files changed, 12 insertions(+), 29 deletions(-)

diff --git a/src/Foundation.hs b/src/Foundation.hs
index 9373de9f8..70c4327a5 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -467,7 +467,7 @@ instance Yesod UniWorX where
             $(widgetFile "standalone/showHide")
             $(widgetFile "standalone/inputs")
         withUrlRenderer $(hamletFile "templates/default-layout-wrapper.hamlet")
- 
+
     -- The page to be redirected to when authentication is required.
     authRoute _ = Just $ AuthR LoginR
 
diff --git a/static/css/tabber.css b/static/css/tabber.css
index f768f6f24..6f823b410 100644
--- a/static/css/tabber.css
+++ b/static/css/tabber.css
@@ -1,8 +1,6 @@
 .tab-group {
-  /* box-shadow: 0 0 0 18px white, 0 0 0 20px #b3b7c1; */
   border-top: 2px solid #dcdcdc;
   padding-top: 30px;
-  margin-top: 40px;
 }
 
 .tab-group-openers {
diff --git a/templates/course.hamlet b/templates/course.hamlet
index 7d50e73ec..f1db6a0a7 100644
--- a/templates/course.hamlet
+++ b/templates/course.hamlet
@@ -68,11 +68,7 @@
             <td>Do 18.04.18
             <td>NotGraded
           <tr .no-hover.no-stripe>
-            <td>&nbsp;
-            <td>&nbsp;
-            <td>&nbsp;
-            <td>&nbsp;
-            <td>
+            <td colspan="4">
               <a href="/course/S2018/ffp/ex/new" #modal-toggler__new-sheet>Neues Übungsblatt anlegen
     <div .tab data-tab-name="Übungsgruppen">
       <h3 .tab-title>Übungsgruppen
@@ -87,16 +83,14 @@
             <th>Anmeldung bis
         <tbody>
           <tr>
-            <td>
-              <a href="#">Gruppe 1
+            <td>Gruppe 1
             <td>Montag 10:00 - 12:00
             <td>N/A
             <td>2/10
             <td>Tutor1 Tutoren
             <td>Do 21.02.2019, 19:00
           <tr>
-            <td>
-              <a href="#">Gruppe 2
+            <td>Gruppe 2
             <td>Montag 12:00 - 14:00
             <td>N/A
             <td>0/10
diff --git a/templates/default-layout.lucius b/templates/default-layout.lucius
index abfcc19a2..16a7599c0 100644
--- a/templates/default-layout.lucius
+++ b/templates/default-layout.lucius
@@ -244,4 +244,3 @@ a.btn.btn-info:hover,
 .alert-debug {
   background-color: rgb(240, 30, 240);
 }
-
diff --git a/templates/standalone/inputs.lucius b/templates/standalone/inputs.lucius
index 1ef824d13..71402a4b5 100644
--- a/templates/standalone/inputs.lucius
+++ b/templates/standalone/inputs.lucius
@@ -44,26 +44,12 @@ input[type="password"],
 input[type="url"],
 input[type="number"],
 input[type="email"] {
-  /*
-  background-color: rgba(0, 0, 0, 0.05);
-  padding: 7px 3px 7px;
-  outline: 0;
-  border: 0;
-  border-bottom: 2px solid var(--darkbase);
-  box-shadow: 0 2px 13px rgba(0, 0, 0, 0.05);
-  color: var(--fontbase);
-  transition: all .1s;
-  font-size: 16px;
-  min-width: 400px;
-  */
-
-  /* from bulma */
+  /* from bulma.css */
   background-color: #fff;
   border-color: #dbdbdb;
   color: #363636;
-  box-shadow: inset 0 1px 2px rgba(10,10,10,.1);
+  box-shadow: inset 0 2px 3px 1px rgba(50,50,50,.1);
   min-width: 400px;
-  width: 100%;
   -webkit-appearance: none;
   align-items: center;
   border: 1px solid transparent;
@@ -83,6 +69,12 @@ input[type="email"] {
 
 .form-group--required {
 
+  label::before {
+    content: '*';
+    position: absolute;
+    left: -14px;
+  }
+
   input, textarea {
     border-bottom-color: var(--lighterbase);
   }

From f4b6d1e3f5529ca2e9afab9a9d87ba609c54ba04 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 7 Jun 2018 11:26:41 +0200
Subject: [PATCH 6/8] Introduce pageHeading function

---
 messages/de.msg                 |  1 +
 src/Foundation.hs               | 11 +++++++++--
 templates/default-layout.hamlet |  5 +++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/messages/de.msg b/messages/de.msg
index 5332201d5..a4e8637fa 100644
--- a/messages/de.msg
+++ b/messages/de.msg
@@ -49,3 +49,4 @@ SubmissionAlreadyExistsFor user@Text: #{user} hat bereits eine Abgabe zu diesem
 EMailUnknown email@Text: E-Mail #{email} gehört zu keinem bekannten Benutzer.
 NotAParticipant user@Text tid@TermIdentifier csh@Text: #{user} ist nicht im Kurs #{termToText tid}-#{csh} angemeldet.
 
+HomeHeading: Startseite
\ No newline at end of file
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 70c4327a5..c6a43c77b 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -434,13 +434,14 @@ instance Yesod UniWorX where
         -- value passed to hamletToRepHtml cannot be a widget, this allows
         -- you to use normal widget features in default-layout.
 
+
         let
             navbar :: Widget
             navbar = $(widgetFile "widgets/navbar")
             asidenav :: Widget
             asidenav = $(widgetFile "widgets/asidenav")
-            contentHeadline :: Maybe String
-            contentHeadline = Just "Some Headline" -- should be coming from the currently viewed page
+            contentHeadline :: Maybe Widget
+            contentHeadline = pageHeading =<< mcurrentRoute
             breadcrumbs :: Widget
             breadcrumbs = $(widgetFile "widgets/breadcrumbs")
             pageactionprime :: Widget
@@ -686,6 +687,12 @@ pageActions (TermCourseListR _) =
 
 pageActions _ = []
 
+pageHeading :: Route UniWorx -> Maybe Widget
+pageHeading HomeR
+  = Just [whamlet|_{MsgHomeHeading}|]
+pageHeading _
+  = Nothing
+
 defaultLinks :: [MenuTypes]
 defaultLinks = -- Define the menu items of the header.
   [ NavbarRight $ MenuItem
diff --git a/templates/default-layout.hamlet b/templates/default-layout.hamlet
index 99b24bfca..165096dfd 100644
--- a/templates/default-layout.hamlet
+++ b/templates/default-layout.hamlet
@@ -14,8 +14,9 @@
         <div class="alert alert-#{status2}">#{msg}
 
     <!-- workaround for pageactionprime not visible inside of ^{widget}. see terms.hamlet-->
-    <h1>
-      #{fromMaybe "default headline" contentHeadline}
+    $maybe headline <- contentHeadline
+      <h1>
+        ^{headline}
       <!-- maybe #{pageTitle pc} ? -->
 
     <!-- prime page actions -->

From 18c3840276432ec62ae1cfc679352009cd5b0d65 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 7 Jun 2018 11:36:59 +0200
Subject: [PATCH 7/8] Fix build

---
 src/Foundation.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Foundation.hs b/src/Foundation.hs
index c6a43c77b..340285e0f 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE OverloadedLists #-}
-{-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE TemplateHaskell, QuasiQuotes #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE ViewPatterns #-}
@@ -687,7 +687,7 @@ pageActions (TermCourseListR _) =
 
 pageActions _ = []
 
-pageHeading :: Route UniWorx -> Maybe Widget
+pageHeading :: Route UniWorX -> Maybe Widget
 pageHeading HomeR
   = Just [whamlet|_{MsgHomeHeading}|]
 pageHeading _

From 8c4b2d62d34af2a6675e0237643e1073ca02f5ae Mon Sep 17 00:00:00 2001
From: Felix Hamann <felix.hamann@campus.lmu.de>
Date: Thu, 7 Jun 2018 11:48:14 +0200
Subject: [PATCH 8/8] got rid of comments and added header for termsList

---
 messages/de.msg                 | 3 ++-
 src/Foundation.hs               | 2 ++
 templates/default-layout.hamlet | 2 --
 templates/terms.hamlet          | 4 ----
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/messages/de.msg b/messages/de.msg
index a4e8637fa..d5403dc7f 100644
--- a/messages/de.msg
+++ b/messages/de.msg
@@ -49,4 +49,5 @@ SubmissionAlreadyExistsFor user@Text: #{user} hat bereits eine Abgabe zu diesem
 EMailUnknown email@Text: E-Mail #{email} gehört zu keinem bekannten Benutzer.
 NotAParticipant user@Text tid@TermIdentifier csh@Text: #{user} ist nicht im Kurs #{termToText tid}-#{csh} angemeldet.
 
-HomeHeading: Startseite
\ No newline at end of file
+HomeHeading: Startseite
+TermsHeading: Semesterübersicht
diff --git a/src/Foundation.hs b/src/Foundation.hs
index 340285e0f..13752052b 100644
--- a/src/Foundation.hs
+++ b/src/Foundation.hs
@@ -690,6 +690,8 @@ pageActions _ = []
 pageHeading :: Route UniWorX -> Maybe Widget
 pageHeading HomeR
   = Just [whamlet|_{MsgHomeHeading}|]
+pageHeading TermShowR
+  = Just [whamlet|_{MsgTermsHeading}|]
 pageHeading _
   = Nothing
 
diff --git a/templates/default-layout.hamlet b/templates/default-layout.hamlet
index 165096dfd..52b1e584b 100644
--- a/templates/default-layout.hamlet
+++ b/templates/default-layout.hamlet
@@ -13,11 +13,9 @@
       $with status2 <- bool status "info" (status == "")
         <div class="alert alert-#{status2}">#{msg}
 
-    <!-- workaround for pageactionprime not visible inside of ^{widget}. see terms.hamlet-->
     $maybe headline <- contentHeadline
       <h1>
         ^{headline}
-      <!-- maybe #{pageTitle pc} ? -->
 
     <!-- prime page actions -->
     ^{pageactionprime}
diff --git a/templates/terms.hamlet b/templates/terms.hamlet
index df30fd90f..2d2943787 100644
--- a/templates/terms.hamlet
+++ b/templates/terms.hamlet
@@ -1,6 +1,2 @@
 <div .container>
-  <h1>Semesterübersicht
-
-  <!-- pass widget ^{pageactionprime} down to this widget from default-layout? -->
-
   ^{table}