includes/sidebar/primary-navigation.tmpl - Issue 29490624: Issue 5373 - Remove the "blog" from acceptableads.com and link to blog.acceptableads.com

Delta Between Two Patch Sets: includes/sidebar/primary-navigation.tmpl

Issue 29490624: Issue 5373 - Remove the "blog" from acceptableads.com and link to blog.acceptableads.com (Closed) Base URL: https://hg.adblockplus.org/web.acceptableads.com

Left Patch Set: Remove rel attribute Created July 19, 2017, 6:08 p.m.

Right Patch Set: Addressed NITs Created July 20, 2017, 12:37 p.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 {#	1 {#

2 # This file is part of acceptableads.org.	2 # This file is part of acceptableads.org.

3 # Copyright (C) 2016 Eyeo GmbH	3 # Copyright (C) 2016 Eyeo GmbH

4 #	4 #

5 # acceptableads.org is free software: you can redistribute it and/or modify	5 # acceptableads.org is free software: you can redistribute it and/or modify

6 # it under the terms of the GNU General Public License as published by	6 # it under the terms of the GNU General Public License as published by

7 # the Free Software Foundation, either version 3 of the License, or	7 # the Free Software Foundation, either version 3 of the License, or

8 # (at your option) any later version.	8 # (at your option) any later version.

9 #	9 #

10 # acceptableads.org is distributed in the hope that it will be useful,	10 # acceptableads.org is distributed in the hope that it will be useful,

11 # but WITHOUT ANY WARRANTY; without even the implied warranty of	11 # but WITHOUT ANY WARRANTY; without even the implied warranty of

12 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	12 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

13 # GNU General Public License for more details.	13 # GNU General Public License for more details.

14 #	14 #

15 # You should have received a copy of the GNU General Public License	15 # You should have received a copy of the GNU General Public License

16 # along with acceptableads.org. If not, see <http://www.gnu.org/licenses/>.	16 # along with acceptableads.org. If not, see <http://www.gnu.org/licenses/>.

17 #}	17 #}

18	18

19 <ul>	19 <ul>

20 {% for sitemap_page, sitemap_parent, sitemap_children in sitemap %}	20 {% for sitemap_page, sitemap_parent, sitemap_children in sitemap %}

21 {% if 'http' in sitemap_page %}	21 {% if 'http' in sitemap_page %}

22 <li>	22 <li>

23 <a href="{{ sitemap_page }}" target="_blank">	23 <a href="{{ sitemap_page }}" target="_blank">

24 {{ sitemap_parent \| translate(sitemap_parent, "Primary navigation label" ) }}	24 {{ sitemap_parent \| translate(sitemap_parent, "Primary navigation label" ) }}

25 <img src="/img/png/icon-external-link.png" srcset="/img/png/icon-externa l-link.png, /img/svg/icon-external-link.svg 2x" alt="{{ "External Link" \| transl ate("external-link-icon", "Image alt text") }}" class="external-icon">	25 <img src="/img/png/icon-external-link.png" srcset="/img/svg/icon-externa l-link.svg 2x" alt="{{ "External Link" \| translate("external-link-icon", "Image alt text") }}" class="navigation-icon">
juliandoucette 2017/07/19 19:59:45 NIT: I don't think we need to the 1x src in srcset NIT: I don't think we need to the 1x src in srcset. juliandoucette 2017/07/19 19:59:45 NIT: I think this class name is too specific. Thes NIT: I think this class name is too specific. These styles are also appropriate for other navigation icons at least. ire 2017/07/20 13:03:55 Done. Show quoted text On 2017/07/19 19:59:45, juliandoucette wrote: > NIT: I think this class name is too specific. These styles are also appropriate > for other navigation icons at least. Done. ire 2017/07/20 13:03:55 Done. Show quoted text On 2017/07/19 19:59:45, juliandoucette wrote: > NIT: I don't think we need to the 1x src in srcset. Done.
26 </a>	26 </a>

27 </li>	27 </li>

28 {% else %}	28 {% else %}

29 <li class="{% if parent == sitemap_page or page == sitemap_page %} active {% endif %} {% if sitemap_children \| length > 0 %} has-submenu {% endif %}">	29 <li class="{% if parent == sitemap_page or page == sitemap_page %} active {% endif %} {% if sitemap_children \| length > 0 %} has-submenu {% endif %}">

30 {{ sitemap_page \| linkify }}{{ sitemap_parent \| translate(sitemap_page, "P rimary navigation label") }}</a>	30 {{ sitemap_page \| linkify }}{{ sitemap_parent \| translate(sitemap_page, "P rimary navigation label") }}</a>

31 {% if sitemap_children \| length > 0 %}	31 {% if sitemap_children \| length > 0 %}

32 <ul>	32 <ul>

33 {% for sitemap_page, sitemap_child in sitemap_children %}	33 {% for sitemap_page, sitemap_child in sitemap_children %}

34 <li class="{% if page == sitemap_page %} active {% endif %}">	34 <li class="{% if page == sitemap_page %} active {% endif %}">

35 {{ sitemap_page \| linkify }}{{ sitemap_child \| translate(sitemap_pag e, "Primary navigation label under \"" + sitemap_parent + "\"") }}</a>	35 {{ sitemap_page \| linkify }}{{ sitemap_child \| translate(sitemap_pag e, "Primary navigation label under \"" + sitemap_parent + "\"") }}</a>

36 </li>	36 </li>

37 {% endfor %}	37 {% endfor %}

38 </ul>	38 </ul>

39 {% endif %}	39 {% endif %}

40 </li>	40 </li>

41 {% endif %}	41 {% endif %}

42 {% endfor %}	42 {% endfor %}

43 </ul>	43 </ul>

LEFT	RIGHT