diff --git a/config.toml b/config.toml
index d832e49d4a1e45cb99a5a752659f43104eba2234..74b2337fe5562f271f8e0eaab757e3c45eb94121 100644
--- a/config.toml
+++ b/config.toml
@@ -7,6 +7,7 @@ enableRobotsTXT = true
disableHugoGeneratorInject = true
disableKinds = ["RSS","taxonomy","taxonomyTerm"]
enableGitInfo = false
+SectionPagesMenu = "main"
[params]
gitEditBaseUrl = "https://gitlab.stusta.de/stustanet/stustanet-website/edit/master/content/"
@@ -17,7 +18,31 @@ weight = 1
languageCode = "de-DE"
languageName = "Deutsch"
+[[Languages.de.menu.main]]
+weight = 1
+name = "Home"
+identifier = "home"
+url = "/de/"
+
+[[Languages.de.menu.main]]
+weight = 2
+name = "Verein"
+identifier = "about"
+url = "/de/about/"
+
[Languages.en]
weight = 2
languageCode = "en-US"
languageName = "English"
+
+[[Languages.en.menu.main]]
+weight = 1
+name = "Home"
+identifier = "home"
+url = "/en/"
+
+[[Languages.en.menu.main]]
+weight = 2
+name = "About Us"
+identifier = "about"
+url = "/en/about/"
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 23c849c3fddc8946f91cbbc5db37b6c7ce8fddd5..daf6a77d90e7aef5a966eff042d6316b6fb40054 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -22,14 +22,22 @@
{{- end }}
</head>
<body>
+ <nav id="top-bar">
+ <div class="container">
+ <div class="logo">
+ <a href="/" title="To Homepage"><img src="/logo.png" alt="StuStaNet" /></a>
+ </div>
+ <ul class="menu">
+ {{ $currentPage := . }}
+ {{ range .Site.Menus.main }}
+ <li><a class="menu-item{{if or ($currentPage.IsMenuCurrent "main" .) ($currentPage.HasMenuCurrent "main" .) }} active{{end}}" href="{{ .URL }}" title="{{ .Title }}">{{ .Name }}</a></li>
+ {{ end }}
+ </ul>
+ </div>
+ </nav>
<main aria-role="main">
<header>
- <nav>
- <div class="container">
- <a href="/" title="To Homepage"><img src="/logo.png" alt="StuStaNet" class="logo" /></a>
- </div>
- </nav>
<h1>{{.Title}}</h1>
{{ with .Params.subtitle }}
<span class="subtitle">{{.}}</span>
diff --git a/static/styles.css b/static/styles.css
index 6df98f53499714d7c6ba20ca37b80be246781ea5..aee75dcbc4075a0963d8915c0614cf2254b87931 100644
--- a/static/styles.css
+++ b/static/styles.css
@@ -20,7 +20,7 @@ body {
color: #4B4B4B;
}
-nav {
+#top-bar {
background: #fff;
width: 100%;
height: 54px;
@@ -31,12 +31,36 @@ nav {
z-index: 1;
}
-nav a img.logo {
+#top-bar div.logo {
+ display: inline-block;
+}
+
+#top-bar .logo a img {
height: 34px;
width: auto;
margin: 10px 10px 10px -5px;
}
+ul.menu {
+ list-style-type: none;
+ margin: 0;
+ padding: 0;
+}
+
+ul.menu li {
+ display: inline-block;
+}
+
+ul.menu li a {
+ display: inline-block;
+ padding: 15px 5px;
+}
+
+#top-bar .menu {
+ float: right;
+
+}
+
.lang-dropdown {
color: #EDEDED;
cursor: default;
@@ -257,6 +281,7 @@ footer {
footer .editPage {
float: left;
padding: 15px;
+ padding-left: 0px;
margin-right: -100px;
}