Fix url parameters.

pageHandler/pages/index/about.go

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

pageHandler/pages/index/data.go

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

pageHandler/pages/index/entry.go

@@ -14,16 +14,16 @@ type EntryYaml struct {
 	Content            string         `yaml:"content"`
 	StartDate          yaml.DateType  `yaml:"startDate"`
 	EndDate            yaml.DateType  `yaml:"endDate"`
-	VideoLocation      string        `yaml:"videoLocation"`
+	VideoLocation      template.URL   `yaml:"videoLocation"`
 	VideoContentType   string         `yaml:"videoContentType"`
-	ThumbnailLocations []string      `yaml:"thumbnailLocations"`
-	ImageLocations     []string      `yaml:"imageLocations"`
+	ThumbnailLocations []template.URL `yaml:"thumbnailLocations"`
+	ImageLocations     []template.URL `yaml:"imageLocations"`
 	ImageAltTexts      []string       `yaml:"imageAltTexts"`
 }
 
 type ImageReference struct {
-	ThumbnailLocation string
-	ImageLocation     string
+	ThumbnailLocation template.URL
+	ImageLocation     template.URL
 	ImageAltText      string
 }
 

pageHandler/pages/index/index-page.go

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

pageHandler/pages/index/template-marshal.go

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