includes/preftable.tmpl - Issue 5636796054503424: Issue 1170 - [adblockplus.org Anwiki to CMS migration] Migrate content

Side by Side Diff: includes/preftable.tmpl

Issue 5636796054503424: Issue 1170 - [adblockplus.org Anwiki to CMS migration] Migrate content (Closed)

Patch Set: Addressed a few more comments. Created Feb. 26, 2015, 10:10 p.m.

Left:
Right:

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

Jump to:

View unified diff | Download patch

OLD	NEW
(Empty)
	1 {#

	2 # This file is part of the Adblock Plus website,

	3 # Copyright (C) 2006-2015 Eyeo GmbH

	4 #

	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

	7 # published by the Free Software Foundation.

	8 #

	9 # Adblock Plus is distributed in the hope that it will be useful,

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

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

	12 # GNU General Public License for more details.

	13 #

	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/>.

	16 #}

	17 {% from "includes/common" import description with context %}

	18

	19 {% macro display_preftable(preftable, links) %}

	20 <table id="preftable">

	21 <tbody>

	22 <tr>

	23 <th width="30%">{{"prefnamecol"\|translate}}</th>
	Sebastian Noack 2015/02/27 11:10:49 Nit: For consistency, one space before the opening Nit: For consistency, one space before the opening and closing expression. kzar 2015/02/27 14:21:07 Done. Show quoted text On 2015/02/27 11:10:49, Sebastian Noack wrote: > Nit: For consistency, one space before the opening and closing expression. Done.
	24 <th width="20%">{{"defaultcol"\|translate}}</th>

	25 <th width="50%">{{"descriptioncol"\|translate}}</th>

	26 </tr>

	27 {% for section in preftable %}

	28 <tr id="{{ section.id }}">

	29 <td class="section" colspan="3">{{ (section.id + "Title")\|translate }} </td>

	30 </tr>

	31 {% for preference in section.preferences %}

	32 <tr id="{{ preference.name }}">

	33 <td>

	34 <span>extensions.</span>

	35 <span>adblockplus.</span>

	36 <span class="prefname">{{ preference.name }}</span>

	37 </td>

	38 {% if preference.default %}

	39 <td>{{ preference.default }}</td>

	40 {% elif preference.default in (None, null) %}
	Sebastian Noack 2015/02/27 11:10:49 Just want to make sure that this code is doing wha Just want to make sure that this code is doing what you think it does. It checks whether "preference.default" is None (built-in) or equals to the value of the variable "null". But where is this variable defined? kzar 2015/02/27 14:21:07 I guess `null` is defined by Jinja2, I also notice Show quoted text On 2015/02/27 11:10:49, Sebastian Noack wrote: > Just want to make sure that this code is doing what you think it does. It checks > whether "preference.default" is None (built-in) or equals to the value of the > variable "null". But where is this variable defined? I guess `null` is defined by Jinja2, I also noticed this yesterday. This does work, wherever null is defined, and is required for now. I've tested to make sure. Sebastian Noack 2015/02/27 14:42:45 Jinja2 falls back to it's special undefined value Show quoted text On 2015/02/27 14:21:07, kzar wrote: > On 2015/02/27 11:10:49, Sebastian Noack wrote: > > Just want to make sure that this code is doing what you think it does. It > checks > > whether "preference.default" is None (built-in) or equals to the value of the > > variable "null". But where is this variable defined? > > I guess `null` is defined by Jinja2, I also noticed this yesterday. This does > work, wherever null is defined, and is required for now. I've tested to make > sure. Jinja2 falls back to it's special undefined value when using a non-existing variable. In this case the above code would be equivalent to: {% elif preference.default is none or preference.default is undefined %} And this is how you should do it, if that is what you intend to check for. kzar 2015/02/27 14:57:11 Done. Show quoted text On 2015/02/27 14:42:45, Sebastian Noack wrote: > On 2015/02/27 14:21:07, kzar wrote: > > On 2015/02/27 11:10:49, Sebastian Noack wrote: > > > Just want to make sure that this code is doing what you think it does. It > > checks > > > whether "preference.default" is None (built-in) or equals to the value of > the > > > variable "null". But where is this variable defined? > > > > I guess `null` is defined by Jinja2, I also noticed this yesterday. This does > > work, wherever null is defined, and is required for now. I've tested to make > > sure. > > Jinja2 falls back to it's special undefined value when using a non-existing > variable. In this case the above code would be equivalent to: > > {% elif preference.default is none or > preference.default is undefined %} > > And this is how you should do it, if that is what you intend to check for. Done.
	41 <td><em>empty</em></td>

	42 {% else %}

	43 <td>&nbsp</td>

	44 {% endif %}

	45 <td>{{ description(preference.name + "Description", links, "", "<br> ") }}</td>

	46 </tr>

	47 {% endfor %}

	48 {% endfor %}

	49 </tbody>

	50 </table>

	51 {% endmacro %}

OLD	NEW

« filters/get_subscriptions.py ('K') | « includes/interface.tmpl ('k') | includes/subscriptionList.tmpl » ('j') | includes/subscriptionList.tmpl » ('J')