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 +34 -29
5 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7d68f0be91 - Show all commits

14
pageHandler/pages/index/about.go
View File

@ -8,13 +8,13 @@ import (
) )
type AboutYaml struct { type AboutYaml struct {
Title string `yaml:"title"` Title string `yaml:"title"`
Content string `yaml:"content"` Content string `yaml:"content"`
ThumbnailLocation string `yaml:"thumbnailLocation"` ThumbnailLocation template.URL `yaml:"thumbnailLocation"`
ImageLocation string `yaml:"imageLocation"` ImageLocation template.URL `yaml:"imageLocation"`
ImageAltText string `yaml:"imageAltText"` ImageAltText string `yaml:"imageAltText"`
BirthYear int `yaml:"birthYear"` BirthYear int `yaml:"birthYear"`
ContactEmail string `yaml:"contactEmail"` ContactEmail string `yaml:"contactEmail"`
} }
func (ay AboutYaml) GetContent() template.HTML { func (ay AboutYaml) GetContent() template.HTML {

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

@ -1,13 +1,15 @@
package index package index
import "html/template"
type DataYaml struct { type DataYaml struct {
HeaderLinks map[string]string `yaml:"headerLinks"` HeaderLinks map[string]template.URL `yaml:"headerLinks"`
CSSBaseURL string `yaml:"cssBaseURL"` CSSBaseURL template.URL `yaml:"cssBaseURL"`
CSSLightURL string `yaml:"cssLightURL"` CSSLightURL template.URL `yaml:"cssLightURL"`
CSSDarkURL string `yaml:"cssDarkURL"` CSSDarkURL template.URL `yaml:"cssDarkURL"`
JScriptURL string `yaml:"jScriptURL"` JScriptURL template.URL `yaml:"jScriptURL"`
About AboutYaml `yaml:"about"` About AboutYaml `yaml:"about"`
Entries []EntryYaml `yaml:"entries"` Entries []EntryYaml `yaml:"entries"`
} }
func (dy DataYaml) GetHeaderLabels() []string { func (dy DataYaml) GetHeaderLabels() []string {
@ -23,7 +25,7 @@ func (dy DataYaml) GetHeaderLabels() []string {
return toReturn return toReturn
} }
func (dy DataYaml) GetHeaderLink(headerLabel string) string { func (dy DataYaml) GetHeaderLink(headerLabel string) template.URL {
if dy.HeaderLinks == nil { if dy.HeaderLinks == nil {
return "" return ""
} }

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

@ -10,20 +10,20 @@ import (
const dateFormat = "01-2006" const dateFormat = "01-2006"
type EntryYaml struct { type EntryYaml struct {
Name string `yaml:"name"` Name string `yaml:"name"`
Content string `yaml:"content"` Content string `yaml:"content"`
StartDate yaml.DateType `yaml:"startDate"` StartDate yaml.DateType `yaml:"startDate"`
EndDate yaml.DateType `yaml:"endDate"` EndDate yaml.DateType `yaml:"endDate"`
VideoLocation string `yaml:"videoLocation"` VideoLocation template.URL `yaml:"videoLocation"`
VideoContentType string `yaml:"videoContentType"` VideoContentType string `yaml:"videoContentType"`
ThumbnailLocations []string `yaml:"thumbnailLocations"` ThumbnailLocations []template.URL `yaml:"thumbnailLocations"`
ImageLocations []string `yaml:"imageLocations"` ImageLocations []template.URL `yaml:"imageLocations"`
ImageAltTexts []string `yaml:"imageAltTexts"` ImageAltTexts []string `yaml:"imageAltTexts"`
} }
type ImageReference struct { type ImageReference struct {
ThumbnailLocation string ThumbnailLocation template.URL
ImageLocation string ImageLocation template.URL
ImageAltText string ImageAltText string
} }

2
pageHandler/pages/index/index-page.go
View File

@ -90,7 +90,7 @@ func (p *Page) GetContents(urlParameters url.Values) (contentType string, conten
theMarshal := &Marshal{ theMarshal := &Marshal{
Data: *theData, Data: *theData,
Light: urlParameters.Has("light"), Light: urlParameters.Has("light"),
Parameters: p.getNonThemedCleanQuery(urlParameters), Parameters: template.URL(p.getNonThemedCleanQuery(urlParameters)),
} }
switch strings.ToLower(urlParameters.Get("order")) { switch strings.ToLower(urlParameters.Get("order")) {
case "end": case "end":

7
pageHandler/pages/index/template-marshal.go
View File

@ -1,10 +1,13 @@
package index package index
import "sort" import (
"html/template"
"sort"
)
type Marshal struct { type Marshal struct {
Data DataYaml Data DataYaml
Parameters string Parameters template.URL
OrderStartDate int8 OrderStartDate int8
OrderEndDate int8 OrderEndDate int8
OrderName int8 OrderName int8