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

includes/subscriptionList.tmpl

 {#
  # 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/>.
  #}
 
 {%- macro process_subscription(subscription, parent=None) %}
   <tr{% if subscription["deprecated"] %} class="deprecated"{% endif %}>
     {%- if subscription["supplements"] %}
       <td rowspan="2" class="dummy"></td>
       <td rowspan="2">
     {%- else %}
       <td rowspan="2" colspan="2">
     {%- endif %}
-      <strong class="subscriptionTitle">{{subscription["name"]}}</strong><br>
-      {{subscription["specialization"]}}
+      <strong class="subscriptionTitle">{{ subscription["name"] }}</strong><br>
+      {{ subscription["specialization"] }}
       {%- if subscription["supplements"] %}
-      <br>{{ "supplements_prefix"|translate }} {{' / '.join(subscription["supplements"])}} {{ "supplements_suffix"|translate }}
+      <br>{{ "supplements_prefix"|translate }} {{ ' / '.join(subscription["supplements"]) }} {{ "supplements_suffix"|translate }}
       {%- endif %}
     </td>
     <td>
       {%- if subscription["maintainer"] %}
-      {{ "maintainer_prefix"|translate }} {{subscription["maintainer"]}} {{ "maintainer_suffix"|translate }}<br>
+      {{ "maintainer_prefix"|translate }} {{ subscription["maintainer"] }} {{ "maintainer_suffix"|translate }}<br>
       {%- endif %}
       {%- set is_first = True %}
       {% for key in ('homepage', 'forum', 'contact', 'faq', 'blog', 'changelog', 'policy') -%}
         {%- set url = subscription[key] -%}
         {%- if url -%}
           {%- if not is_first %}, {% endif -%}
           {%- set is_first = False -%}
-          <a href="{{url}}">{{key|translate}}</a>
+          <a href="{{ url }}">{{ key|translate }}</a>
         {%- endif %}
       {%- endfor %}
     </td>
   </tr>
   <tr{% if subscription["deprecated"] %} class="deprecated"{% endif %}>
     <td>
       {%- if subscription["deprecated"] %}
       <strong>{{ "deprecation_warning"|translate }}</strong><br>
       {%- endif %}
-      {{ "subscribe"|translate}}{{' '}}
+      {{ "subscribe"|translate }}{{ ' ' }}
       {%- for title, url, complete in subscription["variants"] -%}
-        <a href="abp:subscribe?location={{url|urlencode}}&amp;title={{title|urlencode}}
+        <a href="abp:subscribe?location={{ url|urlencode }}&amp;title={{ title|urlencode }}
           {%- if parent and not complete -%}
             {%- set main_title, main_url, main_complete = parent.variants[0] -%}
-            &amp;requiresLocation={{main_url|urlencode}}&amp;requiresTitle={{main_title|urlencode}}
+            &amp;requiresLocation={{ main_url|urlencode }}&amp;requiresTitle={{ main_title|urlencode }}
           {%- endif -%}
-        ">{{title}}</a>{%- if not loop.last %}, {% endif -%}
+        ">{{ title }}</a>{%- if not loop.last %}, {% endif -%}
       {%- endfor %}
     </td>
   </tr>
   {%- if not parent -%}
     {%- for supplement in subscription["supplemented"]|subscription_sort -%}
       {{ process_subscription(supplement, subscription) }}
     {%- endfor -%}
   {%- endif -%}
 {%- endmacro %}
 
-{%- set current_type = subscriptions[0]["type"] -%}
+{% macro display_subscriptions(subscriptions) %}
+  {%- set current_type = subscriptions[0]["type"] -%}
   <h2>{{ ("type_" + current_type)|translate }}</h2>
 
-<table class="subscriptions">
-{%- for subscription in subscriptions|subscription_sort -%}

[Wladimir Palant, 2015/02/24 20:19:40]

As with other templates, please use template inheritance and explicit parameter
passing here.

[kzar, 2015/02/26 19:50:17]

Done.

-  {%- if not subscription["supplements"] -%}
-    {%- if current_type != subscription["type"] -%}
-      {%- set current_type = subscription["type"] %}
-</table>
+  <table class="subscriptions">
+  {%- for subscription in subscriptions|subscription_sort -%}
+    {%- if not subscription["supplements"] -%}
+      {%- if current_type != subscription["type"] -%}
+        {%- set current_type = subscription["type"] %}
+  </table>
 
-<h2>{{ ("type_" + current_type)|translate }}</h2>
+  <h2>{{ ("type_" + current_type)|translate }}</h2>
 
-<table class="subscriptions">
+  <table class="subscriptions">
+      {%- endif -%}
+      {{ process_subscription(subscription) }}
     {%- endif -%}
-    {{ process_subscription(subscription) }}
-  {%- endif -%}
-{%- endfor %}
-</table>
+  {%- endfor %}
+  </table>
+{% endmacro %}