Skip to content

Commit 376b406

Browse files
jjasgharjjasghar
committed
modernizing the templates and making it more accessible
1 parent a960eca commit 376b406

46 files changed

Lines changed: 1568 additions & 1880 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎package-lock.json‎

Lines changed: 75 additions & 303 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎themes/devopsdays-theme/assets/scss/custom.scss‎

Lines changed: 437 additions & 274 deletions
Large diffs are not rendered by default.

‎themes/devopsdays-theme/layouts/_default/baseof.html‎

Lines changed: 45 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,59 @@
11
<!DOCTYPE html>
2-
<html itemscope lang="{{ .Site.LanguageCode }}">
2+
<html itemscope lang="{{ site.LanguageCode }}">
33
<head>
44
{{- partial "head.html" . -}}
55
</head>
6-
<body lang="{{ .Site.Params.Lang }}">
6+
<body lang="{{ site.Params.Lang }}">
7+
<a class="skip-link" href="#main-content">Skip to main content</a>
78
{{- partialCached "global_navbar.html" . -}}
8-
{{- if and (eq (index (split (.Permalink | relURL) "/") 1) "events") (ne .Type "events") -}}
9+
{{- $section := index (split (.Permalink | relURL) "/") 1 -}}
10+
{{- if and (eq $section "events") (ne .Type "events") -}}
911
{{- partial "events/event_navbar.html" . -}}
1012
{{- end -}}
11-
<div class="container-fluid">
12-
<div class="row">
13-
{{- if .IsPage -}}
14-
{{- if or (eq (index (split (.Permalink | relURL) "/") 1) "events") (eq .Type "events") -}}
15-
<div class="col-md-12">
16-
{{- block "main" . }}
17-
{{- end -}}
18-
</div><!-- do i show up? -->
19-
{{- else if (eq (index (split (.Permalink | relURL) "/") 1) "organizing") -}}
20-
<div class="col-md-8 order-md-12">
21-
{{- block "main" . }}
22-
{{- end -}}
23-
</div>
24-
<div class="col-md-2 order-md-1">
25-
<a href = '{{ "/events" }}' class="left-nav-navs">Table of Contents</a><br />
26-
{{- partialCached "toc.html" . -}}
27-
</div>
28-
{{- else -}}
29-
<div class="col-md-8 order-md-12">
30-
{{- block "main" . }} {{- end -}}
31-
</div>
32-
<div class="col-md-2 order-md-1">
33-
<a href = '{{ "/events" }}' class="left-nav-navs">ALL EVENTS</a><br />
34-
{{- partialCached "future.html" . -}}
35-
</div>
36-
{{- end -}}
13+
<main id="main-content" role="main">
14+
<div class="container-fluid">
15+
<div class="row">
16+
{{- if .IsPage -}}
17+
{{- if or (eq $section "events") (eq .Type "events") -}}
18+
<div class="col-md-12">
19+
{{- block "main" . }}{{- end -}}
20+
</div>
21+
{{- else if (eq $section "organizing") -}}
22+
<div class="col-md-8 col-lg-9 order-md-2">
23+
{{- block "main" . }}{{- end -}}
24+
</div>
25+
<aside class="col-md-3 col-lg-2 order-md-1 sidebar" role="complementary" aria-label="Table of contents">
26+
<nav aria-label="Table of contents">
27+
<a href="/events" class="left-nav-navs">Table of Contents</a><br />
28+
{{- partialCached "toc.html" . .RelPermalink -}}
29+
</nav>
30+
</aside>
3731
{{- else -}}
38-
<div class="col-md-8 order-md-12">
39-
{{- block "main" . }}
40-
{{- end -}}
32+
<div class="col-md-8 col-lg-9 order-md-2">
33+
{{- block "main" . }}{{- end -}}
4134
</div>
42-
<div class="col-md-2 order-md-1">
43-
<a href = '{{ "/events" }}' class="left-nav-navs">ALL EVENTS</a><br />
35+
<aside class="col-md-3 col-lg-2 order-md-1 sidebar" role="complementary" aria-label="Upcoming events">
36+
<nav aria-label="Upcoming events">
37+
<a href="/events" class="left-nav-navs">All Events</a><br />
4438
{{- partialCached "future.html" . -}}
45-
</div>
39+
</nav>
40+
</aside>
41+
{{- end -}}
42+
{{- else -}}
43+
<div class="col-md-8 col-lg-9 order-md-2">
44+
{{- block "main" . }}{{- end -}}
45+
</div>
46+
<aside class="col-md-3 col-lg-2 order-md-1 sidebar" role="complementary" aria-label="Upcoming events">
47+
<nav aria-label="Upcoming events">
48+
<a href="/events" class="left-nav-navs">All Events</a><br />
49+
{{- partialCached "future.html" . -}}
50+
</nav>
51+
</aside>
4652
{{- end -}}
47-
</div>
4853
</div>
49-
{{- partialCached "footer.html" . -}}
50-
{{- partial "footer_scripts.html" . -}}
54+
</div>
55+
</main>
56+
{{- partialCached "footer.html" . -}}
57+
{{- partial "footer_scripts.html" . -}}
5158
</body>
5259
</html>

‎themes/devopsdays-theme/layouts/_default/list.html‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{{ define "main" }}
2+
3+
<h1>{{ .Title }}</h1>
4+
{{ .Content }}
5+
6+
{{ if .Pages }}
7+
<ul class="list-unstyled">
8+
{{- range .Pages -}}
9+
<li class="mb-3">
10+
<a href="{{ .Permalink }}">{{ .Title }}</a>
11+
{{- if not .Date.IsZero -}}
12+
<small class="text-muted d-block">{{ dateFormat "02 January, 2006" .Date }}</small>
13+
{{- end -}}
14+
</li>
15+
{{- end -}}
16+
</ul>
17+
{{ end }}
18+
19+
{{ end }}

‎themes/devopsdays-theme/layouts/_default/single.html‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
{{ define "main" }}
2+
3+
<article>
24
<h1>{{ .Title }}</h1>
3-
{{ .Content }}
5+
<div class="content-text">
6+
{{ .Content }}
7+
</div>
48
<div id="share"></div>
9+
</article>
510

611
{{ end }}

‎themes/devopsdays-theme/layouts/blog/single.html‎

Lines changed: 42 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,47 @@
11
{{ define "main" }}
22

3-
<h1>{{ .Title }}</h1>
4-
{{- if isset .Params "author" -}}
5-
<small>by {{ .Params.author }} - {{ dateFormat "02 January, 2006" .Date }}</small>
6-
{{- else -}}
7-
<small>{{ dateFormat "02 January, 2006" .Date }}</small>
8-
{{- end -}}
9-
<br><br>
10-
{{ .Content }}
11-
<div id="share"></div>
12-
<div class="row">
13-
<!-- pager begin -->
14-
<div class="col-md-12">
15-
<nav>
16-
<ul class="pagination">
17-
{{ if .PrevInSection }}
18-
<li class="page-item">
19-
<a href="{{.PrevInSection.Permalink}}" class="page-link">
20-
<span aria-hidden="true">&larr;</span>
21-
Previous</a>
22-
</li>
23-
{{ else }}
24-
<li class="page-item disabled">
25-
<a href="#" class="page-link">
26-
<span aria-hidden="true">&larr;</span>
27-
Previous</a>
28-
</li>
29-
{{ end }}
30-
{{ if .NextInSection }}
31-
<li class="page-item">
32-
<a href="{{.NextInSection.Permalink}}" class="page-link">Next
33-
<span aria-hidden="true">&rarr;</span>
34-
</a>
35-
</li>
36-
{{ else }}
37-
<li class="page-item disabled">
38-
<a href="#" class="page-link">Next
39-
<span aria-hidden="true">&rarr;</span>
40-
</a>
41-
</li>
42-
{{ end }}
43-
</ul>
44-
</nav>
3+
<article>
4+
<header>
5+
<h1>{{ .Title }}</h1>
6+
{{- with .Params.author -}}
7+
<p class="blog-post-meta">by {{ . }} &mdash; {{ time.Format "02 January, 2006" $.Date }}</p>
8+
{{- else -}}
9+
<p class="blog-post-meta">{{ time.Format "02 January, 2006" .Date }}</p>
10+
{{- end -}}
11+
</header>
12+
13+
<div class="content-text">
14+
{{ .Content }}
4515
</div>
46-
</div>
47-
<!-- pager end -->
16+
17+
<div id="share"></div>
18+
19+
<nav aria-label="Blog post navigation">
20+
<ul class="pagination">
21+
{{- with .PrevInSection -}}
22+
<li class="page-item">
23+
<a href="{{ .Permalink }}" class="page-link">
24+
<span aria-hidden="true">&larr;</span> Previous
25+
</a>
26+
</li>
27+
{{- else -}}
28+
<li class="page-item disabled">
29+
<span class="page-link"><span aria-hidden="true">&larr;</span> Previous</span>
30+
</li>
31+
{{- end -}}
32+
{{- with .NextInSection -}}
33+
<li class="page-item">
34+
<a href="{{ .Permalink }}" class="page-link">
35+
Next <span aria-hidden="true">&rarr;</span>
36+
</a>
37+
</li>
38+
{{- else -}}
39+
<li class="page-item disabled">
40+
<span class="page-link">Next <span aria-hidden="true">&rarr;</span></span>
41+
</li>
42+
{{- end -}}
43+
</ul>
44+
</nav>
45+
</article>
4846

4947
{{ end }}

‎themes/devopsdays-theme/layouts/blog/summary.html‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
1-
<header>
2-
<h2><a href='{{ .Permalink }}'> {{ .Title }}</a> </h2>
3-
{{- if isset .Params "author" -}}
4-
<h2 class="footer-heading">by {{ .Params.author }} - {{ dateFormat "02 January, 2006" .Date }}</h2>
5-
{{- else -}}
6-
<h2 class="footer-heading">{{ dateFormat "02 January, 2006" .Date }}</h2>
7-
{{- end -}}
8-
9-
</header>
10-
{{ if isset .Params "description" }}
11-
{{ if ne .Params.descripton "" }}
12-
{{ .Params.description | markdownify }}
13-
{{ end }}
14-
{{ else }}
15-
{{ .Summary }}
16-
{{ end }}
17-
<footer>
18-
<a href='{{ .Permalink }}'><nobr>Read more →</nobr></a>
19-
</footer>
20-
<br>
1+
<article class="blog-summary">
2+
<header>
3+
<h2><a href='{{ .Permalink }}'>{{ .Title }}</a></h2>
4+
{{- with .Params.author -}}
5+
<p class="blog-post-meta">by {{ . }} &mdash; {{ time.Format "02 January, 2006" $.Date }}</p>
6+
{{- else -}}
7+
<p class="blog-post-meta">{{ time.Format "02 January, 2006" .Date }}</p>
8+
{{- end -}}
9+
</header>
10+
{{- with .Params.description -}}
11+
{{ . | markdownify }}
12+
{{- else -}}
13+
{{ .Summary }}
14+
{{- end -}}
15+
<footer>
16+
<a href='{{ .Permalink }}' class="blog-read-more">Read more &rarr;</a>
17+
</footer>
18+
</article>

‎themes/devopsdays-theme/layouts/events/single.html‎

Lines changed: 44 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -3,83 +3,72 @@
33
<div>
44
{{ .Content }}
55
</div>
6-
<div class = "row">
7-
<div class = "col-md-12">
6+
<div class="row">
7+
<div class="col-md-12">
88
<h2>Upcoming</h2>
99
</div>
1010
</div>
1111

12-
{{- $upcoming := slice -}}
13-
{{- $tbd := slice -}}
14-
{{- $upcoming = partial "functions/get-upcoming-events" . -}}
15-
{{- $tbd = partial "functions/get-tbd-events" . -}}
16-
{{- $events := slice -}}
17-
{{- $events = partial "functions/get-all-events" . -}}
12+
{{- $upcoming := partial "functions/get-upcoming-events" . -}}
13+
{{- $tbd := partial "functions/get-tbd-events" . -}}
14+
{{- $events := partial "functions/get-all-events" . -}}
1815

19-
<div class = "row">
20-
{{- $.Scratch.Set "close-tag" "false" -}}
16+
<div class="row">
17+
{{- $currentMonth := "" -}}
18+
{{- $needsCloseTag := false -}}
2119
{{- range sort $upcoming "startdate" -}}
22-
{{- if ne ($.Scratch.Get "year") (dateFormat "2006" .startdate) -}}
23-
{{- $.Scratch.Set "year" (dateFormat "2006" .startdate) -}}
24-
{{- $.Scratch.Set "year-displayed" "false" -}}
25-
{{- end -}}
26-
{{- if ne ($.Scratch.Get "month") (dateFormat "January 2006" .startdate ) -}}
27-
{{- $.Scratch.Set "month" (dateFormat "January 2006" .startdate ) -}}
28-
{{- $.Scratch.Set "month-displayed" "false" -}}
29-
{{- end -}}
30-
{{- if ne ($.Scratch.Get "month-displayed") "true" -}}
31-
{{- if eq ($.Scratch.Get "close-tag") "true"}}
20+
{{- $month := time.Format "January 2006" .startdate -}}
21+
{{- if ne $currentMonth $month -}}
22+
{{- $currentMonth = $month -}}
23+
{{- if $needsCloseTag -}}
3224
</div>
3325
{{- end -}}
34-
<div class = "col-md-6 col-lg-3 events-page-col">
35-
<h4 class="events-page-months">{{ dateFormat "January 2006" .startdate }}</h4>
36-
{{- $.Scratch.Set "month-displayed" "true" -}}
37-
{{- $.Scratch.Set "close-tag" "true" -}}
26+
<div class="col-md-6 col-lg-3 events-page-col">
27+
<h4 class="events-page-months">{{ $month }}</h4>
28+
{{- $needsCloseTag = true -}}
3829
{{- end -}}
39-
{{- if or (ne (time .startdate).Month (time .enddate).Month) (ne (time .startdate).Day (time .enddate).Day) -}}
40-
<a href = '{{ (printf "/events/%s" .name) }}' class = "events-page-event">
41-
{{ dateFormat "Jan 2" .startdate }} - {{ dateFormat "2" .enddate }}:
42-
{{ .city }}
30+
{{- $start := time.AsTime .startdate -}}
31+
{{- $end := time.AsTime .enddate -}}
32+
{{- if or (ne $start.Month $end.Month) (ne $start.Day $end.Day) -}}
33+
<a href='{{ printf "/events/%s" .name }}' class="events-page-event">
34+
{{ time.Format "Jan 2" .startdate }} - {{ time.Format "2" .enddate }}: {{ .city }}
4335
</a><br />
4436
{{- else -}}
45-
<a href = '{{ (printf "/events/%s" .name) }}' class = "events-page-event">
46-
{{ dateFormat "Jan 2" .startdate }}:
47-
{{ .city }}
48-
</a><br />
37+
<a href='{{ printf "/events/%s" .name }}' class="events-page-event">
38+
{{ time.Format "Jan 2" .startdate }}: {{ .city }}
39+
</a><br />
4940
{{- end -}}
5041
{{- end -}}
5142
</div>
52-
<div class = "col-md-6 col-lg-3 events-page-col">
53-
<h4 class="events-page-months">TBD</h4>
54-
{{- range sort $tbd "city" -}}
55-
<a href = '{{ (printf "/events/%s" .name) }}' class = "events-page-event">{{ .city }}</a><br />
56-
{{- end -}}
43+
<div class="col-md-6 col-lg-3 events-page-col">
44+
<h4 class="events-page-months">TBD</h4>
45+
{{- range sort $tbd "city" -}}
46+
<a href='{{ printf "/events/%s" .name }}' class="events-page-event">{{ .city }}</a><br />
47+
{{- end -}}
5748
</div>
58-
</div>
59-
<!--past -->
60-
<div class = "row">
61-
<div class = "col-md-12">
49+
</div>
50+
51+
<div class="row">
52+
<div class="col-md-12">
6253
<h2>Past</h2>
6354
</div>
6455
</div>
65-
<div class = "row">
66-
{{- $.Scratch.Set "close-tag" "false" -}}
56+
<div class="row">
57+
{{- $currentYear := "" -}}
58+
{{- $needsCloseTag := false -}}
6759
{{- range sort $events "startdate" -}}
68-
{{- if and ( lt (dateFormat "2006-01-02" .enddate) (dateFormat "2006-01-02" (dateFormat "2006-01-02" now))) -}}
69-
{{- if ne ($.Scratch.Get "year") (dateFormat "2006" .startdate) -}}
70-
{{- $.Scratch.Set "year" (dateFormat "2006" .startdate) -}}
71-
{{- $.Scratch.Set "year-displayed" "false" -}}
72-
{{- end -}}
73-
{{- if ne ($.Scratch.Get "year-displayed") "true" -}}
74-
{{- if eq ($.Scratch.Get "close-tag") "true" -}}
60+
{{- if lt (time.Format "2006-01-02" .enddate) (time.Format "2006-01-02" now) -}}
61+
{{- $year := time.Format "2006" .startdate -}}
62+
{{- if ne $currentYear $year -}}
63+
{{- $currentYear = $year -}}
64+
{{- if $needsCloseTag -}}
7565
</div>
7666
{{- end -}}
77-
<div class = "col-md-6 col-lg-3 events-page-col">
78-
<h4 class="events-page-months">{{ dateFormat "2006" .startdate }}</h4>
79-
{{- $.Scratch.Set "year-displayed" "true" -}}
80-
{{- $.Scratch.Set "close-tag" "true" -}}
67+
<div class="col-md-6 col-lg-3 events-page-col">
68+
<h4 class="events-page-months">{{ $year }}</h4>
69+
{{- $needsCloseTag = true -}}
8170
{{- end -}}
82-
<a href='{{ (printf "/events/%s" .name) }}' class = "events-page-event">{{ .city }}</a>
71+
<a href='{{ printf "/events/%s" .name }}' class="events-page-event">{{ .city }}</a>
8372
<br/>
8473
{{- end -}}
8574
{{- end -}}

0 commit comments

Comments
 (0)