From cc05c7d640ba50e48cc44433318652417997d984 Mon Sep 17 00:00:00 2001 From: Felix Hamann Date: Sun, 15 Apr 2018 00:47:24 +0200 Subject: [PATCH] making use of tabber on course detail page --- static/css/tabber.css | 32 ++++++++++++------------ static/js/tabber.js | 3 +++ templates/course.hamlet | 54 +++++++++++++++++++++++------------------ 3 files changed, 49 insertions(+), 40 deletions(-) diff --git a/static/css/tabber.css b/static/css/tabber.css index 60f54094e..2a35a136a 100644 --- a/static/css/tabber.css +++ b/static/css/tabber.css @@ -1,12 +1,6 @@ -.tab-group { - margin: 0 13px; - padding: 0; -} - .tab-group-openers { - display: block; - background: #777; - color: white; + display: flex; + justify-content: stretch; line-height: 40px; font-size: 16px; margin: 0; @@ -14,18 +8,22 @@ .tab-opener { display: inline-block; + flex: 1; + text-align: center; padding: 0 13px; + background-color: #b3b7c1; + color: white; + font-size: 20px; + font-weight: 600; + transition: color .2s ease, background .2s ease; +} +.tab-opener:not(.tab-visible):hover { cursor: pointer; - transition: color .3s ease, background .3s ease; + background-color: transparent; + color: rgb(52, 48, 58); } .tab-opener.tab-visible { - color: black; - background: white; -} - -.tab { - padding: 13px 31px; - background: white; - color: black; + background-color: transparent; + color: rgb(52, 48, 58); } diff --git a/static/js/tabber.js b/static/js/tabber.js index 959e8300d..cad12b1aa 100644 --- a/static/js/tabber.js +++ b/static/js/tabber.js @@ -21,6 +21,9 @@ var tabFile = tab.data('tab-file') || false; var $opener = makeOpener(tabName, i); $openers.append($opener); + if (tab.find('.tab-title')) { + tab.find('.tab-title').remove(); + } tab.hide(); var loaded = false; tabs.push({index: i, name: tabName, file: tabFile, dom: tab, opener: $opener, loaded: false}); diff --git a/templates/course.hamlet b/templates/course.hamlet index 756645afc..27b085d05 100644 --- a/templates/course.hamlet +++ b/templates/course.hamlet @@ -1,39 +1,43 @@

#{courseName course} - $maybe school <- schoolMB -

#{schoolName school} - $maybe descr <- courseDescription course -

Beschreibung -

#{descr} - $maybe link <- courseLinkExternal course -

Homepage - #{link} - -
-

Übersicht + $maybe school <- schoolMB + + + + - -
Fakultät/Institut + + #{schoolName school} + $maybe descr <- courseDescription course +
Beschreibung + +

#{descr} + $maybe link <- courseLinkExternal course +

Website + + #{link}
Teilnehmer + Teilnehmer #{participants} $maybe capacity <- courseCapacity course \ von #{capacity}
Anmeldezeitraum + Anmeldezeitraum $maybe regFrom <- courseRegisterFrom course #{formatTimeGerWD regFrom} $maybe regTo <- courseRegisterTo course \ bis #{formatTimeGerWD regTo} + Anmelden + + $#
+ $# ^{regWidget} - - ^{regWidget} -
-
-
-
-

Übungsblätter +
+
+

Übungsblätter (hardcoded table below) @@ -44,9 +48,13 @@
- Blatt 1 + Blatt 1 Do 11.04.18 Do 11.04.18 NotGraded -
-
\ No newline at end of file +
+

Übungsgruppen +
... +
+

Klausuren +
...