Merge branch 'master' of ssh://git.paulbsd.com:2222/paulbsd/website

This commit is contained in:
Paul 2020-02-09 14:49:58 +01:00
commit bb992fd19f
24 changed files with 228 additions and 230 deletions

View File

@ -1,5 +1,5 @@
baseurl = "//www.paulbsd.com/" baseurl = "//www.paulbsd.com/"
languageCode = "en-us" languageCode = "en-gb"
title = "PaulBSD website" title = "PaulBSD website"
googleAnalytics = "" googleAnalytics = ""
paginate = 10 paginate = 10

View File

@ -5,7 +5,7 @@
<div class="outer"> <div class="outer">
{{ partial "single_article" . }} {{ partial "single_article" . }}
{{ partial "sidebar" . }} {{ partial "sidebar" . }}
</div> </div>
</div> </div>
{{ partial "footer" . }} {{ partial "footer" . }}

View File

@ -4,11 +4,11 @@
<div id="container"> <div id="container">
<div class="outer"> <div class="outer">
<div id="cal-heatmap"></div> <div id="cal-heatmap"></div>
<div id="example-heatmap"></div> <div id="example-heatmap"></div>
<script type="text/javascript"> <script type="text/javascript">
var cal = new CalHeatMap(); var cal = new CalHeatMap();
cal.init({ cal.init({
itemSelector: "#example-heatmap", itemSelector: "#example-heatmap",
domain: "week", domain: "week",
subDomain: "hour", subDomain: "hour",
@ -20,7 +20,7 @@
nextSelector: "#example-c-NextDomain-selector", nextSelector: "#example-c-NextDomain-selector",
legend: [2, 4, 6, 8], legend: [2, 4, 6, 8],
tooltip: true tooltip: true
}); });
</script> </script>
<div id="blog-archives" class="category"> <div id="blog-archives" class="category">
{{ .Content }} {{ .Content }}

View File

@ -1,22 +1,17 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="{{ with .Site.LanguageCode }}{{ . }}{{ else }}en-US{{ end }}"> <html lang="{{ with .Site.LanguageCode }}{{ . }}{{ else }}en-US{{ end }}">
{{ partial "head" . }} {{ partial "head" . }}
<body>
<body>
<div class="container"> <div class="container">
<div id="container"> <div id="container">
{{ partial "header" . }} {{ partial "header" . }}
<!--{{ partial "home" . }}--> <!--{{ partial "home" . }}-->
<div class="outer"> <div class="outer">
{{ partial "article_list" . }} {{ partial "article_list" . }}
{{ partial "sidebar" . }} {{ partial "sidebar" . }}
</div> </div>
</div> </div>
</div> </div>
{{ partial "footer" . }} {{ partial "footer" . }}
</body> </body>
</html> </html>

View File

@ -5,7 +5,7 @@
&copy; {{ now.Format "2006" }} <a href="https://git.paulbsd.com/paulbsd">paulbsd</a>. <br> &copy; {{ now.Format "2006" }} <a href="https://git.paulbsd.com/paulbsd">paulbsd</a>. <br>
{{ with .Site.Params.copyright }}{{ . | markdownify}}{{ end }} {{ with .Site.Params.copyright }}{{ . | markdownify}}{{ end }}
</footer> </footer>
<footer id="footer-right"> <a href="">Reference</a><a href="">Command</a></footer> <footer id="footer-right"> <a href="">Reference</a><a href="">Command</a><a id="dip"></a></footer>
</div> </div>
</div> </div>
</footer> </footer>

View File

@ -16,7 +16,7 @@
</script> </script>
<script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script> <script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
<!-- <!--
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script> <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
--> -->
<script type="text/javascript" src="https://raw.githubusercontent.com/jeresig/jquery.hotkeys/master/jquery.hotkeys.js"> <script type="text/javascript" src="https://raw.githubusercontent.com/jeresig/jquery.hotkeys/master/jquery.hotkeys.js">
</script> </script>

View File

@ -1,5 +1,5 @@
<li> <li>
<a href="https://git.paulbsd.com/"> <a href="https://git.paulbsd.com/paulbsd">
<i class="fa fa-git" aria-hidden="true"></i> <i class="fa fa-git" aria-hidden="true"></i>
</a> </a>
</li> </li>

View File

@ -1,7 +1,7 @@
<form class="navbar-form navbar-left" role="search" action="#" method="get"> <form class="navbar-form navbar-left" role="search" action="#" method="get">
<input type="hidden" value="syui.gitlab.io"> <input type="hidden" value="syui.gitlab.io">
<div class="form-group"> <div class="form-group">
<input type="text" class="form-control" placeholder="" name="q"> <input type="text" class="form-control" placeholder="" name="q">
</div> </div>
<button type="submit" class="btn btn-default"><i class="fa fa-search"></i></button> <button type="submit" class="btn btn-default"><i class="fa fa-search"></i></button>
</form> </form>

View File

@ -1,4 +1,4 @@
<div class="navbar-header"> <div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" <button type="button" class="navbar-toggle collapsed" data-toggle="collapse"
data-target="#bs-example-navbar-collapse-1" aria-expanded="false"> data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
<span class="sr-only">Toggle navigation</span> <span class="sr-only">Toggle navigation</span>
@ -11,4 +11,4 @@
<span id="title">PaulBSD</span> <span id="title">PaulBSD</span>
</a> </a>
</h1> </h1>
</div> </div>

View File

@ -10,7 +10,10 @@ function main() {
'Accept': 'application/json', 'Accept': 'application/json',
}, },
dataType: 'json', dataType: 'json',
}).done(function(data){ console.log(transformIPInfo(data)) }); }).done(function(data) {
var dip = $('#dip');
dip[0].text = data.ip;
});
return jqxhr; return jqxhr;
} }