Issue 2823 - Display new subscription types on subscriptions page

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"] %}
+    {%- if parent and 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"] }}
       {%- if subscription["supplements"] %}
       <br>{{ "supplement for"|translate("supplements_prefix") }} {{ ' / '.join(subscription["supplements"]) }} {{ " "|translate("supplements_suffix") }}
       {%- endif %}
@@ skipping 30 matching lines @@
     </td>
   </tr>
   {%- if not parent -%}
     {%- for supplement in subscription["supplemented"]|subscription_sort -%}
       {{ process_subscription(supplement, subscription) }}
     {%- endfor -%}
   {%- endif -%}
 {%- endmacro %}
 
 {% macro display_subscriptions(subscriptions) %}
-  {%- set current_type = subscriptions[0]["type"] -%}
-  <h2>{{ get_string("type_" + current_type, "subscriptions") }}</h2>
-
-  <table class="subscriptions">
   {%- for subscription in subscriptions|subscription_sort -%}
-    {%- if not subscription["supplements"] -%}
+    {%- if not (subscription["supplements"] and current_type == subscription["type"]) -%}
       {%- if current_type != subscription["type"] -%}
+        {%- if current_type %}
+  </table>
+        {%- endif -%}
         {%- set current_type = subscription["type"] %}
-  </table>
-
-  <h2>{{ get_string("type_" + current_type, "subscriptions") }}</h2>
+  <h2 id="type_{{ current_type }}">{{ get_string("type_" + current_type, "subscriptions") }}</h2>
 
   <table class="subscriptions">
       {%- endif -%}
+    {%- endif -%}
+    {%- if subscription["type"] not in subscription["supplementsType"] -%}
       {{ process_subscription(subscription) }}
     {%- endif -%}
   {%- endfor %}
   </table>
 {% endmacro %}