alfred/cityuni-webserver
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge Edge with data #1

Merged
alfred merged 49 commits from edge into master 2022-07-27 14:13:41 +01:00
Conversation 0 Commits 49 Files Changed 16 +19 -14
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8f35dc92cf - Show all commits

15
base.css
View File

@ -115,30 +115,31 @@ main{
background-color: transparent; background-color: transparent;
box-sizing: inherit; box-sizing: inherit;
} }
.item-table-full, .item-table-240{ .item-table-full, .item-table-360{
border-style: solid; border-style: solid;
border-width: 1px; border-width: 1px;
background-color: transparent; background-color: transparent;
vertical-align: top;
box-sizing: inherit; box-sizing: inherit;
} }
.item-table-full{ .item-table-full{
display: table-cell; display: table-cell;
vertical-align: top;
width: 100%; width: 100%;
} }
.item-table-240{ .item-table-360{
display: none; display: none;
} }
@media (min-width: 320px){ @media (min-width: 360px){
.main-table > div > div > div{ .main-table > div > div > div{
margin: 5px; margin: 5px;
} }
.item-table-240{ .item-table-360{
display: table-cell; display: table-cell;
width: 240px; vertical-align: middle;
width: 360px;
} }
} }
@media (min-width: 480px){ @media (min-width: 570px){
.nav{ .nav{
max-height: none; max-height: none;
top: 0; top: 0;

16
index.go.html
View File

@ -35,7 +35,7 @@
<div class="item-table-full"> <div class="item-table-full">
<div class="centered padded-2px"><h1>{{ .Data.About.Title }}</h1></div> <div class="centered padded-2px"><h1>{{ .Data.About.Title }}</h1></div>
</div> </div>
<div class="item-table-240"> <div class="item-table-360">
<div class="centered padded-2px"><h4>Email: <a href="mailto:{{ .Data.About.ContactEmail }}">{{ .Data.About.ContactEmail }}</a></h4></div> <div class="centered padded-2px"><h4>Email: <a href="mailto:{{ .Data.About.ContactEmail }}">{{ .Data.About.ContactEmail }}</a></h4></div>
</div> </div>
</div> </div>
@ -43,8 +43,8 @@
<div class="item-table-full"> <div class="item-table-full">
<div class="padded-2px">{{ .Data.About.GetContent }}</div> <div class="padded-2px">{{ .Data.About.GetContent }}</div>
</div> </div>
<div class="item-table-240"> <div class="item-table-360">
<div><a href="{{ .Data.About.ImageLocation }}"><img src="{{ .Data.About.ThumbnailLocation }}" alt="Image of Me." width="240px"></a></div> <div><a href="{{ .Data.About.ImageLocation }}"><img src="{{ .Data.About.ThumbnailLocation }}" alt="Image of Me." width="360px"></a></div>
</div> </div>
</div> </div>
</div> </div>
@ -60,16 +60,20 @@
<div class="item-table-full"> <div class="item-table-full">
<div class="centered padded-2px"><h1>{{ .Name }}</h1></div> <div class="centered padded-2px"><h1>{{ .Name }}</h1></div>
</div> </div>
<div class="item-table-240"> <div class="item-table-360">
{{ if eq .GetStartDate .GetEndDate }}
<div class="centered padded-2px"><h4>{{ .GetStartDate }}</h4></div>
{{ else }}
<div class="centered padded-2px"><h4>{{ .GetStartDate }} - {{ .GetEndDate }}</h4></div> <div class="centered padded-2px"><h4>{{ .GetStartDate }} - {{ .GetEndDate }}</h4></div>
{{ end }}
</div> </div>
</div> </div>
<div> <div>
<div class="item-table-full"> <div class="item-table-full">
<div class="padded-2px">{{ .GetContent }}</div> <div class="padded-2px">{{ .GetContent }}</div>
</div> </div>
<div class="item-table-240"> <div class="item-table-360">
<div><video controls="" width="240"> <div><video controls="" width="360">
<source src="{{ .VideoLocation }}" type="{{ .VideoContentType }}"> <source src="{{ .VideoLocation }}" type="{{ .VideoContentType }}">
</video></div> </video></div>
</div> </div>

2
pageHandler/pages/index/entry.go
View File

@ -6,7 +6,7 @@ import (
"time" "time"
) )
const dateFormat = "2006-01" const dateFormat = "01-2006"
type EntryYaml struct { type EntryYaml struct {
Name string `yaml:"name"` Name string `yaml:"name"`