Verbeterde navigatie, aria-labels, optimaliseren CSS

This commit is contained in:
Michael Boelen 2023-05-20 19:59:58 +02:00
parent 53310dd1f6
commit 9c7ec523c5
8 changed files with 102 additions and 86 deletions

View file

@ -30,20 +30,19 @@
{{ end }}
{{ end }}
{{ if eq .Section "posts" }}
<section>
<h3>Tags</h3>
<div class="post-date">
<span class="g time">{{.Date.Format "January 2, 2006"}} </span> &#8729;
{{ $taxonomy := "tags" }} {{ with .Param $taxonomy }}
{{ range $index, $tag := . }} {{ with $.Site.GetPage (printf "/%s/%s" $taxonomy $tag) -}}
<a href="{{ .Permalink }}">{{ $tag | urlize }}</a>
{{- end -}} {{- end -}}
{{ end }}
</div>
</section>
{{ end }}
{{ if .Params.tags }}
<section>
<h3>Tags</h3>
<div class="post-date">
<span class="g time">{{.Date.Format "January 2, 2006"}} </span> &#8729;
{{ $taxonomy := "tags" }} {{ with .Param $taxonomy }}
{{ range $index, $tag := . }} {{ with $.Site.GetPage (printf "/%s/%s" $taxonomy $tag) -}}
<a href="{{ .Permalink }}">{{ $tag | urlize }}</a>
{{- end -}} {{- end -}}
{{ end }}
</div>
</section>
{{ end }}
</div>
</main>
{{ partial "footer.html" . }}

View file

@ -1,4 +1,5 @@
{{ define "main" }}
<article>
{{ .Content }}
{{ if gt (len (where .Site.RegularPages "Section" "nieuws")) 0 }}
@ -42,7 +43,7 @@
</div>
<p>Naast de door ons georganiseerde evenementen staat er meer op de agenda.</p>
<ul>
{{ range first 10 (where $upcoming_events "date_start" "gt" (dateFormat "2006-01-02" now)) }}
{{ range first 10 (where $upcoming_events "date_start" "ge" (dateFormat "2006-01-02" now)) }}
<li>{{ .date_start | dateFormat "02-01-2006" }} - <a href="/evenementen/kalender/#{{ anchorize (.date_start | dateFormat "2006-01-02") }}-{{ anchorize .name }}">{{ .name }}</a></li>
{{ end }}
</ul>
@ -61,7 +62,5 @@
<p>Op de pagina <a href="/projecten/">Projecten</a> beschrijven we deze en andere projecten. Meehelpen? Contacteer een actief projectlid voor meer informatie.</p>
</section>
{{ end }}
</article>
{{ end }}

View file

@ -1,5 +1,5 @@
{{ if not .IsHome }}
<nav aria-label="breadcrumb">
<nav aria-label="Breadcrumbs">
<ol class="breadcrumb">
{{ range $index,$element := .Ancestors.Reverse }}
{{ if eq $index 0 }}

View file

@ -7,8 +7,10 @@
{{ with .File }}<a class="btn btn-cta" href="https://github.com/NLUUG/website/edit/main/content/{{ .Path }}" target="_blank" rel="noopener">Verbeter deze pagina</a>{{ end }}
</div>
<div>
<h2>Volg ons</h2>
{{ $iconsize := .Site.Params.mediumIconSize }}
<h2>Volg ons</h2>
<nav aria-label="Social media">
{{ with .Site.Params.twitter_handle }}
<a class="icon" href="https://twitter.com/{{ . }}" target="_blank" rel="noopener">{{- partial "show-svg-icon.html" (dict "context" . "icon" "twitter" "iconsize" $iconsize_footer) -}}</a>
{{ end }}
@ -22,13 +24,16 @@
<a class="icon" href="https://www.meetup.com/nluug-dutch-unix-linux-user-group/" target="_blank" rel="noopener">{{ partial "show-svg-icon.html" (dict "context" . "icon" "meetup" "iconsize" $iconsize_footer) }}</a>
<a class="icon" href="{{ absURL "atom.xml" }}" target="_blank" rel="noopener">{{ partial "show-svg-icon.html" (dict "context" . "icon" "rss" "iconsize" $iconsize_footer) }}</a>
<a class="icon" href="{{ absURL "feed.json" }}" target="_blank" rel="noopener">{{ partial "show-svg-icon.html" (dict "context" . "icon" "database" "iconsize" $iconsize_footer) }}</a>
</nav>
</div>
<div>
<h2>Nuttige links</h2>
<ul>
<li><a href="{{ absURL "contact/" }}">Contact</a></li>
<li><a href="{{ absURL "privacy/" }}">Privacy</a></li>
</ul>
<nav aria-label="Footer links">
<ul>
<li><a href="{{ absURL "contact/" }}">Contact</a></li>
<li><a href="{{ absURL "privacy/" }}">Privacy</a></li>
</ul>
</nav>
</div>
</div>
<small>Voor meer informatie over deze {{ with .Site.GetPage "/website/" }}<a href="{{ .Permalink }}">{{ .Title | lower }}</a>{{ end }}, zie de {{ with .Site.GetPage "/website/sitemap" }}<a href="{{ .Permalink }}">{{ .Title | lower }}</a>{{ end }}, {{ with .Site.GetPage "/website/laatste-wijzigingen.rst" }}<a href="{{ .Permalink }}">{{ .Title | lower }}</a>{{ end }} en de {{ with .Site.GetPage "/website/stats-for-nerds" }}<a href="{{ .Permalink }}">{{ .Title }}</a>{{ end }}</small>

View file

@ -4,12 +4,14 @@
<header>
<div class="header-content">
<a href="/" class="logo"><img src="{{ .Site.Params.logoNormal }}" alt="NLUUG-logo" title="{{ .Site.Title }}"></a>
{{ $logoresource := resources.Get (.Site.Params.logoNormal | replaceRE "^/" "") }}
<a href="/" class="logo" title="Terug naar hoofdpagina"><img src="{{ $logoresource | relURL }}" alt="NLUUG-logo" width="{{ $logoresource.Width }}" height="{{ $logoresource.Height }}"></a>
<input type="checkbox" id="hamburger" aria-label="menu button">
<label for="hamburger"><span></span></label>
<nav aria-label="main navigation">
<nav aria-label="Main navigation">
<ul class="menus menu">
{{ $currentPage := . }}
@ -17,19 +19,21 @@
{{ $.Scratch.Set "counter" (add ($.Scratch.Get "counter") 1) }}
{{ if .Children }}
<li>
<button type="button" aria-haspopup="true" aria-expanded="true" aria-controls="dropdown{{ $.Scratch.Get "counter" }}"><a href="{{ .URL }}">{{ .Name }}</a><!-- <span class="arrow"></span>--></button>
<ul class="dropdown" id="dropdown{{ $.Scratch.Get "counter" }}">
<button type="button" aria-haspopup="true" aria-expanded="true" aria-controls="dropdown-{{ $.Scratch.Get "counter" }}">
<a href="{{ .URL }}">{{ .Name }}</a>
</button>
<ul class="dropdown" id="dropdown-{{ $.Scratch.Get "counter" }}">
{{ range .Children }}
<li><a href="{{ .URL }}">{{ .Name }}</a></li>
{{ end }}
</ul>
</li>
{{ else }}
<li><button type="button" aria-haspopup="true" aria-expanded="true" aria-controls="dropdown{{ $.Scratch.Get "counter" }}"><a href="{{ .URL }}">{{ .Name }}</a></button></li>
<li><button type="button" aria-haspopup="true" aria-expanded="true"><a href="{{ .URL }}">{{ .Name }}</a></button></li>
{{ end }}
{{ end }}
<li><button type="button" aria-haspopup="false" aria-expanded="true"><a href="{{ relLangURL "/zoeken/"}}">{{ partial "show-svg-icon.html" (dict "context" . "icon" "magnifying-glass" "class" "shownormal") }}</a></button></li>
</ul>
</nav>
<a href="/zoeken/">{{ partial "show-svg-icon.html" (dict "context" . "icon" "magnifying-glass") }}</a>
</div>
</header>

View file

@ -1 +1 @@
<img src="/afbeeldingen/iconen/{{ .icon }}.svg" height="{{ .iconsize | default 20 }}" width="{{ .iconsize | default 20 }}" alt="{{ .icon | default .Site.Params.textNoTitle }}">
<img{{ if .class }} class="{{ .class }}"{{ end }} src="/afbeeldingen/iconen/{{ .icon }}.svg" height="{{ .iconsize | default 20 }}" width="{{ .iconsize | default 20 }}" alt="{{ .icon | default .Site.Params.textNoTitle }}">