Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: includes/toc.tmpl

Issue 5158802752012288: Issue 2306 - Add toc macro to web.adblockplus.org (Closed)
Left Patch Set: Made spacing more consistent. Created April 13, 2015, 11:19 a.m.
Right Patch Set: Addressed Wladimir's comments. Created April 13, 2015, 12:47 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
« no previous file with change/comment | « no previous file | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 {# 1 {#
2 # This file is part of the Adblock Plus website, 2 # This file is part of the Adblock Plus website,
3 # Copyright (C) 2006-2015 Eyeo GmbH 3 # Copyright (C) 2006-2015 Eyeo GmbH
4 # 4 #
5 # Adblock Plus is free software: you can redistribute it and/or modify 5 # Adblock Plus is free software: you can redistribute it and/or modify
6 # it under the terms of the GNU General Public License version 3 as 6 # it under the terms of the GNU General Public License version 3 as
7 # published by the Free Software Foundation. 7 # published by the Free Software Foundation.
8 # 8 #
9 # Adblock Plus is distributed in the hope that it will be useful, 9 # Adblock Plus is distributed in the hope that it will be useful,
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 # GNU General Public License for more details. 12 # GNU General Public License for more details.
13 # 13 #
14 # You should have received a copy of the GNU General Public License 14 # You should have received a copy of the GNU General Public License
15 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 #} 16 #}
17 17
18 {% macro toc(page, title_tag) %} 18 {% macro toc(page, title_tag=None) %}
Wladimir Palant 2015/04/13 12:00:36 Should be title_tag=None the way I see it, this pa
kzar 2015/04/13 12:49:13 Done.
19 {% set page_content = get_page_content(page) %} 19 {% set page_content = get_page_content(page) %}
20 {% set toclist = page_content["body"]|toclist %} 20 {% set toclist = page_content["body"]|toclist %}
21 21
22 {% if title_tag %} 22 {% if title_tag %}
23 <{{ title_tag }}>{{ page_content["title"] }}</{{ title_tag }}> 23 <{{ title_tag }}>{{ page_content["title"] }}</{{ title_tag }}>
24 {% endif %} 24 {% endif %}
25 <ul> 25 <ul>
26 {% for item in toclist %} 26 {% for item in toclist %}
27 <li> 27 <li>
28 <a href="{{ page }}#{{ item.anchor }}">{{ item.title }}</a> 28 {{ (page + '#' + item.anchor)|linkify }}{{ item.title }}</a>
Wladimir Palant 2015/04/13 12:00:36 This is a relative link, it won't work correctly i
kzar 2015/04/13 12:49:13 Ouch, Done.
29 {% if item.subitems %}{{ toc(item.subitems) }}{% endif %} 29 {% if item.subitems %}{{ toc(item.subitems) }}{% endif %}
30 </li> 30 </li>
31 {% endfor %} 31 {% endfor %}
32 </ul> 32 </ul>
33 {% endmacro %} 33 {% endmacro %}
LEFTRIGHT
« no previous file | no next file » | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld