adding files, fixed github pull

This commit is contained in:
Jeremy Kidwell 2017-06-28 14:19:10 +01:00
parent 131ce4af86
commit ea8198b941
15 changed files with 176 additions and 73 deletions

View file

@ -23,6 +23,8 @@
<div class="wrapper">
<div class="units-row">
<!-- First Column -->
<div class="unit-66">
<div class="units-row-end">
<div class="unit-33 dateblock">
@ -47,18 +49,16 @@
{{ end }}
</div>
</div>
{{ end }}
<hr>
<div class="units-row-end">
<div class="unit-33 dateblock">&nbsp;</div>
</div>
</div>
<!-- Second Column -->
<div class="unit-33">
<!-- First Pane -->
<h3>Recent Papers</h3>
<ul class="compact fa-ul">
{{ range first 5 (where .Data.Pages.ByDate "Section" "publications").Reverse }}
@ -68,14 +68,14 @@
</li>
{{ end }}
</ul>
<footer class="group">
<nav class="navbar navbar-right"><a href="/publications">&rarr; More Papers</a></nav>
</footer>
<!-- Second Pane -->
<h3>Recent &amp; Upcoming Presentations</h3>
<ul class="compact fa-ul">
{{ range (where .Data.Pages.ByDate "Section" "presentation").Reverse }}
{{ range (where .Data.Pages.ByDate "Section" "presentations").Reverse }}
{{ if (ge .Date.Unix .Now.Unix) }}
{{ if (le .Date.Unix (add .Now.Unix 10368000)) }}
<li><i class="fa-li fa fa-comment-o fa-fw" style="color:#b00;font-size:80%;padding-top:6px;"></i><a href="{{ .Permalink }}"><em>{{ .Title | safeHTML }}</em></a>, {{ .Params.host | safeHTML }} ({{ .Date.Format "2 January 2006" }}). {{ partial "comingsoon.html" . }}
@ -90,12 +90,10 @@
{{ end }}
{{ end }}
</ul>
<footer class="group">
<nav class="navbar navbar-right"><a href="/presentations">&rarr; More Presentations</a></nav>
</footer>
<!-- Third Pane -->
<h3>Current Teaching</h3>
<ul class="compact fa-ul">
{{ range (where .Data.Pages.ByDate "Section" "teaching").Reverse }}
@ -106,7 +104,6 @@
{{ end }}
{{ end }}
{{ end }}
{{ range (where .Data.Pages.ByDate "Section" "teaching").Reverse }}
{{ if (le .Date.Unix now.Unix) }}
{{ if (le now.Unix (add .Date.Unix .Params.duration)) }}
@ -119,17 +116,16 @@
{{ $classend := (add .Date.Unix .Params.duration) }}
{{ if (ge now.Unix $classend ) }}
{{ if (le now.Unix (add $classend 10368000)) }}
<li><i class="fa-li fa fa-mortar-board fa-fw" style="color:#03396c;font-size:80%;padding-top:6px;"></i><a href="{{ .Permalink }}"><span class="caps">{{ .Title }}</span></a>, {{ .Date.Format "January" }}&ndash;{{ .Params.enddate | dateFormat "January 2006" }}. <span class="badge badge-small">completed</span>
</li>
{{ end }}
{{ end }}
{{ end }}
</ul>
<footer class="group">
<nav class="navbar navbar-right"><br /><a href="/teaching">&rarr; Other Classes</a></nav>
</footer>
<!-- End of third pane -->
</div>
</div>