Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: pages/adware.md

Issue 29340844: Issue 3802 - Create page to inform users about adware on web.adblockplus.org (Closed)
Left Patch Set: Fixed styles, moved styles back to page, fixed translation error Created May 31, 2016, 7:25 p.m.
Right Patch Set: Refactored away obsolute HTML tags in markdown Created July 4, 2016, 7:27 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | static/img/check.png » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 title=About adware 1 title=About adware
2 description=What is adware and how to get rid of it 2 description=What is adware and how to get rid of it
3 noheading=true 3 noheading=true
4 4
5 <head> 5 <head>
6 <style> 6 <style>
7 .split-section 7 .separate-section
8 { 8 {
9 margin-top: 20px; 9 margin-top: 20px;
10 padding-top: 20px; 10 padding-top: 20px;
11 border-top: 1px solid #ccc; 11 border-top: 1px solid #ccc;
12 } 12 }
13 13
14 .narrow-list 14 .narrow-list-block
15 { 15 {
16 display: inline-block; 16 display: inline-block;
17 width: 250px; 17 width: 250px;
18 margin: 0px 35px 10px 0px; 18 margin: 0px 35px 10px 0px;
saroyanm 2016/06/06 14:47:31 Right margin will misalign the element for RTL dir
juliandoucette 2016/06/13 18:12:50 Done.
19 vertical-align: top; 19 vertical-align: top;
20 } 20 }
21 21
22 .narrow-list ul 22 [dir="rtl"] .narrow-list-block
23 {
24 margin: 0px 0px 10px 35px;
25 }
26
27 .narrow-list-block ul
23 { 28 {
24 margin-bottom: 0px; 29 margin-bottom: 0px;
25 } 30 }
26 31
27 .text-danger 32 .warning
28 { 33 {
29 color: #e11a2c; 34 color: #e11a2c;
30 } 35 }
31 36
32 .alert-danger 37 .warning p
33 { 38 {
34 padding: 15px; 39 padding: 15px;
35 border: 2px solid; 40 border: 2px solid;
36 border-color: #e11a2c; 41 border-color: #e11a2c;
37 background-color: #fff; 42 background-color: #fff;
38 } 43 }
39 44
40 .badge-header 45 .icon-header
41 { 46 {
42 vertical-align: middle; 47 vertical-align: middle;
43 line-height: 34px; 48 line-height: 34px;
44 } 49 }
45 50
46 .badge-success 51 .icon-header em
47 { 52 {
48 display: inline-block; 53 display: inline-block;
49 vertical-align: top; 54 vertical-align: top;
50 text-align: center; 55 text-align: center;
51 line-height: 20px; 56 line-height: 20px;
52 margin-right: 7px; 57 margin-right: 7px;
53 padding: 7px 0px; 58 padding: 7px 0px;
54 width: 34px; 59 width: 34px;
55 border-radius: 4px; 60 border-radius: 4px;
56 color: #fff; 61 color: #fff;
57 background-color: #53b044; 62 background-color: #53b044;
58 font-weight: bold; 63 font-weight: bold;
64 font-style: normal;
59 font-size: 20px; 65 font-size: 20px;
60 } 66 }
61 67
62 .list-unstyled, 68 #content ul
63 .list-unstyled li 69 {
70 margin-top: 10px;
71 margin-bottom: 10px;
72 padding: 0px;
73 position: relative;
74 }
75
76 #content ul,
77 #content li
64 { 78 {
65 margin-left: 0px; 79 margin-left: 0px;
saroyanm 2016/06/06 14:47:30 Please also consider RTL direction.
juliandoucette 2016/06/13 18:12:50 Done.
80 margin-right: 0px;
66 padding-left: 0px; 81 padding-left: 0px;
67 } 82 padding-right: 0px;
68 83 }
69 .list-unstyled li 84
70 { 85 #content li
71 list-style-type: none;
72 }
73
74 .list-unstyled li
75 { 86 {
76 padding-bottom: 10px; 87 padding-bottom: 10px;
77 line-height: 20px; 88 line-height: 20px;
78 } 89 list-style-type: none;
79 90 }
80 .list-custom 91
81 { 92 #content li.icon
82 padding-left: 0px; 93 {
94 padding: 20px 0px 0px 40px;
83 overflow: visible; 95 overflow: visible;
84 list-style-type: none; 96 }
85 } 97
86 98 [dir="rtl"] #content li.icon
87 .list-custom ul { 99 {
saroyanm 2016/06/06 14:47:30 Detail: the braces should go to their own line
juliandoucette 2016/06/13 18:12:49 Done.
88 margin-left: 45px; 100 padding: 20px 40px 0px 0px;
89 margin-top: 20px; 101 }
90 } 102
91 103 li.icon::before
92 .list-custom > li 104 {
93 { 105 content: " ";
94 margin-bottom: 25px; 106 position: absolute;
95 } 107 left: 0px;
96 108 right: auto;
97 .list-custom .check-item, 109 height: 20px;
98 .list-custom .cross-item 110 width: 40px;
99 { 111 }
100 min-height: 20px; 112
101 padding-left: 45px; 113 [dir="rtl"] li.icon::before
102 padding-top: 2px; 114 {
103 } 115 right: 0px;
104 116 left: auto;
105 .list-custom .check-item 117 }
saroyanm 2016/06/06 14:47:31 This solution also doesn't work for RTL directions
juliandoucette 2016/06/13 18:12:50 Done.
106 { 118
107 background: url("/img/check.png") no-repeat 10px top; 119 li.icon.check::before
108 } 120 {
109 121 background: url("/img/check.png") no-repeat center top;
110 .list-custom .cross-item 122 }
111 { 123
112 background: url("/img/cross.png") no-repeat 10px top; 124 li.icon.cross::before
125 {
126 background: url("/img/cross.png") no-repeat center top;
127 }
128
129 li.icon.cross strong
130 {
131 color: #e11a2c;
113 } 132 }
114 </style> 133 </style>
115 </head> 134 </head>
116 135
117 # {{page-header I’m using Adblock Plus but I still see suspicious ads}} 136 # {{page-header I’m using <fix>Adblock Plus</fix> but I still see suspicious ads }}
118 137
119 <div class="text-danger" markdown="1"> 138 <div class="warning" markdown="1">
120 ## {{alert-heading What happened?}} 139 ## {{alert-heading What happened?}}
121 140
122 {{alert-content Adblock Plus has detected ads that are likely injected with Adwa re, which may have infected your computer.}} 141 {{alert-content <fix>Adblock Plus</fix> has detected ads that are likely injecte d with Adware, which may have infected your computer.}}
123 {: .alert-danger }
124 </div> 142 </div>
125 143
126 ## {{what-is-adware-heading What is Adware?}} 144 ## {{what-is-adware-heading What is Adware?}}
127 145
128 {{what-is-adware-content Adware is one type of Malware, short for "Malicious Sof tware.” It is a term generally used for software installed on your computer that is designed to infiltrate or damage a computer system without your consent. In many cases you obtained this software without knowing it, as these applications are often bundled in other software installers.}} 146 {{what-is-adware-content Adware is one type of Malware, short for "Malicious Sof tware.” It is a term generally used for software installed on your computer that is designed to infiltrate or damage a computer system without your consent. In many cases you obtained this software without knowing it, as these applications are often bundled in other software installers.}}
129 147
130 ## {{why-not-blocked-heading Why doesn't Adblock Plus block these ads?}} 148 ## {{why-not-blocked-heading Why doesn't <fix>Adblock Plus</fix> block these ads ?}}
131 149
132 {{why-not-blocked-content Adblock Plus is designed to block ads that are deliver ed from websites or their advertising partners. Malicious software can inject ad s in such a way that the ads can not reliably be blocked by Adblock Plus. The be st way to stop these ads is to remove the Malware that displays them.}} 150 {{why-not-blocked-content <fix>Adblock Plus</fix> is designed to block ads that are delivered from websites or their advertising partners. Malicious software ca n inject ads in such a way that the ads can not reliably be blocked by <fix>Adbl ock Plus</fix>. The best way to stop these ads is to remove the Malware that dis plays them.}}
133 151
134 ## {{how-to-solve-heading How can I solve this?}} 152 ## {{how-to-solve-heading How can I solve this?}}
135 153
136 ### <span class="badge-success">1</span> {{remove-unwanted-programs-heading Get rid of unwanted programs}} { .split-section .badge-header } 154 ### *1* {{remove-unwanted-programs-heading Get rid of unwanted programs}} { .sep arate-section .icon-header }
137 155
138 {{remove-unwanted-programs-content For users unfamiliar with the administration of their computer's operating system, it’s recommended to run automated checks f or Malware with one of the programs listed below, which also allow to remove the found unwanted software. All of the programs are free (for at least a trial per iod) with full functionality, and safe to install alongside your antivirus solut ion.}} 156 {{remove-unwanted-programs-content For users unfamiliar with the administration of their computer's operating system, it’s recommended to run automated checks f or Malware with one of the programs listed below, which also allow to remove the found unwanted software. All of the programs are free (for at least a trial per iod) with full functionality, and safe to install alongside your antivirus solut ion.}}
139 157
140 <div class="narrow-list" markdown="1"> 158 <div class="narrow-list-block" markdown="1">
141 159
142 #### {{windows-os Windows}} 160 #### Windows
143 161
144 <ul class="list-unstyled" markdown="1"> 162 * <a href="{{malwarebytes-win-affiliate-link http://buy.malwarebytes.com/get-tri al/adblock/en/?c=adblock&s=en&k=trial}}">Malwarebytes</a>
saroyanm 2016/07/07 13:02:26 @Julian: before pushing the changes can you please
juliandoucette 2016/07/07 20:26:54 Will do.
145 * [{{malwarebytes-brand Malwarebytes}}]({{malwarebytes-win-affiliate-link http:/ /buy.malwarebytes.com/get-trial/adblock/en/?c=adblock&s=en&k=trial}}) 163 * [HitmanPro](http://www.surfright.nl/hitmanpro)
saroyanm 2016/06/06 14:47:31 I think the brand/website names shouldn't be trans
saroyanm 2016/06/06 14:47:31 As mentioned here: https://codereview.adblockplus.
Philip Hill 2016/06/06 14:52:51 As I mentioned already, localizing website content
saroyanm 2016/06/06 15:44:52 Having another look into the issue, seems like the
saroyanm 2016/06/06 15:53:39 @Julian probably if you will use <a> tags the link
juliandoucette 2016/06/13 18:12:51 Done. I vote we investigate this issue further in
146 * [{{hitmanpro-brand HitmanPro}}]({{hitmanpro-win-affiliate-link http://www.surf right.nl/en/hitmanpro}}) 164 * [AdwCleaner](https://toolslib.net/downloads/viewdownload/1-adwcleaner/)
147 * [{{adwcleaner-brand AdwCleaner}}]({{adcleaner-win-affiliate-link https://tools lib.net/downloads/viewdownload/1-adwcleaner/}})
148 </ul>
149 165
150 </div> 166 </div>
151 <div class="narrow-list" markdown="1"> 167 <div class="narrow-list-block" markdown="1">
152 168
153 #### {{osx-os OS X}} 169 #### OS X
154 170
155 <ul class="list-unstyled" markdown="1"> 171 * <a href="{{malwarebytes-osx-affiliate-link https://www.malwarebytes.org/antima lware/mac/}}">Malwarebytes</a>
156 * [{{malwarebytes-brand Malwarebytes}}]({{malwarebytes-osx affiliate-link https: //www.malwarebytes.org/antimalware/mac/)
157 </ul>
158 172
159 </div> 173 </div>
160 174
161 {{advanced-users-content For advanced users, refer to the guides below to remov e Malware and other programs on your computer that you don't remember installing . To regain control of your browsing experience, you must uninstall any maliciou s programs. For more help on uninstalling malicious programs from your computer, click one of the links below.}} 175 {{advanced-users-content For advanced users, refer to the guides below to remov e Malware and other programs on your computer that you don't remember installing . To regain control of your browsing experience, you must uninstall any maliciou s programs. For more help on uninstalling malicious programs from your computer, click one of the links below.}}
162 176
163 <ul class="list-unstyled" markdown="1"> 177 * [Windows](http://malwaretips.com/blogs/malware-removal-guide-for-windows/)
164 * [{{windows-os Windows}}](http://malwaretips.com/blogs/malware-removal-guide-fo r-windows/) 178 * [OS X](https://support.apple.com/en-us/HT203987)
165 * [{{osx-os OS X}}](https://support.apple.com/en-us/HT203987) 179
166 </ul> 180 ### *2* {{reset-browser-settings-heading Reset your browser settings}} { .icon-h eader }
167
168 ### <span class="badge badge-success">2</span> {{reset-browser-settings-heading Reset your browser settings}} { .split-section .badge-header }
saroyanm 2016/06/06 14:47:31 Class "badge" is not being used anywhere
juliandoucette 2016/06/13 18:12:50 Done.
169 181
170 {{reset-browser-settings-content Oftentimes uninstalling unwanted software does not restore your browser settings to their original state. Follow these guides t o do this manually:}} 182 {{reset-browser-settings-content Oftentimes uninstalling unwanted software does not restore your browser settings to their original state. Follow these guides t o do this manually:}}
171 183
172 <ul class="list-unstyled" markdown="1"> 184 * [Internet Explorer](https://support.microsoft.com/en-us/kb/923737)
173 * [{{internet-explorer-browser Internet Explorer}}](https://support.microsoft.co m/en-us/kb/923737) 185 * [Mozilla Firefox](https://support.mozilla.org/kb/reset-firefox-easily-fix-most -problems)
174 * [{{firefox-browser Mozilla Firefox}}](https://support.mozilla.org/kb/reset-fir efox-easily-fix-most-problems) 186 * [Google Chrome](https://support.google.com/chrome/answer/3296214)
175 * [{{chrome-browser Google Chrome}}](https://support.google.com/chrome/answer/32 96214) 187 * [Opera](http://winaero.com/blog/how-to-reset-opera-browser-settings-to-their-d efaults/)
176 * [{{opera-browser Opera}}](http://winaero.com/blog/how-to-reset-opera-browser-s ettings-to-their-defaults/) 188 * [Yandex.Browser](https://help.yandex.com/newbrowser/faq/faq-settings.xml#reset )
177 * [{{yandex-browser Yandex.Browser}}](https://help.yandex.com/newbrowser/faq/faq -settings.xml#reset) 189 * [Safari 6 & 7](http://help.coupons.com/articles/177-How-do-I-reset-my-Safari-b rowser-to-its-default-settings-on-Macintosh)
178 * [{{safari-6-7-browser Safari 6 & 7}}](http://help.coupons.com/articles/177-How -do-I-reset-my-Safari-browser-to-its-default-settings-on-Macintosh) 190 * [Safari 8 & 9](https://discussions.apple.com/message/26874735)
179 * [{{safari-8-9-browser Safari 8 & 9}}](https://discussions.apple.com/message/26 874735) 191
180 </ul> 192 ## {{prevent-infection-heading How do I prevent my computer from getting infecte d with Malware in the future?}} { .separate-section .icon-header }
181 193
182 ## {{prevent-infection-heading How do I prevent my computer from getting infecte d with Malware in the future?}} { .split-section .badge-header } 194 * **{{use-official-channels-heading Use official channels to download your brows er:}}**
183 195 { .icon .check }
184 <ul markdown="1" class="list-custom"> 196 * [Mozilla Firefox](http://www.mozilla.org/firefox)
185 * **{{use-official-channels-heading Use official channels to download your brows er:}}**{: .check-item } 197 * [Google Chrome](https://www.google.com/chrome/browser/desktop/)
186 <ul class="list-unstyled" markdown="1"> 198 * [Opera](http://www.opera.com/)
187 * [{{firefox-browser Mozilla Firefox}}](http://www.mozilla.org/firefox) 199 * [Yandex.Browser](https://browser.yandex.com/)
188 * [{{chrome-browser Google Chrome}}](https://www.google.com/chrome/browser/des ktop/) 200 * **{{install-abp-heading Install <fix>Adblock Plus</fix>.}}** {{install-abp-con tent <fix>Adblock Plus</fix> can help to block and hide ads that trick you into installing potentially unwanted programs. Get <fix>Adblock Plus</fix> from}} [ht tps://adblockplus.org/](https://adblockplus.org/).
189 * [{{opera-browser Opera}}](http://www.opera.com/) 201 { .icon .check }
190 * [{{yandex-browser Yandex.Browser}}](https://browser.yandex.com/)
191 </ul>
192 * **{{install-abp-heading Install Adblock Plus.}}** {{install-abp-content Adbloc k Plus can help to block and hide ads that trick you into installing potentially unwanted programs. Get Adblock Plus from}} [https://adblockplus.org/](https://a dblockplus.org/).
saroyanm 2016/06/06 14:47:30 The product name can be fixed: <fix>Adblock Plus</
juliandoucette 2016/06/13 18:12:50 Is it obvious for translators that the fixed text
193 {: .check-item }
194 * **{{update-os-heading Keep your operating system and other software up-to-date .}}** 202 * **{{update-os-heading Keep your operating system and other software up-to-date .}}**
195 {: .check-item } 203 { .icon .check }
196 * </span> **{{avoid-popups-heading Don't click inside misleading pop-up windows. }}**{ .text-danger } {{avoid-popups-content Many malicious websites try to insta ll Malware on your system by making images look like pop-up windows, or by displ aying an animation of the website scanning your computer.}} 204 * **{{avoid-popups-heading Don't click inside misleading pop-up windows.}}**{ .t ext-danger } {{avoid-popups-content Many malicious websites try to install Malwa re on your system by making images look like pop-up windows, or by displaying an animation of the website scanning your computer.}}
197 {: .cross-item } 205 { .icon .cross }
198 * **{{dont-install-untrusted-heading Don't install untrusted software.}}**{: .te xt-danger} {{dont-install-untrusted-content Some websites offer you software to accelerate your browser, to help you search the web, or to add toolbars that do things your browser already does. Some unwanted programs also come bundled in so ftware packages. Usually, these programs gather information on your browsing beh avior that serve only the people who designed them. Make sure you only install a dd-ons, extensions and plug-ins from your browser’s web store website and that y ou uncheck unwanted programs in software installation wizards.}} 206 * **{{dont-install-untrusted-heading Don't install untrusted software.}}**{: .te xt-danger} {{dont-install-untrusted-content Some websites offer you software to accelerate your browser, to help you search the web, or to add toolbars that do things your browser already does. Some unwanted programs also come bundled in so ftware packages. Usually, these programs gather information on your browsing beh avior that serve only the people who designed them. Make sure you only install a dd-ons, extensions and plug-ins from your browser’s web store website and that y ou uncheck unwanted programs in software installation wizards.}}
199 {: .cross-item} 207 { .icon .cross }
200 </ul>
LEFTRIGHT

Powered by Google App Engine
This is Rietveld