Delta Between Two Patch Sets: pages/subscriptions.tmpl
Issue 29337807:
Issue 3097 - Refactored subscriptions list table on adblockplus.org/en/subscriptions (Closed)
Left Patch Set: Changed table into unordered list, refactored list markup, refactored main css and templates to support multiple footer elements
Created Feb. 27, 2016, 4:16 p.m.
Right Patch Set: Removed extra whitespace
Created July 29, 2016, 10:52 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« includes/subscriptionList.tmpl ('k')
|
static/css/main.css » ('j')
|
no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| 1 title=Known Adblock Plus subscriptions | 1 title=Known Adblock Plus subscriptions |
| 2 {# | 2 {# |
| 3 # This file is part of the Adblock Plus website, | 3 # This file is part of the Adblock Plus website, |
| 4 # Copyright (C) 2006-2016 Eyeo GmbH | 4 # Copyright (C) 2006-2016 Eyeo GmbH |
| 5 # | 5 # |
| 6 # Adblock Plus is free software: you can redistribute it and/or modify | 6 # Adblock Plus is free software: you can redistribute it and/or modify |
| 7 # it under the terms of the GNU General Public License version 3 as | 7 # it under the terms of the GNU General Public License version 3 as |
| 8 # published by the Free Software Foundation. | 8 # published by the Free Software Foundation. |
| 9 # | 9 # |
| 10 # Adblock Plus is distributed in the hope that it will be useful, | 10 # Adblock Plus is distributed in the hope that it will be useful, |
| 11 # but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 # but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 12 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 13 # GNU General Public License for more details. | 13 # GNU General Public License for more details. |
| 14 # | 14 # |
| 15 # You should have received a copy of the GNU General Public License | 15 # You should have received a copy of the GNU General Public License |
| 16 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | 16 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
| 17 #} | 17 #} |
| 18 | 18 |
| 19 | 19 |
| 20 <style type="text/css"> | 20 <style type="text/css"> |
| 21 .subscriptions-list, | 21 .subscriptions-list, |
| 22 .supplemented-subscriptions-list | 22 .supplemented-subscriptions-list |
| 23 { | 23 { |
| 24 margin: 0; | 24 margin: 0px; |
|
Thomas Greiner
2016/07/15 16:07:54
Coding style: "CSS number values should specify un
juliandoucette
2016/07/19 22:29:17
Done.
| |
| 25 list-style: none; | 25 list-style: none; |
| 26 } | 26 } |
| 27 | 27 |
| 28 .subscriptions-list | 28 .subscriptions-list |
| 29 { | 29 { |
| 30 padding: 0; | 30 padding: 0px; |
| 31 } | 31 } |
| 32 | 32 |
| 33 .supplemented-subscriptions-list | 33 .supplemented-subscriptions-list |
| 34 { | 34 { |
| 35 padding-left: 30px; | 35 padding: 0px 0px 0px 30px; |
|
Thomas Greiner
2016/07/15 16:07:54
Please avoid using "border/margin/padding-bottom/l
juliandoucette
2016/07/19 22:29:17
I hadn't considered rtl when I created this patch.
| |
| 36 } | |
| 37 | |
| 38 [dir="rtl"] .supplemented-subscriptions-list | |
| 39 { | |
| 40 padding: 0px 30px 0px 0px; | |
| 36 } | 41 } |
| 37 | 42 |
| 38 .subscription | 43 .subscription |
| 39 { | 44 { |
| 40 position: relative; | 45 position: relative; |
| 41 overflow: auto; | 46 overflow: auto; |
| 42 /* Using outline and margin instead of border to prevent overlapping | 47 /* Using outline and margin instead of border to prevent overlapping |
| 43 and missing connections in hirarchy */ | 48 and missing connections in hierarchy */ |
|
Thomas Greiner
2016/07/15 16:07:54
Typo: Replace "hirarchy" with "hierarchy".
juliandoucette
2016/07/19 22:29:17
Thanks! :)
| |
| 44 outline: 1px dashed #000; | 49 outline: 1px dashed #000; |
| 45 margin-left: -1px; | 50 margin-left: -1px; |
| 46 margin-top: 1px; | 51 margin-top: 1px; |
| 47 } | 52 } |
| 48 | 53 |
| 49 .subscription h1 | 54 #content .subscription h1 |
| 50 { | 55 { |
| 51 margin: 0; | 56 margin: 0px; |
| 52 font-size: 16px; | 57 font-size: 16px; |
| 53 } | 58 } |
| 54 | 59 |
| 55 .subscription p | 60 .subscription p |
| 56 { | 61 { |
| 57 margin: 0; | 62 margin: 0px; |
| 58 } | 63 } |
| 59 | 64 |
| 60 .subscription-summary, | 65 .subscription-summary, |
| 61 .subscription-authors, | 66 .subscription-authors, |
| 62 .subscription-links | 67 .subscription-links |
| 63 { | 68 { |
| 64 padding: 5px; | 69 padding: 5px; |
| 65 } | 70 } |
| 66 | 71 |
| 67 .subscription-content, | 72 .subscription-content, |
| 68 .subscription-details | 73 .subscription-details |
| 69 { | 74 { |
| 70 float: left; | 75 float: left; |
| 71 width: 50%; | 76 width: 50%; |
| 72 } | 77 } |
| 73 | 78 |
| 79 [dir="rtl"] .subscription-content, | |
| 80 [dir="rtl"] .subscription-details | |
| 81 { | |
| 82 float: right; | |
| 83 } | |
| 74 | 84 |
| 75 .subscription-authors, | 85 .subscription-authors, |
| 76 .subscription-links | 86 .subscription-links |
| 77 { | 87 { |
| 78 border-left: 1px dashed #000; | 88 border-left: 1px dashed #000; |
| 89 } | |
| 90 | |
| 91 [dir="rtl"] .subscription-authors, | |
| 92 [dir="rtl"] .subscription-links | |
| 93 { | |
| 94 border-left: none; | |
| 95 border-right: 1px dashed #000; | |
| 79 } | 96 } |
| 80 | 97 |
| 81 .subscription-links | 98 .subscription-links |
| 82 { | 99 { |
| 83 border-top: 1px dashed #000; | 100 border-top: 1px dashed #000; |
| 84 } | 101 } |
| 85 | 102 |
| 86 .subscriptions .deprecated | 103 .subscriptions .deprecated |
| 87 { | 104 { |
| 88 opacity: 0.5; | 105 opacity: 0.5; |
| 89 } | 106 } |
| 90 </style> | 107 </style> |
| 91 | 108 |
| 92 <p>{{"This is a list of the actively maintained filter subscriptions we're aware of. You can subscribe to any of them by simply clicking its \"Subscribe\" link and confirming your decision. The filters will be added to Adblock Plus and upda ted automatically. Note that <a href=\"getting_started#subscription\">you should n't add too many filter subscriptions</a>."|translate("s1")}}</p> | 109 <p>{{"This is a list of the actively maintained filter subscriptions we're aware of. You can subscribe to any of them by simply clicking its \"Subscribe\" link and confirming your decision. The filters will be added to Adblock Plus and upda ted automatically. Note that <a href=\"getting_started#subscription\">you should n't add too many filter subscriptions</a>."|translate("s1")}}</p> |
| 93 | 110 |
| 94 | 111 |
| 95 {% from "includes/subscriptionList" import display_subscriptions %} | 112 {% from "includes/subscriptionList" import display_subscriptions %} |
| 96 | 113 |
| 97 {{ display_subscriptions(1|get_subscriptions) }} | 114 {{ display_subscriptions(get_subscriptions()) }} |
| 98 | 115 |
| 99 | 116 |
| 100 <p>{{"Can't see your filter list here? <a href=\"mailto:subscriptionlist@adblock plus.org\">Send</a> the information you would like to be displayed here. Please note that in order to be included in this list your subscription must contain a comment at the beginning describing the origin of the filter list and the prefer red way of contacting you if problems with your list occur. You should also be c ertain that when these issues arise you will be able to fix them in a reasonable amount of time."|translate("s2")}}</p> | 117 <p>{{"Can't see your filter list here? <a href=\"mailto:subscriptionlist@adblock plus.org\">Send</a> the information you would like to be displayed here. Please note that in order to be included in this list your subscription must contain a comment at the beginning describing the origin of the filter list and the prefer red way of contacting you if problems with your list occur. You should also be c ertain that when these issues arise you will be able to fix them in a reasonable amount of time."|translate("s2")}}</p> |
| 101 | 118 |
| 102 <p> | 119 <p> |
| 103 {{"Please note that all of these filter lists are being maintained by third part ies. Eyeo, the company behind Adblock Plus, has no control over them.\nWe are on ly listing them to help you find lists that could be useful to you.\nIn no case shall Eyeo be held liable towards you or any other third party for any loss or d amage (including but not limited to loss of chances and of business) deriving di rectly or indirectly from your use of these lists."|translate("s3")}} | 120 {{"Please note that all of these filter lists are being maintained by third part ies. Eyeo, the company behind Adblock Plus, has no control over them.\nWe are on ly listing them to help you find lists that could be useful to you.\nIn no case shall Eyeo be held liable towards you or any other third party for any loss or d amage (including but not limited to loss of chances and of business) deriving di rectly or indirectly from your use of these lists."|translate("s3")}} |
| 104 </p> | 121 </p> |
| LEFT | RIGHT |
« includes/subscriptionList.tmpl ('k')
|
static/css/main.css » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
