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

Delta Between Two Patch Sets: includes/interface.tmpl

Issue 5636796054503424: Issue 1170 - [adblockplus.org Anwiki to CMS migration] Migrate content (Closed)
Left Patch Set: Addressed palant's feedback. Created Feb. 26, 2015, 7:48 p.m.
Right Patch Set: Remove includes/common.tmpl which is no longer required. Created March 7, 2015, 7:01 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 | « includes/index.tmpl ('k') | includes/preftable.tmpl » ('j') | 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 {% from "includes/common" import description with context %}
18 17
19 {% macro return_type(return_type) %} 18 {% macro return_type(return_type) %}
20 {% if return_type|truncate(1, True, "") == "I" %} 19 {% if return_type|truncate(1, True, "") == "I" %}
21 {{ return_type|linkify }} 20 {{ return_type|linkify }}
22 {{ return_type -}} 21 {{ return_type -}}
23 </a> 22 </a>
24 {% else %} 23 {% else %}
25 {{ return_type }} 24 {{ return_type }}
26 {% endif %} 25 {% endif %}
27 {% endmacro %} 26 {% endmacro %}
(...skipping 30 matching lines...) Expand all
58 <p id="method_{{ property.name }}"> 57 <p id="method_{{ property.name }}">
59 {{ return_type(property.return_type) }} 58 {{ return_type(property.return_type) }}
60 <span class="methodname">{{ property.name }}</span> 59 <span class="methodname">{{ property.name }}</span>
61 ( 60 (
62 {% for argument in property.arguments %} 61 {% for argument in property.arguments %}
63 {{ argument.modifier }} {{ argument.type }} {{ argument.name }} 62 {{ argument.modifier }} {{ argument.type }} {{ argument.name }}
64 {%- if not loop.last %},{% endif %} 63 {%- if not loop.last %},{% endif %}
65 {% endfor %} 64 {% endfor %}
66 ) 65 )
67 </p> 66 </p>
68 {{ description(property.name + "Description", links, "<p>", "</p>") }} 67 {{ property.description() }}
69 <dl> 68 <dl>
70 {% if property.version %} 69 {% if property.version %}
71 <dt>Version:</dt> 70 <dt>Version:</dt>
72 <dd>{{ property.version }} and higher</dd> 71 <dd>{{ property.version }} and higher</dd>
73 {% endif %} 72 {% endif %}
74 {% if property.arguments|length %} 73 {% if property.arguments|length %}
75 <dt>Arguments:</dt> 74 <dt>Arguments:</dt>
76 {% for argument in property.arguments %} 75 {% for argument in property.arguments %}
77 <dd> 76 <dd>
78 <span class="argumentname">{{ argument.name }}</span>: 77 <span class="argumentname">{{ argument.name }}</span>:
79 {{ description(property.name + "-" + argument.name + "Description" , links) }} 78 {{ property["description-" + argument.name]() }}
80 </dd> 79 </dd>
81 {% endfor %} 80 {% endfor %}
82 {% endif %} 81 {% endif %}
83 {% if (property.name + "-returnDescription") in localedata %} 82 {% if "description-return" in property %}
84 <dt>Returns:</dt> 83 <dt>Returns:</dt>
85 {{ description(property.name + "-returnDescription", links, "<dd>", "< /dd>") }} 84 <dd>{{ property["description-return"]() }}</dd>
Wladimir Palant 2015/02/26 20:35:03 No, you don't want to create another <dd> block fo
kzar 2015/02/26 21:49:13 Done.
86 {% endif %} 85 {% endif %}
87 </dl> 86 </dl>
88 {% else %} 87 {% else %}
89 <p id="prop_{{ property.name }}"> 88 <p id="prop_{{ property.name }}">
90 {{ property.modifier }} {{ property.type }} 89 {{ property.modifier }} {{ property.type }}
91 <span class="propname">{{ property.name }}</span> 90 <span class="propname">{{ property.name }}</span>
92 </p> 91 </p>
93 {{ description(property.name + "Description", links, "<p>", "</p>") }} 92 {{ property.description() }}
94 {% endif %} 93 {% endif %}
95 {% endfor %} 94 {% endfor %}
96 {% endmacro %} 95 {% endmacro %}
LEFTRIGHT

Powered by Google App Engine
This is Rietveld