diff --git a/public/styles/main.css b/public/styles/main.css index 4dfc4ed..dcb357a 100644 --- a/public/styles/main.css +++ b/public/styles/main.css @@ -65,6 +65,31 @@ section.error { grid-area: content; } +footer { + font-family: 'PT Serif', serif; + color: #fffffd; + background-color: #003b70; +} + +footer.main-footer { + grid-area: footer; + line-height: 70px; +} + +footer .footer-lead { + display: inline-block; + width: 200px; +} + +footer .sigma-logo { + vertical-align: -10px; +} + +footer .ericsson-logo { + vertical-align: -4px; + margin-left: 50px; +} + /* mobile */ @media only screen and (max-width: 779px) { .app-container { @@ -157,6 +182,21 @@ section.error { width: 55px; } + footer .footer-lead { + width: 140px; + } + + footer .sigma-logo { + vertical-align: -6px; + width: 78px; + } + + footer .ericsson-logo { + width: 82px; + margin-left: 10px; + vertical-align: -1px; + } + section.profile { grid-template-columns: auto; grid-template-rows: auto auto; @@ -469,39 +509,19 @@ header .title { } header .description { + max-width: 255px; font-size: 12pt; letter-spacing: 1.75pt; } +header .description .granprize-logo { + float: right; +} + nav.main { grid-area: nav; } -footer.main-footer { - grid-area: footer; - line-height: 70px; -} - -footer .footer-lead { - display: inline-block; - width: 200px; -} - -footer .sigma-logo { - vertical-align: -10px; -} - -footer .ericsson-logo { - vertical-align: -4px; - margin-left: 50px; -} - -footer { - font-family: 'PT Serif', serif; - color: #fffffd; - background-color: #003b70; -} - nav ul { list-style: none; padding-left: 0; @@ -543,6 +563,7 @@ nav ul.menu_level_1 > li { margin-bottom: 10px; } -nav ul.menu_level_1 > li.current { +nav ul.menu_level_1 > li.current, +nav ul.menu_level_1 > li.current_ancestor { border-left: 5px solid #003b70; } diff --git a/src/App/Plates/NavigationExtension.php b/src/App/Plates/NavigationExtension.php index 3ebb59b..c37c911 100644 --- a/src/App/Plates/NavigationExtension.php +++ b/src/App/Plates/NavigationExtension.php @@ -57,7 +57,9 @@ class NavigationExtension implements ExtensionInterface $matcher = new Matcher([ new UriVoter($_SERVER['REQUEST_URI']) ]); - $renderer = new ListRenderer($matcher); + $renderer = new ListRenderer($matcher, [ + 'depth' => 2, + ]); return $renderer->render($this->menu); } @@ -111,9 +113,24 @@ class NavigationExtension implements ExtensionInterface }, $result)); foreach ($years as $year) { - $awardeesMenu->addChild($year, [ + $yearItem = $awardeesMenu->addChild($year, [ 'uri' => $this->getUriFromRouter('awardees-by-year', ['year' => $year]) ]); + $this->populateYearSubmenuArticleDummy($yearItem, (int)$year); + } + } + + private function populateYearSubmenuArticleDummy(ItemInterface $yearMenu, int $year) + { + /** @var Awardee[] $yearAwardees */ + $yearAwardees = $this->entityManager->getRepository(Awardee::class)->findBy([ + 'year' => $year, + ]); + + foreach($yearAwardees as $awardee) { + $yearMenu->addChild($awardee->getName(), [ + 'uri' => $this->getUriFromRouter('awardee', ['slug' => $awardee->getSlug()]) + ]); } } } diff --git a/templates/layout/default.phtml b/templates/layout/default.phtml index 897755f..b83a7f6 100644 --- a/templates/layout/default.phtml +++ b/templates/layout/default.phtml @@ -17,11 +17,12 @@