Issue 1170 - [adblockplus.org Anwiki to CMS migration] Migrate content

includes/preftable.tmpl

Index: includes/preftable.tmpl
diff --git a/includes/preftable.tmpl b/includes/preftable.tmpl
new file mode 100644
index 0000000000000000000000000000000000000000..2ab02aef75fa357197240aa71bb44e8b6562e585
--- /dev/null
+++ b/includes/preftable.tmpl
@@ -0,0 +1,51 @@
+{#
+ # This file is part of the Adblock Plus website,
+ # Copyright (C) 2006-2015 Eyeo GmbH
+ #
+ # Adblock Plus is free software: you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License version 3 as
+ # published by the Free Software Foundation.
+ #
+ # Adblock Plus is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
+ #}
+{% from "includes/common" import description with context %}
+
+{% macro display_preftable(preftable, links) %}
+  <table id="preftable">
+    <tbody>
+      <tr>
+        <th width="30%">{{"prefnamecol"|translate}}</th>

[Sebastian Noack, 2015/02/27 11:10:49]

Nit: For consistency, one space before the opening and closing expression.

[kzar, 2015/02/27 14:21:07]

Done.

+        <th width="20%">{{"defaultcol"|translate}}</th>
+        <th width="50%">{{"descriptioncol"|translate}}</th>
+      </tr>
+      {% for section in preftable %}
+        <tr id="{{ section.id }}">
+          <td class="section" colspan="3">{{ (section.id + "Title")|translate }}</td>
+        </tr>
+        {% for preference in section.preferences %}
+          <tr id="{{ preference.name }}">
+            <td>
+              <span>extensions.</span>
+              <span>adblockplus.</span>
+              <span class="prefname">{{ preference.name }}</span>
+            </td>
+            {% if preference.default %}
+              <td>{{ preference.default }}</td>
+            {% elif preference.default in (None, null) %}

[Sebastian Noack, 2015/02/27 11:10:49]

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

+              <td><em>empty</em></td>
+            {% else %}
+              <td>&nbsp</td>
+            {% endif %}
+            <td>{{ description(preference.name + "Description", links, "", "<br>") }}</td>
+          </tr>
+        {% endfor %}
+      {% endfor %}
+    </tbody>
+  </table>
+{% endmacro %}