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

Merge Edge with sort and resize #2

Merged
alfred merged 64 commits from edge into master 2022-07-28 01:51:14 +01:00
Conversation 0 Commits 64 Files Changed 16 +17 -10
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 845105d8e6 - Show all commits

4
base.css
View File

@ -17,7 +17,9 @@ main{
text-align: center; text-align: center;
} }
.content > p{ .content > p{
word-break: break-all; word-break: break-word;
-ms-word-wrap: break-word;
word-wrap: break-word;
margin-top: 0.5em; margin-top: 0.5em;
margin-bottom: 0.5em; margin-bottom: 0.5em;
} }

4
goinfo.go.html
View File

@ -18,7 +18,9 @@
text-align: left; text-align: left;
border: black 1px solid; border: black 1px solid;
border-collapse: collapse; border-collapse: collapse;
word-break: break-all; word-break: break-word;
-ms-word-wrap: break-word;
word-wrap: break-word;
} }
table, td { table, td {
background-color: lightgray; background-color: lightgray;

16
index.go.html
View File

@ -16,14 +16,14 @@
<body> <body>
<header class="header"> <header class="header">
{{ if .Light }} {{ if .Light }}
<a href="?light" class="home-button no-dec"><div><b>&#8962;</b></div></a> <a href="?light" class="home-button no-dec"><div><img src="{{ .Data.LogoImageLocation }}" width="64px" alt="&#8962;"></div></a>
<a href="?{{ .Parameters }}" class="home-button no-dec"><div><b>&#9790;</b></div></a> <a href="?{{ .Parameters }}" class="home-button no-dec"><div><img src="{{ .Data.MoonImageLocation }}" width="64px" alt='{{ "{" }}'></div></a>
{{ else }} {{ else }}
<a href="?" class="home-button no-dec"><div><b>&#8962;</b></div></a> <a href="?" class="home-button no-dec"><div><img src="{{ .Data.LogoImageLocation }}" width="64px" alt="&#8962;"></div></a>
{{ if eq .Parameters "" }} {{ if eq .Parameters "" }}
<a href="?light" class="home-button no-dec"><div><b>&#9737;</b></div></a> <a href="?light" class="home-button no-dec"><div><img src="{{ .Data.SunImageLocation }}" width="64px" alt='()'></div></a>
{{ else }} {{ else }}
<a href="?light&{{ .Parameters }}" class="home-button no-dec"><div><b>&#9737;</b></div></a> <a href="?light&{{ .Parameters }}" class="home-button no-dec"><div><img src="{{ .Data.SunImageLocation }}" width="64px" alt='()'></div></a>
{{ end }} {{ end }}
{{ end }} {{ end }}
<input class="sort-menu" type="checkbox" id="sort-menu"/> <input class="sort-menu" type="checkbox" id="sort-menu"/>
@ -81,9 +81,9 @@
<div class="item-table-360"> <div class="item-table-360">
<div> <div>
{{ if eq .VideoLocation "" }} {{ if eq .VideoLocation "" }}
<img src="{{ $.Data.NoVideoImageLocation }}" alt="No Video" width="360"> <img src="{{ $.Data.NoVideoImageLocation }}" alt="No Video" width="360px">
{{ else }} {{ else }}
<video controls width="360"> <video controls width="360px">
<source src="{{ .VideoLocation }}" type="{{ .VideoContentType }}"> <source src="{{ .VideoLocation }}" type="{{ .VideoContentType }}">
<a href="{{ .VideoLocation }}">The Video</a> <a href="{{ .VideoLocation }}">The Video</a>
</video> </video>
@ -95,7 +95,7 @@
<div class="item-table-caption"> <div class="item-table-caption">
<div class="image-box"> <div class="image-box">
{{ range .GetImages }} {{ range .GetImages }}
<a href="{{ .ImageLocation }}"><img src="{{ .ThumbnailLocation }}" alt="{{ .ImageAltText }}" width="240"></a> <a href="{{ .ImageLocation }}"><img src="{{ .ThumbnailLocation }}" alt="{{ .ImageAltText }}" width="240px"></a>
{{ end }} {{ end }}
</div> </div>
</div> </div>

3
pageHandler/pages/index/data.go
View File

@ -9,6 +9,9 @@ type DataYaml struct {
CSSDarkURL template.URL `yaml:"cssDarkURL"` CSSDarkURL template.URL `yaml:"cssDarkURL"`
JScriptURL template.URL `yaml:"jScriptURL"` JScriptURL template.URL `yaml:"jScriptURL"`
NoVideoImageLocation template.URL `yaml:"noVideoImageLocation"` NoVideoImageLocation template.URL `yaml:"noVideoImageLocation"`
LogoImageLocation template.URL `yaml:"logoImageLocation"`
SunImageLocation template.URL `yaml:"sunImageLocation"`
MoonImageLocation template.URL `yaml:"moonImageLocation"`
About AboutYaml `yaml:"about"` About AboutYaml `yaml:"about"`
Entries []EntryYaml `yaml:"entries"` Entries []EntryYaml `yaml:"entries"`
} }