includes/meta/standard.tmpl - Issue 29622568: Issue 6013 - Add site name to document title in website-defaults standard metadata

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Delta Between Two Patch Sets: includes/meta/standard.tmpl

Issue 29622568: Issue 6013 - Add site name to document title in website-defaults standard metadata (Closed) Base URL: https://hg.adblockplus.org/website-defaults

Left Patch Set: Use config.has_option, use title_exclude_sitename Created Nov. 28, 2017, 4:28 p.m.

Right Patch Set: Use get_string to get site name Created Dec. 4, 2017, 9:09 a.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Left: Side by side diff | Download
Right: Side by side diff | Download

LEFT	RIGHT
1 <meta charset="utf-8">	1 <meta charset="utf-8">

2 <meta http-equiv="x-ua-compatible" content="ie=edge">	2 <meta http-equiv="x-ua-compatible" content="ie=edge">

3 <meta name="viewport" content="width=device-width, initial-scale=1">	3 <meta name="viewport" content="width=device-width, initial-scale=1">

4	4

5 {% if title_exclude_sitename or config.has_option("general", "sitename") == Fals e %}	5 {% if title_exclude_sitename or not has_string("name", "site") %}
Vasily Kuznetsov 2017/11/30 12:53:28 The second part of this condition can be written a The second part of this condition can be written as `or not config.has_option(...)` -- perhaps a bit more readable this way. ire 2017/11/30 13:20:00 I like your suggestion better. Done. Show quoted text On 2017/11/30 12:53:28, Vasily Kuznetsov wrote: > The second part of this condition can be written as `or not > config.has_option(...)` -- perhaps a bit more readable this way. I like your suggestion better. Done.
6 <title>{{ title \| translate("page-title", "Page title") }}</title>	6 <title>{{ title \| translate("page-title", "Page title") }}</title>

7 {% else %}	7 {% else %}

8 <title>{{ title \| translate("page-title", "Page title") }} \| {{ config.get("gene ral", "sitename") }}</title>	8 <title>{{ title \| translate("page-title", "Page title") }} \| {{ get_string("name ", "site") }}</title>

9 {% endif %}	9 {% endif %}

10	10

11 {% if description %}	11 {% if description %}

12 <meta name="description" content="{{ description \| translate("page-description ", "Page description") }}">	12 <meta name="description" content="{{ description \| translate("page-description ", "Page description") }}">

13 {% endif %}	13 {% endif %}

14 <link rel="canonical" href="{{ get_canonical_url(page) }}">	14 <link rel="canonical" href="{{ get_canonical_url(page) }}">

LEFT	RIGHT