| 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 | 
|  | 18 {%- macro process_subscription(subscription, parent=None) %} | 
|  | 19   <tr{% if subscription["deprecated"] %} class="deprecated"{% endif %}> | 
|  | 20     {%- if subscription["supplements"] %} | 
|  | 21       <td rowspan="2" class="dummy"></td> | 
|  | 22       <td rowspan="2"> | 
|  | 23     {%- else %} | 
|  | 24       <td rowspan="2" colspan="2"> | 
|  | 25     {%- endif %} | 
|  | 26       <strong class="subscriptionTitle">{{subscription["name"]}}</strong><br> | 
|  | 27       {{subscription["specialization"]}} | 
|  | 28       {%- if subscription["supplements"] %} | 
|  | 29       <br>{{ "supplements_prefix"|translate }} {{' / '.join(subscription["supple
    ments"])}} {{ "supplements_suffix"|translate }} | 
|  | 30       {%- endif %} | 
|  | 31     </td> | 
|  | 32     <td> | 
|  | 33       {%- if subscription["maintainer"] %} | 
|  | 34       {{ "maintainer_prefix"|translate }} {{subscription["maintainer"]}} {{ "mai
    ntainer_suffix"|translate }}<br> | 
|  | 35       {%- endif %} | 
|  | 36       {%- set is_first = True %} | 
|  | 37       {% for key in ('homepage', 'forum', 'contact', 'faq', 'blog', 'changelog',
     'policy') -%} | 
|  | 38         {%- set url = subscription[key] -%} | 
|  | 39         {%- if url -%} | 
|  | 40           {%- if not is_first %}, {% endif -%} | 
|  | 41           {%- set is_first = False -%} | 
|  | 42           <a href="{{url}}">{{key|translate}}</a> | 
|  | 43         {%- endif %} | 
|  | 44       {%- endfor %} | 
|  | 45     </td> | 
|  | 46   </tr> | 
|  | 47   <tr{% if subscription["deprecated"] %} class="deprecated"{% endif %}> | 
|  | 48     <td> | 
|  | 49       {%- if subscription["deprecated"] %} | 
|  | 50       <strong>{{ "deprecation_warning"|translate }}</strong><br> | 
|  | 51       {%- endif %} | 
|  | 52       {{ "subscribe"|translate}}{{' '}} | 
|  | 53       {%- for title, url, complete in subscription["variants"] -%} | 
|  | 54         <a href="abp:subscribe?location={{url|urlencode}}&title={{title|urle
    ncode}} | 
|  | 55           {%- if parent and not complete -%} | 
|  | 56             {%- set main_title, main_url, main_complete = parent.variants[0] -%} | 
|  | 57             &requiresLocation={{main_url|urlencode}}&requiresTitle={{mai
    n_title|urlencode}} | 
|  | 58           {%- endif -%} | 
|  | 59         ">{{title}}</a>{%- if not loop.last %}, {% endif -%} | 
|  | 60       {%- endfor %} | 
|  | 61     </td> | 
|  | 62   </tr> | 
|  | 63   {%- if not parent -%} | 
|  | 64     {%- for supplement in subscription["supplemented"]|subscription_sort -%} | 
|  | 65       {{ process_subscription(supplement, subscription) }} | 
|  | 66     {%- endfor -%} | 
|  | 67   {%- endif -%} | 
|  | 68 {%- endmacro %} | 
|  | 69 | 
|  | 70 {% macro display_subscriptions(subscriptions) %} | 
|  | 71   {%- set current_type = subscriptions[0]["type"] -%} | 
|  | 72   <h2>{{ ("type_" + current_type)|translate }}</h2> | 
|  | 73 | 
|  | 74   <table class="subscriptions"> | 
|  | 75   {%- for subscription in subscriptions|subscription_sort -%} | 
|  | 76     {%- if not subscription["supplements"] -%} | 
|  | 77       {%- if current_type != subscription["type"] -%} | 
|  | 78         {%- set current_type = subscription["type"] %} | 
|  | 79   </table> | 
|  | 80 | 
|  | 81   <h2>{{ ("type_" + current_type)|translate }}</h2> | 
|  | 82 | 
|  | 83   <table class="subscriptions"> | 
|  | 84       {%- endif -%} | 
|  | 85       {{ process_subscription(subscription) }} | 
|  | 86     {%- endif -%} | 
|  | 87   {%- endfor %} | 
|  | 88   </table> | 
|  | 89 {% endmacro %} | 
| OLD | NEW | 
|---|