Skip to content

Commit

Permalink
Updating theme to 1.10.0 (devopsdays#2439)
Browse files Browse the repository at this point in the history
* Releasing theme version 1.10.0

* Update netlify-production.sh

* Update netlify.sh

* Update appveyor.yml

* Update config.toml

* Delete config-windows.toml
  • Loading branch information
mattstratton authored May 16, 2017
1 parent d45b10a commit a95ff6f
Show file tree
Hide file tree
Showing 62 changed files with 738 additions and 1,027 deletions.
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ install:
build_script:
# Build the devopsdays-web site once
- cmd: >-
hugo --verbose --config config-windows.toml
hugo --verbose
test: off
2 changes: 1 addition & 1 deletion bin/netlify-production.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
hugo version
hugo --theme=devopsdays-theme --buildDrafts=false --baseURL="https://www.devopsdays.org/"
hugo --theme=devopsdays-theme --buildDrafts=false --baseURL="$URL"
gulp
2 changes: 1 addition & 1 deletion bin/netlify.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
hugo version
hugo --theme=devopsdays-theme --buildDrafts=false --baseURL="/"
hugo --theme=devopsdays-theme --buildDrafts=false --baseURL="$DEPLOY_PRIME_URL"
55 changes: 0 additions & 55 deletions config-windows.toml

This file was deleted.

7 changes: 0 additions & 7 deletions config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,3 @@ disableKinds = ["taxonomy", "taxonomyTerm"]
Twitter = "http://www.twitter.com/devopsdays"
Linkedin = "http://www.linkedin.com/groups?home=&gid=2445279"
Groups = "http://groups.google.com/group/devopsdays"

# Set to "/" on *nix and Mac, "\\" on Windows
# Refer to https://github.com/spf13/hugo/issues/2394 for more information
# Do not change in this file directly - use the --config flag to hugo with the config-windows.toml file instead
PathSeperator = "/" # this will be deprecated with devopsdays-theme
pathSeparator = "/"
weburl = "https://www.devopsdays.org"
16 changes: 16 additions & 0 deletions themes/devopsdays-theme/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# Change Log

## [1.10.0](https://github.com/devopsdays/devopsdays-theme/tree/1.10.0) (2017-05-16)
[Full Changelog](https://github.com/devopsdays/devopsdays-theme/compare/1.9.1...1.10.0)

**Implemented enhancements:**

- Sponsors should be singular if max-level is 1 [\#528](https://github.com/devopsdays/devopsdays-theme/issues/528)
- Make ellipsis on truncated bios on speaker page clickable [\#519](https://github.com/devopsdays/devopsdays-theme/issues/519)
- Remove filesystem deps [\#471](https://github.com/devopsdays/devopsdays-theme/issues/471)
- Create custom 404 page [\#345](https://github.com/devopsdays/devopsdays-theme/issues/345)

**Fixed bugs:**

- The "about" sidebar should not be special-cased [\#532](https://github.com/devopsdays/devopsdays-theme/issues/532)
- Speakerdeck width overlapping with speaker profile text [\#531](https://github.com/devopsdays/devopsdays-theme/issues/531)
- Deprecate weburl key in config.toml [\#455](https://github.com/devopsdays/devopsdays-theme/issues/455)

## [1.9.1](https://github.com/devopsdays/devopsdays-theme/tree/1.9.1) (2017-05-11)
[Full Changelog](https://github.com/devopsdays/devopsdays-theme/compare/1.9.0...1.9.1)

Expand Down
13 changes: 13 additions & 0 deletions themes/devopsdays-theme/layouts/404.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{{ define "main"}}

<div class = "row">
<div class = "col-lg-6 col-md-12">
<p class="page-404-header">Whoops!</p>
<p class="page-404-content">The devopsdays yak can't find that page. It's probably fine.</p>
</div>
<div class = "col-lg-6 col-md-12">
<img src = "{{ "img/404-yak.png" | absURL }}" class = "img-fluid">
</div>
</div>

{{ end }}
31 changes: 9 additions & 22 deletions themes/devopsdays-theme/layouts/_default/baseof.html
Original file line number Diff line number Diff line change
@@ -1,54 +1,41 @@
<!DOCTYPE html>
<html itemscope lang="{{ .Site.LanguageCode }}">

<head>
{{- partial "head.html" . -}}
</head>

<body lang="{{ .Site.Params.Lang }}">

{{- partial "global_navbar.html" . -}}
{{ $path := split $.Source.File.Path .Site.Params.PathSeparator }}
{{ if eq (index $path 0) "events" }}
{{ if and (eq (index (split (.Permalink | relURL) "/") 1) "events") (ne .Type "events") }}
{{- partial "events/event_navbar.html" . -}}
{{ end }}
<div class="container-fluid">
<div class="row">
{{ if .IsPage }}
{{ $path := split $.Source.File.Path .Site.Params.PathSeparator }}
{{ if or (eq (index $path 0) "events") (eq .Type "events") }}

{{- if .IsPage -}}
{{ if or (eq (index (split (.Permalink | relURL) "/") 1) "events") (eq .Type "events") }}
<div class="col-md-12">
<!-- Main Content -->
{{- block "main" . }} {{- end -}}
</div>
{{ else }}
{{- else -}}
<div class="col-md-8 push-md-2">
<!-- Main Content -->
{{- block "main" . }} {{- end -}}
</div>
<div class="col-md-2 pull-md-8">
<a href = "/events" class="left-nav-navs">PAST EVENTS</a><br />
<a href = "{{ "events" | absURL }}" class="left-nav-navs">PAST EVENTS</a><br />
{{- partial "future.html" . -}}
</div>
{{ end }}
{{ else }}
{{- end -}}
{{- else -}}
<div class="col-md-8 push-md-2">
<!-- Main Content -->
{{- block "main" . }} {{- end -}}
</div>
<div class="col-md-2 pull-md-8">
<a href = "/events" class="left-nav-navs">PAST EVENTS</a><br />
<a href = "{{ "events" | absURL }}" class="left-nav-navs">PAST EVENTS</a><br />
{{- partial "future.html" . -}}
</div>
{{ end }}
{{- end -}}
</div>

</div>

{{- partial "footer.html" . -}}
{{- partial "footer_scripts.html" . -}}

</body>

</html>
11 changes: 0 additions & 11 deletions themes/devopsdays-theme/layouts/about/single.html

This file was deleted.

49 changes: 49 additions & 0 deletions themes/devopsdays-theme/layouts/blog/single.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{{ define "main" }}

<h1>{{ .Title }}</h1>
{{- if isset .Params "author" -}}
<small>by {{ .Params.author }} - {{ dateFormat "02 January, 2006" .Date }}</small>
{{- else -}}
<small>{{ dateFormat "02 January, 2006" .Date }}</small>
{{- end -}}

{{ .Content }}
<div id="share"></div>
<div class="row">
<!-- pager begin -->
<div class="col-md-12">
<nav>
<ul class="pagination">
{{ if .PrevInSection }}
<li class="page-item">
<a href="{{.PrevInSection.Permalink}}" class="page-link">
<span aria-hidden="true">&larr;</span>
Previous</a>
</li>
{{ else }}
<li class="page-item disabled">
<a href="#" class="page-link">
<span aria-hidden="true">&larr;</span>
Previous</a>
</li>
{{ end }}
{{ if .NextInSection }}
<li class="page-item">
<a href="{{.NextInSection.Permalink}}" class="page-link">Next
<span aria-hidden="true">&rarr;</span>
</a>
</li>
{{ else }}
<li class="page-item disabled">
<a href="#" class="page-link">Next
<span aria-hidden="true">&rarr;</span>
</a>
</li>
{{ end }}
</ul>
</nav>
</div>
</div>
<!-- pager end -->

{{ end }}
43 changes: 13 additions & 30 deletions themes/devopsdays-theme/layouts/event/single.html
Original file line number Diff line number Diff line change
@@ -1,32 +1,15 @@
{{ define "main" }}

{{/* site data query copypasta */}}
{{ $path := split $.Source.File.Path .Site.Params.PathSeparator }}
{{ $event_slug := index $path 1 }}
{{ $e := (index $.Site.Data.events $event_slug) }}
{{/* end site data query */}}


<div class="row">
<!-- enclosing div -->
<div class="col-md-12 content-text">
<!-- main content -->
{{ if eq .File.BaseFileName "welcome"}}
{{- partial "welcome.html" . -}}
{{ else }}
<h1>devopsdays {{$e.city}} - {{.Title}}</h1>
{{ .Content }}
{{ end }}
<br />
<!-- need to add else statement for the rest of the content types -->
{{ partial "sponsors.html" . }}


</div>{{ "<!-- close the content -->" | safeHTML }}


</div>{{ "<!-- whole big thing -->" | safeHTML }}



{{- $e := (index $.Site.Data.events (index (split (.Permalink | relURL) "/") 2)) -}}
<div class="row">
<div class="col-md-12 content-text">
{{- if eq .File.BaseFileName "welcome" -}}
{{- partial "welcome.html" . -}}
{{- else -}}
<h1>devopsdays {{ $e.city }} - {{ .Title }}</h1>
{{ .Content }}
{{ end }}
<br />
{{- partial "sponsors.html" . -}}
</div>
</div>
{{ end }}
24 changes: 9 additions & 15 deletions themes/devopsdays-theme/layouts/events/single.html
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
{{ define "main" }}

<div>
{{ .Content }}
{{ .Content }}
</div>

<div class = "row">
<div class = "col-md-12">
<h2>Future</h2>
</div>
</div>

<div class = "row">
{{ $.Scratch.Set "close-tag" "false" }}
{{- $.Scratch.Set "close-tag" "false" -}}
{{- range sort $.Site.Data.events "startdate" -}}
{{- if .startdate -}}
{{- if ge (dateFormat "2006-01-02" .enddate) (dateFormat "2006-01-02" (dateFormat "2006-01-02" now)) -}}
Expand All @@ -23,31 +21,29 @@ <h2>Future</h2>
{{- $.Scratch.Set "month" (dateFormat "January" .startdate ) -}}
{{- $.Scratch.Set "month-displayed" "false" -}}
{{- end -}}


{{- if ne ($.Scratch.Get "month-displayed") "true" -}}
{{- if eq ($.Scratch.Get "close-tag") "true"}}
</div>
{{ end }}
{{- end -}}
<div class = "col-md-6 col-lg-3 events-page-col">
<h4 class="events-page-months">{{ dateFormat "January" .startdate }}</h4>
{{- $.Scratch.Set "month-displayed" "true" -}}
{{ $.Scratch.Set "close-tag" "true" }}
{{- $.Scratch.Set "close-tag" "true" -}}
{{- end -}}
{{- if ne .startdate .enddate }}
{{- if eq (dateFormat "January" .startdate) (dateFormat "January" .enddate ) -}}
<a href = "/events/{{ .name }}/" class = "events-page-event">
<a href = "{{ (printf "events/%s" .name) | absURL }}" class = "events-page-event">
{{ dateFormat "Jan 2" .startdate }} - {{ dateFormat "2" .enddate }}:
{{ .city }}
</a><br />
{{- else -}}
<a href = "/events/{{ .name }}/" class = "events-page-event">
<a href = "{{ (printf "events/%s" .name) | absURL }}" class = "events-page-event">
{{ dateFormat "Jan 2" .startdate }} - {{ dateFormat "Jan 2" .enddate }}:
{{ .city }}
</a><br />
{{- end -}}
{{- else -}}
<a href = "/events/{{ .name }}/" class = "events-page-event">
<a href = "{{ (printf "events/%s" .name) | absURL }}" class = "events-page-event">
{{ dateFormat "Jan 2" .startdate }}:
{{ .city }}
</a><br />
Expand All @@ -60,13 +56,11 @@ <h4 class="events-page-months">{{ dateFormat "January" .startdate }}</h4>
<h4 class="events-page-months">TBD</h4>
{{- range $.Site.Data.events -}}
{{- if not .startdate -}}
<a href = "/events/{{ .name }}/" class = "events-page-event">{{ .city }}</a><br />
<a href = "{{ (printf "events/%s" .name) | absURL }}" class = "events-page-event">{{ .city }}</a><br />
{{- end -}}
{{- end -}}
</div>
</div>


{{ partial "past.html" . }}
{{- partial "past.html" . -}}

{{ end }}
Loading

0 comments on commit a95ff6f

Please sign in to comment.