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

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: Created Nov. 28, 2017, 9:11 a.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 page == "index" or config.get("general", "sitename") is not defined %}	5 {% if title_exclude_sitename or not has_string("name", "site") %}
ire 2017/11/28 09:12:49 This currently doesn't work because if I try "conf This currently doesn't work because if I try "config.get("general", "sitename")" where there is no sitename, I get a 500 error. I can't seem to figure out how to check if `config.get("general", "sitename")` exists without breaking things. Can you help? juliandoucette 2017/11/28 14:49:21 I don't think that the index page will be the only I don't think that the index page will be the only page that we want to exclude the sitename from. I suggest that we use an optional page attribute instead e.g. {% if title_exclude_sitename or ... juliandoucette 2017/11/28 14:49:21 I think that this is how to find the answer to you Show quoted text On 2017/11/28 09:12:49, ire wrote: > This currently doesn't work because if I try "config.get("general", "sitename")" > where there is no sitename, I get a 500 error. I can't seem to figure out how to > check if `config.get("general", "sitename")` exists without breaking things. Can > you help? I think that this is how to find the answer to your question (connect the dots): - Use grep (or similar) to find "config" in the "cms" repository - https://hg.adblockplus.org/cms/file/tip/cms/sources.py#l44 - https://hg.adblockplus.org/cms/file/tip/cms/sources.py#l70 - https://hg.adblockplus.org/cms/file/tip/cms/sources.py#l18 - https://docs.python.org/2/library/configparser.html - https://docs.python.org/2/library/configparser.html#ConfigParser.SafeConfigPa... - https://docs.python.org/2/library/configparser.html#configparser-objects - https://docs.python.org/2/library/configparser.html#ConfigParser.RawConfigParser - https://docs.python.org/2/library/configparser.html#ConfigParser.RawConfigPar... ire 2017/11/28 16:11:26 Alright, thanks! Show quoted text On 2017/11/28 14:49:21, juliandoucette wrote: > On 2017/11/28 09:12:49, ire wrote: > > This currently doesn't work because if I try "config.get("general", > "sitename")" > > where there is no sitename, I get a 500 error. I can't seem to figure out how > to > > check if `config.get("general", "sitename")` exists without breaking things. > Can > > you help? > > I think that this is how to find the answer to your question (connect the dots): > > - Use grep (or similar) to find "config" in the "cms" repository > - https://hg.adblockplus.org/cms/file/tip/cms/sources.py#l44 > - https://hg.adblockplus.org/cms/file/tip/cms/sources.py#l70 > - https://hg.adblockplus.org/cms/file/tip/cms/sources.py#l18 > - https://docs.python.org/2/library/configparser.html > - > https://docs.python.org/2/library/configparser.html#ConfigParser.SafeConfigPa... > - https://docs.python.org/2/library/configparser.html#configparser-objects > - > https://docs.python.org/2/library/configparser.html#ConfigParser.RawConfigParser > - > https://docs.python.org/2/library/configparser.html#ConfigParser.RawConfigPar... Alright, thanks! ire 2017/11/28 16:11:26 Acknowledged. Show quoted text On 2017/11/28 14:49:21, juliandoucette wrote: > I don't think that the index page will be the only page that we want to exclude > the sitename from. I suggest that we use an optional page attribute instead e.g. > {% if title_exclude_sitename or ... Acknowledged.
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