From 561e5f9ccbf1459409754455f20c4f50229978b6 Mon Sep 17 00:00:00 2001
From: Odin Ugedal <odin@ugedal.com>
Date: Tue, 15 Mar 2016 10:17:23 +0100
Subject: [PATCH 1/3] Set description meta tag correctly
Set the description meta tag correctly when there is no repo
description. Also use the ability to trim trailing whitespaces,
to make the template cleaner.
---
templates/base/head.tmpl | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
index 526a68e495ff..e49e165e8a1c 100644
--- a/templates/base/head.tmpl
+++ b/templates/base/head.tmpl
@@ -3,8 +3,19 @@
<head data-suburl="{{AppSubUrl}}">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
- <meta name="author" content="{{if .Repository }}{{.Owner.Name}}{{else}}Gogs - Go Git Service{{end}}" />
- <meta name="description" content="{{if .Repository }}{{.Repository.Name}} - {{.Repository.Description}}{{else}}Gogs (Go Git Service) is a painless self-hosted Git service written in Go{{end}}" />
+ <meta name="author" content="
+ {{- if .Repository -}}
+ {{.Owner.Name}}
+ {{- else -}}
+ Gogs - Go Git Service
+ {{- end}}" />
+ <meta name="description" content="
+ {{- if.Repository -}}
+ {{.Repository.Name}}
+ {{- if .Repository.Description}} - {{.Repository.Description}}{{end}}
+ {{- else -}}
+ Gogs (Go Git Service) is a painless self-hosted Git service written in Go
+ {{- end}}" />
<meta name="keywords" content="go, git, self-hosted, gogs">
<meta name="referrer" content="no-referrer" />
<meta name="_csrf" content="{{.CsrfToken}}" />
From a75fa58e1cea3dc58b613e28859a1d317e84e9cb Mon Sep 17 00:00:00 2001
From: Odin Ugedal <odin@ugedal.com>
Date: Tue, 15 Mar 2016 19:57:19 +0100
Subject: [PATCH 2/3] Make description meta tag golang 1.4 compatible
---
templates/base/head.tmpl | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
index e49e165e8a1c..57aa136cbc85 100644
--- a/templates/base/head.tmpl
+++ b/templates/base/head.tmpl
@@ -3,19 +3,8 @@
<head data-suburl="{{AppSubUrl}}">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
- <meta name="author" content="
- {{- if .Repository -}}
- {{.Owner.Name}}
- {{- else -}}
- Gogs - Go Git Service
- {{- end}}" />
- <meta name="description" content="
- {{- if.Repository -}}
- {{.Repository.Name}}
- {{- if .Repository.Description}} - {{.Repository.Description}}{{end}}
- {{- else -}}
- Gogs (Go Git Service) is a painless self-hosted Git service written in Go
- {{- end}}" />
+ <meta name="author" content="{{if .Repository}}{{.Owner.Name}}{{else}}Gogs - Go Git Service{{end}}" />
+ <meta name="description" content="{{if .Repository}}{{.Repository.Name}}{{if .Repository.Description}} - {{.Repository.Description}}{{end}}{{else}}Gogs (Go Git Service) is a painless self-hosted Git service written in Go{{end}}" />
<meta name="keywords" content="go, git, self-hosted, gogs">
<meta name="referrer" content="no-referrer" />
<meta name="_csrf" content="{{.CsrfToken}}" />
From 01ff65a93e495ccd9161e94c2e7b20acbe471c10 Mon Sep 17 00:00:00 2001
From: Odin Ugedal <odin@ugedal.com>
Date: Tue, 15 Mar 2016 22:35:59 +0100
Subject: [PATCH 3/3] Fix indent
---
templates/base/head.tmpl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
index 57aa136cbc85..fc32c73698f5 100644
--- a/templates/base/head.tmpl
+++ b/templates/base/head.tmpl
@@ -3,7 +3,7 @@
<head data-suburl="{{AppSubUrl}}">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
- <meta name="author" content="{{if .Repository}}{{.Owner.Name}}{{else}}Gogs - Go Git Service{{end}}" />
+ <meta name="author" content="{{if .Repository}}{{.Owner.Name}}{{else}}Gogs - Go Git Service{{end}}" />
<meta name="description" content="{{if .Repository}}{{.Repository.Name}}{{if .Repository.Description}} - {{.Repository.Description}}{{end}}{{else}}Gogs (Go Git Service) is a painless self-hosted Git service written in Go{{end}}" />
<meta name="keywords" content="go, git, self-hosted, gogs">
<meta name="referrer" content="no-referrer" />