ccchb/themen-hugo-35c3-reveal
ccchb
/
themen-hugo-35c3-reveal
mirror of https://dev.ccchb.de/genofire/themen-hugo-35c3-reveal.git
3
0
Fork 0
Code Releases Activity

Use $.Param and default function for cleaning config reading

This commit is contained in:
dzello 2018-08-07 18:02:47 +02:00
parent 51623a07af
commit f6a1568da1
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
exampleSite/config.toml
View File

@ -8,9 +8,6 @@ themesDir = "../"
[author] [author]
name = "Josh Dzielak" name = "Josh Dzielak"
[params]
description = "Includes a handy markdown-based syntax and shortcodes to help you get presentations done fast"
[params.reveal_hugo] [params.reveal_hugo]
history = true history = true

17
layouts/_default/baseof.reveal.html
View File

@ -1,26 +1,26 @@
<!doctype html> <!doctype html>
{{- $reveal_cdn := or .Page.Params.reveal_hugo.reveal_cdn .Site.Params.reveal_hugo.reveal_cdn "https://cdnjs.cloudflare.com/ajax/libs/reveal.js/3.6.0" -}} {{- $reveal_cdn := $.Param "reveal_hugo.reveal_cdn" | default "https://cdnjs.cloudflare.com/ajax/libs/reveal.js/3.6.0" -}}
{{- $highlight_cdn := or .Page.Params.reveal_hugo.highlight_cdn .Site.Params.reveal_hugo.highlight_cdn "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0" -}} {{- $highlight_cdn := $.Param "reveal_hugo.highlight_cdn" | default "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0" -}}
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>{{ or .Page.Title .Site.Title }}</title> <title>{{ or .Page.Title .Site.Title }}</title>
<meta name="description" content="{{ or .Page.Params.Description .Site.Params.Description }}"> {{ with $.Param "description" }}<meta name="description" content="{{ . }}">{{ end }}
<meta name="author" content="{{ .Site.Author.name }}"> {{ with .Site.Author.name }}<meta name="author" content="{{ . }}">{{ end }}
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
<link rel="stylesheet" href="{{ $reveal_cdn }}/css/reveal.min.css"> <link rel="stylesheet" href="{{ $reveal_cdn }}/css/reveal.min.css">
<!-- Theme used for presentation --> <!-- Theme used for presentation -->
{{- $theme := or .Page.Params.reveal_hugo.theme .Site.Params.reveal_hugo.theme .Site.Data.reveal_hugo.defaults.theme "black" -}} {{- $theme := $.Param "reveal_hugo.theme" | default "black" -}}
{{- $custom_theme := or .Page.Params.reveal_hugo.custom_theme .Site.Params.reveal_hugo.custom_theme -}} {{- $custom_theme := $.Param "reveal_hugo.custom_theme" -}}
{{- if $custom_theme -}} {{- if $custom_theme -}}
<link rel="stylesheet" href="{{ $custom_theme | relURL }}" id="theme"> <link rel="stylesheet" href="{{ $custom_theme | relURL }}" id="theme">
{{ else -}} {{ else -}}
<link rel="stylesheet" href="{{ $reveal_cdn }}/css/theme/{{ $theme }}.css" id="theme"> <link rel="stylesheet" href="{{ $reveal_cdn }}/css/theme/{{ $theme }}.css" id="theme">
{{- end -}} {{- end -}}
<!-- Theme used for syntax highlighting of code --> <!-- Theme used for syntax highlighting of code -->
{{- $highlight_theme := or .Page.Params.reveal_hugo.highlight_theme .Site.Params.reveal_hugo.highlight_theme .Site.Data.reveal_hugo.defaults.highlight_theme "default" -}} {{- $highlight_theme := $.Param "reveal_hugo.highlight_theme" | default "default" -}}
<link rel="stylesheet" href="{{ $highlight_cdn }}/styles/{{ $highlight_theme }}.min.css"> <link rel="stylesheet" href="{{ $highlight_cdn }}/styles/{{ $highlight_theme }}.min.css">
<!-- Printing and PDF exports --> <!-- Printing and PDF exports -->
<script> <script>
@ -30,9 +30,6 @@
link.href = window.location.search.match( /print-pdf/gi ) ? '{{ $reveal_cdn}}/css/print/pdf.css' : '{{ $reveal_cdn }}/css/print/paper.css'; link.href = window.location.search.match( /print-pdf/gi ) ? '{{ $reveal_cdn}}/css/print/pdf.css' : '{{ $reveal_cdn }}/css/print/paper.css';
document.getElementsByTagName( 'head' )[0].appendChild( link ); document.getElementsByTagName( 'head' )[0].appendChild( link );
</script> </script>
<!--[if lt IE 9]>
<script src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.js"></script>
<![endif]-->
<!-- To insert markup before the closing head tag, create layouts/partials/reveal-hugo/head.html --> <!-- To insert markup before the closing head tag, create layouts/partials/reveal-hugo/head.html -->
{{- partial "reveal-hugo/head" . -}} {{- partial "reveal-hugo/head" . -}}
</head> </head>