pages/adware.md - Issue 29340844: Issue 3802 - Create page to inform users about adware on web.adblockplus.org

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 CSS NITs Created July 1, 2016, 6:03 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

LEFT	RIGHT
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 .separate-section	7 .separate-section

8 {	8 {

9 margin-top: 20px;	9 margin-top: 20px;

10 padding-top: 20px;	10 padding-top: 20px;

(...skipping 11 matching lines...) Expand all Loading...
22 [dir="rtl"] .narrow-list-block	22 [dir="rtl"] .narrow-list-block

23 {	23 {

24 margin: 0px 0px 10px 35px;	24 margin: 0px 0px 10px 35px;

25 }	25 }

26	26

27 .narrow-list-block ul	27 .narrow-list-block ul

28 {	28 {

29 margin-bottom: 0px;	29 margin-bottom: 0px;

30 }	30 }

31	31

32 .text-danger	32 .warning
saroyanm 2016/07/04 17:38:05 Detail: What about having a container name as "war Detail: What about having a container name as "warning", so you will not need to assing separate styles to the items, something like: .warning { color: #e11a2c; } .warning p { padding: 15px; border: 2px solid; border-color: #e11a2c; background-color: #fff; } juliandoucette 2016/07/04 18:07:15 The original intention was to create these classes Show quoted text On 2016/07/04 17:38:05, saroyanm wrote: > Detail: What about having a container name as "warning", so you will not need to > assing separate styles to the items, something like: > .warning > { > color: #e11a2c; > } > .warning p > { > padding: 15px; > border: 2px solid; > border-color: #e11a2c; > background-color: #fff; > } The original intention was to create these classes in a general way such that they could integrate into main.css. Thus, a class for _just making red text_ made sense. If we want to take the opposite approach then your suggestion is valid. I will implement it. saroyanm 2016/07/04 18:36:14 In future if we will use it more often yes we will Show quoted text On 2016/07/04 18:07:15, juliandoucette wrote: > On 2016/07/04 17:38:05, saroyanm wrote: > > Detail: What about having a container name as "warning", so you will not need > to > > assing separate styles to the items, something like: > > .warning > > { > > color: #e11a2c; > > } > > .warning p > > { > > padding: 15px; > > border: 2px solid; > > border-color: #e11a2c; > > background-color: #fff; > > } > > The original intention was to create these classes in a general way such that > they could integrate into main.css. Thus, a class for _just making red text_ > made sense. > > If we want to take the opposite approach then your suggestion is valid. I will > implement it. In future if we will use it more often yes we will need to make it more generic, currently I'm not sure if this will be used anywhere else, but yes in case we will start to use it often will use current approach or modify it. Anyway we can make it more generic while not creating two separate classes that will apply to the related to each other "Parent" and "child".
33 {	33 {

34 color: #e11a2c;	34 color: #e11a2c;

35 }	35 }

36	36

37 .alert-danger	37 .warning p

38 {	38 {

39 padding: 15px;	39 padding: 15px;

40 border: 2px solid;	40 border: 2px solid;

41 border-color: #e11a2c;	41 border-color: #e11a2c;

42 background-color: #fff;	42 background-color: #fff;

43 }	43 }

44	44

45 .icon-header	45 .icon-header

46 {	46 {

47 vertical-align: middle;	47 vertical-align: middle;

48 line-height: 34px;	48 line-height: 34px;

49 }	49 }

50	50

51 .icon-header span	51 .icon-header em

52 {	52 {

53 display: inline-block;	53 display: inline-block;

54 vertical-align: top;	54 vertical-align: top;

55 text-align: center;	55 text-align: center;

56 line-height: 20px;	56 line-height: 20px;

57 margin-right: 7px;	57 margin-right: 7px;

58 padding: 7px 0px;	58 padding: 7px 0px;

59 width: 34px;	59 width: 34px;

60 border-radius: 4px;	60 border-radius: 4px;

61 color: #fff;	61 color: #fff;

62 background-color: #53b044;	62 background-color: #53b044;

63 font-weight: bold;	63 font-weight: bold;

	64 font-style: normal;

64 font-size: 20px;	65 font-size: 20px;

65 }	66 }

66	67

67 #content ul	68 #content ul

68 {	69 {

69 margin-top: 10px;	70 margin-top: 10px;

70 margin-bottom: 10px;	71 margin-bottom: 10px;

71 padding: 0px;	72 padding: 0px;

	73 position: relative;

72 }	74 }

73	75

74 #content ul,	76 #content ul,

75 #content li	77 #content li

76 {	78 {

77 margin-left: 0px;	79 margin-left: 0px;

78 margin-right: 0px;	80 margin-right: 0px;

79 padding-left: 0px;	81 padding-left: 0px;

80 padding-right: 0px;	82 padding-right: 0px;

81 }	83 }

82	84

83 #content li	85 #content li

84 {	86 {

85 padding-bottom: 10px;	87 padding-bottom: 10px;

86 line-height: 20px;	88 line-height: 20px;

87 list-style-type: none;	89 list-style-type: none;

88 }	90 }

89	91

90 #content .icon-list	92 #content li.icon

91 {	93 {

92 position: relative;

93 margin: 0px;

94 padding: 20px 0px 0px 40px;	94 padding: 20px 0px 0px 40px;

95 overflow: visible;	95 overflow: visible;

96 list-style-type: none;	96 }

97 }	97

98	98 [dir="rtl"] #content li.icon

99 [dir="rtl"] #content .icon-list

100 {	99 {

101 padding: 20px 40px 0px 0px;	100 padding: 20px 40px 0px 0px;

102 }	101 }

103	102

104 #content .icon-list > li	103 li.icon::before

105 {	104 {

106 padding-bottom: 25px;	105 content: " ";

107 }

108

109 .icon-list > li > span

110 {

111 position: absolute;	106 position: absolute;

112 left: 0;	107 left: 0px;
saroyanm 2016/07/04 17:38:05 Detail: CSS number values should specify units whe Detail: CSS number values should specify units where possible, same goes to the one below juliandoucette 2016/07/04 18:07:15 Done. Show quoted text On 2016/07/04 17:38:05, saroyanm wrote: > Detail: CSS number values should specify units where possible, same goes to the > one below Done.
113 right: auto;	108 right: auto;

114 height: 20px;	109 height: 20px;

115 width: 40px;	110 width: 40px;

116 }	111 }

117	112

118 [dir="rtl"] .icon-list > li > span	113 [dir="rtl"] li.icon::before

119 {	114 {

120 right: 0;	115 right: 0px;

121 left: auto;	116 left: auto;

122 }	117 }

123	118

124 .check-item	119 li.icon.check::before

125 {	120 {

126 background: url("/img/check.png") no-repeat center top;	121 background: url("/img/check.png") no-repeat center top;

127 }	122 }

128	123

129 .cross-item	124 li.icon.cross::before

130 {	125 {

131 background: url("/img/cross.png") no-repeat center top;	126 background: url("/img/cross.png") no-repeat center top;

	127 }

	128

	129 li.icon.cross strong

	130 {

	131 color: #e11a2c;

132 }	132 }

133 </style>	133 </style>

134 </head>	134 </head>

135	135

136 # {{page-header I’m using <fix>Adblock Plus</fix> but I still see suspicious ads }}	136 # {{page-header I’m using <fix>Adblock Plus</fix> but I still see suspicious ads }}

137	137

138 <div class="text-danger" markdown="1">	138 <div class="warning" markdown="1">

139 ## {{alert-heading What happened?}}	139 ## {{alert-heading What happened?}}

140	140

141 {{alert-content <fix>Adblock Plus</fix> has detected ads that are likely injecte d with Adware, 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.}}

142 {: .alert-danger }

143 </div>	142 </div>

144	143

145 ## {{what-is-adware-heading What is Adware?}}	144 ## {{what-is-adware-heading What is Adware?}}

146	145

147 {{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.}}

148	147

149 ## {{why-not-blocked-heading Why doesn't <fix>Adblock Plus</fix> block these ads ?}}	148 ## {{why-not-blocked-heading Why doesn't <fix>Adblock Plus</fix> block these ads ?}}

150	149

151 {{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.}}	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.}}

152	151

153 ## {{how-to-solve-heading How can I solve this?}}	152 ## {{how-to-solve-heading How can I solve this?}}

154	153

155 ### <span>1</span> {{remove-unwanted-programs-heading Get rid of unwanted progra ms}} { .separate-section .icon-header }	154 ### 1 {{remove-unwanted-programs-heading Get rid of unwanted programs}} { .sep arate-section .icon-header }

156	155

157 {{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.}}

158	157

159 <div class="narrow-list-block" markdown="1">	158 <div class="narrow-list-block" markdown="1">

160	159

161 #### Windows	160 #### Windows

162	161

163 <ul markdown="1">

164 * <a href="{{malwarebytes-win-affiliate-link http://buy.malwarebytes.com/get-tri al/adblock/en/?c=adblock&s=en&k=trial}}">Malwarebytes</a>	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 @Julian: before pushing the changes can you please be sure that the Malwarebyte links are not translatable, while they implemented redirection according to the user Browser setup, please implement this in same fashion that other similar links, same goes to the one below. In case this are only changes that needs to be done, otherwise please update the patch. juliandoucette 2016/07/07 20:26:54 Will do. Show quoted text On 2016/07/07 13:02:26, saroyanm wrote: > @Julian: before pushing the changes can you please be sure that the Malwarebyte > links are not translatable, while they implemented redirection according to the > user Browser setup, please implement this in same fashion that other similar > links, same goes to the one below. In case this are only changes that needs to > be done, otherwise please update the patch. Will do.
165 * <a href="http://www.surfright.nl/hitmanpro">HitmanPro</a>	163 * [HitmanPro](http://www.surfright.nl/hitmanpro)
saroyanm 2016/07/04 17:38:05 Detail: Please use the markdown where its possible Detail: Please use the markdown where its possible: * [HitmanPro](http://www.surfright.nl/hitmanpro/) * [AdwCleaner](https://toolslib.net/downloads/viewdownload/1-adwcleaner/) juliandoucette 2016/07/04 18:07:14 Done. Show quoted text On 2016/07/04 17:38:05, saroyanm wrote: > Detail: > Please use the markdown where its possible: > * [HitmanPro](http://www.surfright.nl/hitmanpro/) > * [AdwCleaner](https://toolslib.net/downloads/viewdownload/1-adwcleaner/) Done.
166 * <a href="https://toolslib.net/downloads/viewdownload/1-adwcleaner/">AdwCleaner </a>	164 * [AdwCleaner](https://toolslib.net/downloads/viewdownload/1-adwcleaner/)

167 </ul>

168	165

169 </div>	166 </div>

170 <div class="narrow-list-block" markdown="1">	167 <div class="narrow-list-block" markdown="1">

171	168

172 #### OS X	169 #### OS X

173	170

174 <ul markdown="1">

175 * <a href="{{malwarebytes-osx-affiliate-link https://www.malwarebytes.org/antima lware/mac/}}">Malwarebytes</a>	171 * <a href="{{malwarebytes-osx-affiliate-link https://www.malwarebytes.org/antima lware/mac/}}">Malwarebytes</a>

176 </ul>

177	172

178 </div>	173 </div>

179	174

180 {{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.}}

181	176

182 <ul markdown="1">

183 * [Windows](http://malwaretips.com/blogs/malware-removal-guide-for-windows/)	177 * [Windows](http://malwaretips.com/blogs/malware-removal-guide-for-windows/)

184 * [OS X](https://support.apple.com/en-us/HT203987)	178 * [OS X](https://support.apple.com/en-us/HT203987)

185 </ul>	179

186	180 ### 2 {{reset-browser-settings-heading Reset your browser settings}} { .icon-h eader }

187 ### <span>2</span> {{reset-browser-settings-heading Reset your browser settings} } { .icon-header }

188	181

189 {{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:}}

190	183

191 <ul markdown="1">

192 * [Internet Explorer](https://support.microsoft.com/en-us/kb/923737)	184 * [Internet Explorer](https://support.microsoft.com/en-us/kb/923737)

193 * [Mozilla Firefox](https://support.mozilla.org/kb/reset-firefox-easily-fix-most -problems)	185 * [Mozilla Firefox](https://support.mozilla.org/kb/reset-firefox-easily-fix-most -problems)

194 * [Google Chrome](https://support.google.com/chrome/answer/3296214)	186 * [Google Chrome](https://support.google.com/chrome/answer/3296214)

195 * [Opera](http://winaero.com/blog/how-to-reset-opera-browser-settings-to-their-d efaults/)	187 * [Opera](http://winaero.com/blog/how-to-reset-opera-browser-settings-to-their-d efaults/)

196 * [Yandex.Browser](https://help.yandex.com/newbrowser/faq/faq-settings.xml#reset )	188 * [Yandex.Browser](https://help.yandex.com/newbrowser/faq/faq-settings.xml#reset )

197 * [Safari 6 & 7](http://help.coupons.com/articles/177-How-do-I-reset-my-Safari-b rowser-to-its-default-settings-on-Macintosh)	189 * [Safari 6 & 7](http://help.coupons.com/articles/177-How-do-I-reset-my-Safari-b rowser-to-its-default-settings-on-Macintosh)

198 * [Safari 8 & 9](https://discussions.apple.com/message/26874735)	190 * [Safari 8 & 9](https://discussions.apple.com/message/26874735)

199 </ul>

200	191

201 ## {{prevent-infection-heading How do I prevent my computer from getting infecte d with Malware in the future?}} { .separate-section .icon-header }	192 ## {{prevent-infection-heading How do I prevent my computer from getting infecte d with Malware in the future?}} { .separate-section .icon-header }

202	193

203 <ul class="icon-list" markdown="1">	194 * {{use-official-channels-heading Use official channels to download your brows er:}}

204 * <span class="check-item"></span> {{use-official-channels-heading Use officia l channels to download your browser:}}	195 { .icon .check }
saroyanm 2016/07/04 17:38:06 What about having a class on list item, so you can What about having a class on list item, so you can replace HTML implementation ex.: * {{use-official-channels-heading Use official channels to download your browser:}} {.icon.check} .icon::before { content: ""; position: absolute; left: 0; right: auto; height: 20px; width: 40px; } .check::before { background: url("/img/check.png") no-repeat center top; } .cross::before { background: url("/img/cross.png") no-repeat center top; } juliandoucette 2016/07/04 18:07:15 Good catch. I'll do you one better. Since each li Show quoted text On 2016/07/04 17:38:06, saroyanm wrote: > What about having a class on list item, so you can replace HTML implementation > ex.: > * {{use-official-channels-heading Use official channels to download your > browser:}} > {.icon.check} > > .icon::before > { > content: ""; > position: absolute; > left: 0; > right: auto; > height: 20px; > width: 40px; > } > > .check::before > { > background: url("/img/check.png") no-repeat center top; > } > > .cross::before > { > background: url("/img/cross.png") no-repeat center top; > } Good catch. I'll do you one better. Since each list item in an .icon-list contains an .icon, we don't need the .icon class anymore. .icon-list > li makes more sense. saroyanm 2016/07/04 18:36:14 I thought it's more readable, when you have as a c Show quoted text On 2016/07/04 18:07:15, juliandoucette wrote: > On 2016/07/04 17:38:06, saroyanm wrote: > > What about having a class on list item, so you can replace HTML implementation > > ex.: > > * {{use-official-channels-heading Use official channels to download your > > browser:}} > > {.icon.check} > > > > .icon::before > > { > > content: ""; > > position: absolute; > > left: 0; > > right: auto; > > height: 20px; > > width: 40px; > > } > > > > .check::before > > { > > background: url("/img/check.png") no-repeat center top; > > } > > > > .cross::before > > { > > background: url("/img/cross.png") no-repeat center top; > > } > > Good catch. > > I'll do you one better. Since each list item in an .icon-list contains an .icon, > we don't need the .icon class anymore. .icon-list > li makes more sense. I thought it's more readable, when you have as a class "icon" and "check" or "cross", which make it more intentional for user writing Markdown to use, but this implementation still looks fine for me, my initial intention was to get rid of the HTML tags.
205 * [Mozilla Firefox](http://www.mozilla.org/firefox)	196 * [Mozilla Firefox](http://www.mozilla.org/firefox)

206 * [Google Chrome](https://www.google.com/chrome/browser/desktop/)	197 * [Google Chrome](https://www.google.com/chrome/browser/desktop/)

207 * [Opera](http://www.opera.com/)	198 * [Opera](http://www.opera.com/)

208 * [Yandex.Browser](https://browser.yandex.com/)	199 * [Yandex.Browser](https://browser.yandex.com/)

209 * <span class="check-item"></span> {{install-abp-heading Install <fix>Adblock Plus</fix>.}} {{install-abp-content <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}} [https://adblockplus.org/](https://adblockplus.org /).	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/).

210 * <span class="check-item"></span> {{update-os-heading Keep your operating sys tem and other software up-to-date.}}	201 { .icon .check }

211 * <span class="cross-item"></span> {{avoid-popups-heading Don't click inside m isleading pop-up windows.}}{ .text-danger } {{avoid-popups-content Many malici ous websites try to install Malware on your system by making images look like po p-up windows, or by displaying an animation of the website scanning your compute r.}}	202 * {{update-os-heading Keep your operating system and other software up-to-date .}}

212 * <span class="cross-item"></span> {{dont-install-untrusted-heading Don't inst all untrusted software.}}{: .text-danger} {{dont-install-untrusted-content Som e 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 software packages. Usually, these programs gather information on your browsing behavior that serve only the people who designed t hem. Make sure you only install add-ons, extensions and plug-ins from your brows er’s web store website and that you uncheck unwanted programs in software instal lation wizards.}}	203 { .icon .check }

213 </ul>	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.}}

	205 { .icon .cross }

	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.}}

	207 { .icon .cross }

LEFT	RIGHT