Skip to content

Commit be07753

Browse files
rozzarozza
authored
Docs: Update for latest Hugo and fix whitespace (#402)
JAVA-2518
1 parent 9fb72e9 commit be07753

File tree

32 files changed

+347
-333
lines changed

32 files changed

+347
-333
lines changed

‎docs/landing/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
The static front page site for the Java documentation portal.
44

55
## Requirements
6-
Hugo version 0.13 [download here](https://github.com/spf13/hugo/releases/tag/v0.13)
6+
Hugo version 0.21 [download here](https://github.com/spf13/hugo/releases/tag/v0.21)
77
<br>
88
Check out the hugo [quickstart guide](http://gohugo.io/overview/quickstart/).
99

‎docs/landing/config.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,7 @@ baseurl = "/mongo-java-driver/"
22
languageCode = "en-us"
33
title = "MongoDB Java Driver"
44
canonifyurls = false
5+
disableHugoGeneratorInject = true
6+
disableKinds = ["section", "taxonomy", "taxonomyTerm", "404"]
57

68
githubRepo = "mongo-java-driver"

‎docs/landing/layouts/404.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
{{ partial "meta.html"}}
5-
<link rel="shortcut icon" href="{{.Site.BaseUrl}}/img/favicon.png">
5+
<link rel="shortcut icon" href="{{.Site.BaseURL}}/img/favicon.png">
66

77
<title>{{.Title}}</title>
88

‎docs/landing/layouts/index.html

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4-
{{ partial "meta.html"}}
5-
<link rel="shortcut icon" href="{{.Site.BaseUrl}}/s/img/favicon.png">
4+
{{- partial "meta.html" -}}
5+
<link rel="shortcut icon" href="{{.Site.BaseURL}}/s/img/favicon.png">
66

77
<title>{{.Title}}</title>
88

9-
{{ partial "assets/css.html" . }}
9+
{{- partial "assets/css.html" . -}}
1010
</head>
1111

1212
<body>
1313
<!--header start-->
14-
{{ partial "header/main.html" . }}
14+
{{- partial "header/main.html" . -}}
1515
<!--header end-->
1616

17-
{{ partial "hero.html" . }}
17+
{{- partial "hero.html" . -}}
1818

1919
<!-- Main content -->
2020
<div class="container" id="mainContent">
2121
<div class="row">
2222
<div class="col-md-8">
23-
{{ partial "introduction.html" . }}
23+
{{- partial "introduction.html" . -}}
2424

25-
{{ partial "features.html" . }}
25+
{{- partial "features.html" . -}}
2626

27-
{{ partial "quickStart.html" . }}
27+
{{- partial "quickStart.html" . -}}
2828
</div>
2929
<div class="col-md-4">
30-
{{ partial "releases.html" . }}
31-
{{ partial "mongodbUniversity.html" . }}
30+
{{- partial "releases.html" . -}}
31+
{{- partial "mongodbUniversity.html" . -}}
3232
</div>
3333
</div>
3434
</div>
@@ -38,15 +38,15 @@
3838
<div class="container">
3939
<div class="row">
4040
<div class="col-md-12">
41-
{{ partial "footer.html" .}}
41+
{{- partial "footer.html" . -}}
4242
</div>
4343
</div>
4444
</div>
4545
<!-- End footer -->
4646

4747

4848
<!-- javascripts -->
49-
{{ partial "assets/javascripts.html" . }}
50-
{{ partial "assets/analytics.html" . }}
49+
{{- partial "assets/javascripts.html" . -}}
50+
{{- partial "assets/analytics.html" . -}}
5151
</body>
5252
</html>

‎docs/landing/layouts/partials/assets/css.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<link rel="stylesheet" href="{{.Site.BaseUrl}}/s/lib/bootstrap.min.css" type="text/css" />
2-
<link rel="stylesheet" href="{{.Site.BaseUrl}}/s/lib/font-awesome/css/font-awesome.min.css" type="text/css" />
3-
<link rel="stylesheet" href="{{.Site.BaseUrl}}/s/lib/highlight/styles/vs.css" type="text/css" />
4-
<link rel="stylesheet" href="{{.Site.BaseUrl}}/s/lib/bootstrap-select/bootstrap-select.min.css" type="text/css" />
5-
<link rel="stylesheet" href="{{.Site.BaseUrl}}/s/lib/bootstrap-toggle/bootstrap-toggle.min.css" type="text/css" />
6-
<link rel="stylesheet" href="{{.Site.BaseUrl}}/s/css/frontpage.css" type="text/css" />
1+
<link rel="stylesheet" href="{{.Site.BaseURL}}/s/lib/bootstrap.min.css" type="text/css" />
2+
<link rel="stylesheet" href="{{.Site.BaseURL}}/s/lib/font-awesome/css/font-awesome.min.css" type="text/css" />
3+
<link rel="stylesheet" href="{{.Site.BaseURL}}/s/lib/highlight/styles/vs.css" type="text/css" />
4+
<link rel="stylesheet" href="{{.Site.BaseURL}}/s/lib/bootstrap-select/bootstrap-select.min.css" type="text/css" />
5+
<link rel="stylesheet" href="{{.Site.BaseURL}}/s/lib/bootstrap-toggle/bootstrap-toggle.min.css" type="text/css" />
6+
<link rel="stylesheet" href="{{.Site.BaseURL}}/s/css/frontpage.css" type="text/css" />

‎docs/landing/layouts/partials/assets/javascripts.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<script type="text/javascript" src="{{.Site.BaseUrl}}/s/js/jquery.js"></script>
2-
<script type="text/javascript" src="{{.Site.BaseUrl}}/s/lib/bootstrap.js"></script>
3-
<script type="text/javascript" src="{{.Site.BaseUrl}}/s/lib/highlight/highlight.pack.js"></script>
4-
<script type="text/javascript" src="{{.Site.BaseUrl}}/s/lib/bootstrap-select/bootstrap-select.min.js"></script>
5-
<script type="text/javascript" src="{{.Site.BaseUrl}}/s/lib/bootstrap-toggle/bootstrap-toggle.min.js"></script>
6-
<script type="text/javascript" src="{{.Site.BaseUrl}}/s/lib/zeroclipboard/ZeroClipboard.min.js"></script>
7-
<script type="text/javascript" src="{{.Site.BaseUrl}}/s/js/frontpage.js"></script>
1+
<script type="text/javascript" src="{{.Site.BaseURL}}/s/js/jquery.js"></script>
2+
<script type="text/javascript" src="{{.Site.BaseURL}}/s/lib/bootstrap.js"></script>
3+
<script type="text/javascript" src="{{.Site.BaseURL}}/s/lib/highlight/highlight.pack.js"></script>
4+
<script type="text/javascript" src="{{.Site.BaseURL}}/s/lib/bootstrap-select/bootstrap-select.min.js"></script>
5+
<script type="text/javascript" src="{{.Site.BaseURL}}/s/lib/bootstrap-toggle/bootstrap-toggle.min.js"></script>
6+
<script type="text/javascript" src="{{.Site.BaseURL}}/s/lib/zeroclipboard/ZeroClipboard.min.js"></script>
7+
<script type="text/javascript" src="{{.Site.BaseURL}}/s/js/frontpage.js"></script>

‎docs/landing/layouts/partials/footer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="footer">
22
<div class="copyright">
3-
<p>Copyright © 2008-2016 <a class="smalltext" href="http://www.mongodb.com">MongoDB, Inc</a>.
3+
<p>Copyright © 2008-2017 <a class="smalltext" href="http://www.mongodb.com">MongoDB, Inc</a>.
44
MongoDB, Mongo, and the leaf logo are registered trademarks of MongoDB, Inc.
55
</p>
66
</div>

‎docs/landing/layouts/partials/header/main.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<div class="header-content">
33
<!--logo start-->
44
<div class="logo pull-left">
5-
<a href="{{.Site.BaseUrl}}">
6-
<img src="{{.Site.BaseUrl}}/s/img/logo-mongodb-header.png", alt="MongoDB.org" />
5+
<a href="{{.Site.BaseURL}}">
6+
<img src="{{.Site.BaseURL}}/s/img/logo-mongodb-header.png", alt="MongoDB.org" />
77
</a>
88
</div>
99
<!--logo end-->

‎docs/landing/layouts/partials/hero.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@ <h2>MongoDB Java Driver</h2>
88
The next generation Java driver for MongoDB
99
</p>
1010
<p>
11-
{{ range where $.Site.Data.releases.versions "version" $.Site.Data.releases.current }}{{ $.Scratch.Set "qs.currentReleasedVersion" . }}{{end }}
12-
{{$currentReleasedVersion := $.Scratch.Get "qs.currentReleasedVersion"}}
11+
{{- range where $.Site.Data.releases.versions "version" $.Site.Data.releases.current -}}
12+
{{- $.Scratch.Set "qs.currentReleasedVersion" . -}}
13+
{{- end -}}
14+
{{- $currentReleasedVersion := $.Scratch.Get "qs.currentReleasedVersion" -}}
1315
<a href="{{$currentReleasedVersion.docs}}" class="btn btn-success btn-dark btn-mongo">Latest documentation</a>
1416
</p>
1517

‎docs/landing/layouts/partials/quickStart.html

Lines changed: 53 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -8,37 +8,41 @@ <h2 id="quickStart">Quick Start</h2>
88
Alternatively, head over to our documentation to learn more about getting started with Java and MongoDB.
99
</p>
1010

11-
{{ range where $.Site.Data.releases.versions "version" $.Site.Data.releases.current }}{{ $.Scratch.Set "qs.currentReleasedVersion" . }}{{end }}
12-
{{$currentReleasedVersion := $.Scratch.Get "qs.currentReleasedVersion"}}
11+
{{- range where $.Site.Data.releases.versions "version" $.Site.Data.releases.current -}}
12+
{{- $.Scratch.Set "qs.currentReleasedVersion" . -}}
13+
{{- end -}}
14+
{{- $currentReleasedVersion := $.Scratch.Get "qs.currentReleasedVersion" -}}
1315

1416
<div id="downloadWidget">
1517
<div class="container">
1618
<div class="row downloadForm">
1719
<form>
1820
<div class="col-xs-5 col-lg-4 col-lg-push-2 ">
19-
{{ $.Scratch.Set "qs.pos" 0 }}
20-
{{ $.Scratch.Set "qs.firstDriver" false }}
21-
{{ with $.Site.Data.releases.drivers }}
21+
{{- $.Scratch.Set "qs.pos" 0 -}}
22+
{{- $.Scratch.Set "qs.firstDriver" false -}}
23+
{{- with $.Site.Data.releases.drivers -}}
2224
<select class="driverPicker">
23-
{{ range . }}
24-
{{ if eq ($.Scratch.Get "qs.firstDriver") false }}{{ $.Scratch.Set "qs.firstDriver" . }}{{end}}
25-
<option value="{{$.Scratch.Get "qs.pos"}}" data-versions="{{.versions}}">{{.name}}</option>
26-
{{ $.Scratch.Add "qs.pos" 1 }}
27-
{{ end }}
25+
{{- range . -}}
26+
{{- if eq ($.Scratch.Get "qs.firstDriver") false -}}
27+
{{- $.Scratch.Set "qs.firstDriver" . -}}
28+
{{- end -}}
29+
<option value="{{$.Scratch.Get "qs.pos"}}" data-versions="{{.versions}}">{{.name}}</option>
30+
{{- $.Scratch.Add "qs.pos" 1 -}}
31+
{{- end -}}
2832
</select>
29-
{{ end }}
33+
{{- end -}}
3034
</div>
3135
<div class="col-xs-5 col-lg-4 col-lg-push-2 ">
32-
{{ $.Scratch.Set "qs.pos" 0 }}
33-
{{ $firstDriver := $.Scratch.Get "qs.firstDriver"}}
34-
{{ with $.Site.Data.releases.versions }}
36+
{{- $.Scratch.Set "qs.pos" 0 -}}
37+
{{- $firstDriver := $.Scratch.Get "qs.firstDriver" -}}
38+
{{- with $.Site.Data.releases.versions -}}
3539
<select class="releasePicker">
36-
{{ range . }}
37-
<option value="{{$.Scratch.Get "qs.pos"}}" {{ if eq (in $firstDriver.versions .version) false }}disabled="disabled"{{else if eq .status "current"}}selected{{end}}>{{.version}}</option>
38-
{{ $.Scratch.Add "qs.pos" 1 }}
39-
{{ end }}
40+
{{- range . -}}
41+
<option value="{{$.Scratch.Get "qs.pos"}}" {{ if eq (in $firstDriver.versions .version) false }}disabled="disabled"{{else if eq .status "current"}}selected{{end}}>{{.version}}</option>
42+
{{- $.Scratch.Add "qs.pos" 1 -}}
43+
{{- end -}}
4044
</select>
41-
{{ end }}
45+
{{- end -}}
4246
</div>
4347
<div class="col-lg-2 col-lg-push-2 ">
4448
<input type="checkbox" checked class="distroPicker" data-toggle="toggle" data-on="Maven" data-off="Gradle" data-offstyle="success">
@@ -55,21 +59,21 @@ <h2 id="quickStart">Quick Start</h2>
5559
<div class="clipboard" title="copy">
5660
<button class="btn btn-dark"><i class="fa fa-clipboard fa-2"></i></button>
5761
</div>
58-
{{ $currentNode := . }}
59-
{{ $.Scratch.Set "qs.firstDriver" true }}
60-
{{ with $currentNode.Site.Data.releases.drivers }}
61-
{{ $.Scratch.Set "qs.driverPos" 0 }}
62-
{{ range . }}
63-
{{ $currentDriver := . }}
64-
{{ with $.Site.Data.releases.versions }}
65-
{{ $.Scratch.Set "qs.versionPos" 0 }}
66-
{{ range . }}
67-
{{ $currentVersion := . }}
68-
{{ $firstDriver := $.Scratch.Get "qs.firstDriver"}}
69-
{{ $driverPos := $.Scratch.Get "qs.driverPos" }}
70-
{{ $versionPos := $.Scratch.Get "qs.versionPos" }}
71-
{{ if in $currentDriver.versions $currentVersion.version }}
72-
{{ if in $currentVersion.version "SNAPSHOT" }}
62+
{{- $currentNode := . -}}
63+
{{- $.Scratch.Set "qs.firstDriver" true -}}
64+
{{- with $currentNode.Site.Data.releases.drivers -}}
65+
{{- $.Scratch.Set "qs.driverPos" 0 -}}
66+
{{- range . -}}
67+
{{- $currentDriver := . -}}
68+
{{- with $.Site.Data.releases.versions -}}
69+
{{- $.Scratch.Set "qs.versionPos" 0 -}}
70+
{{- range . -}}
71+
{{- $currentVersion := . -}}
72+
{{- $firstDriver := $.Scratch.Get "qs.firstDriver" -}}
73+
{{- $driverPos := $.Scratch.Get "qs.driverPos" -}}
74+
{{- $versionPos := $.Scratch.Get "qs.versionPos" -}}
75+
{{- if in $currentDriver.versions $currentVersion.version -}}
76+
{{- if in $currentVersion.version "SNAPSHOT" -}}
7377
<div id="maven-{{$versionPos}}-{{$driverPos}}" class="download {{if or (ne $firstDriver true) (ne $currentVersion.status "current") }} hidden{{end}}">
7478
<pre><code>
7579
&lt;dependencies&gt;
@@ -104,8 +108,8 @@ <h2 id="quickStart">Quick Start</h2>
104108
}
105109
</code></pre>
106110
</div>
107-
{{ else }}
108-
<div id="maven-{{$versionPos}}-{{$driverPos}}" class="download {{if or (ne $firstDriver true) (ne $currentVersion.status "current") }} hidden{{end}}">
111+
{{- else -}}
112+
<div id="maven-{{$versionPos}}-{{$driverPos}}" class="download {{ if or (ne $firstDriver true) (ne $currentVersion.status "current") }} hidden{{end}}">
109113
<pre><code>
110114
&lt;dependencies&gt;
111115
&lt;dependency&gt;
@@ -126,21 +130,21 @@ <h2 id="quickStart">Quick Start</h2>
126130

127131
</code></pre>
128132
</div>
129-
{{ end }}
130-
{{ if eq $currentVersion.status "current" }}
131-
{{ $.Scratch.Set "qs.firstDriver" false }}
132-
{{end}}
133-
{{ $.Scratch.Add "qs.versionPos" 1 }}
134-
{{ end }}
135-
{{ end }}
136-
{{ end }}
137-
{{ $driverPos := $.Scratch.Get "qs.driverPos" }}
133+
{{- end -}}
134+
{{- if eq $currentVersion.status "current" -}}
135+
{{- $.Scratch.Set "qs.firstDriver" false -}}
136+
{{- end -}}
137+
{{- $.Scratch.Add "qs.versionPos" 1 -}}
138+
{{- end -}}
139+
{{- end -}}
140+
{{- end -}}
141+
{{- $driverPos := $.Scratch.Get "qs.driverPos" -}}
138142
<div id="driver-{{$driverPos}}" class="download description{{if ne $driverPos 0}} hidden{{end}}">
139-
{{$currentDriver.description | markdownify}}
143+
{{- $currentDriver.description | markdownify -}}
140144
</div>
141-
{{ $.Scratch.Add "qs.driverPos" 1 }}
142-
{{ end }}
143-
{{ end }}
145+
{{- $.Scratch.Add "qs.driverPos" 1 -}}
146+
{{- end -}}
147+
{{- end -}}
144148
</div>
145149
</div>
146150
</div>

0 commit comments

Comments
 (0)