Unified Diff: pages/adware.html
Issue 29340844:
Issue 3802 - Create page to inform users about adware on web.adblockplus.org (Closed)
Patch Set:
Created April 26, 2016, 5:05 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
static/img/check.png » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: pages/adware.html |
| =================================================================== |
| new file mode 100644 |
| --- /dev/null |
| +++ b/pages/adware.html |
| @@ -0,0 +1,223 @@ |
| +title=About adware |
|
saroyanm
2016/05/03 10:06:30
We usually using Markdown where it's possible, wha
juliandoucette
2016/05/11 00:45:39
If this document was .md then we could replace:
-
saroyanm
2016/05/17 10:19:42
There is a benefit, because I assume soon or later
|
| +noheading=true |
| + |
| +<head> |
| + <meta name="description" content="What is adware and how to get rid of it"> |
|
saroyanm
2016/05/03 10:06:30
we can also use open graph version for this tag.
juliandoucette
2016/05/11 00:45:38
For what reason?
This is the standard meta tag.
saroyanm
2016/05/17 10:19:42
For Social media:
https://developers.facebook.com/
|
| + <meta name="author" content="Eyeo GmbH / Adblock Plus"> |
|
saroyanm
2016/05/03 10:06:31
I think we can use this meta tag in the Template i
juliandoucette
2016/05/11 00:45:39
Nope. It's not in the default template. Would you
saroyanm
2016/05/17 10:19:43
I assume this is relevant to all other documentati
|
| + <meta property="og:image" content="/img/adblockplus_128.png"> |
| + <meta name="twitter:card" content="summary"> |
|
saroyanm
2016/05/03 10:06:32
Seems like the twitter cards should also use @ sig
juliandoucette
2016/05/11 00:45:41
Good catch.
|
| + <meta name="twitter:site" content="adblockplus"> |
| + <meta name="twitter:creator" content="adblockplus"> |
| + <style> |
| + .text-danger |
|
saroyanm
2016/05/03 10:06:32
You can have a wrapper for this reason, ex.: "warn
juliandoucette
2016/05/11 00:45:39
I agree.
|
| + { |
| + color: #E11A2C |
|
saroyanm
2016/05/03 10:06:31
Detail: please use lower case for the css values -
juliandoucette
2016/05/11 00:45:39
I don't think we should follow that rule.
Done an
saroyanm
2016/05/17 10:19:42
Why ? We are using this general rules in our Codin
|
| + } |
| + |
| + .alert-danger |
| + { |
| + padding: 15px; |
| + border: 2px solid; |
| + border-color: #E11A2C; |
| + background-color: #fff; |
| + } |
| + |
| + .badge-success |
| + { |
| + display: inline-block; |
| + width: 34px; |
| + color: #fff; |
| + background-color: #53B044; |
| + border-radius: 4px; |
| + font-weight: bold; |
| + font-size: 20px; |
| + line-height: 20px; |
| + vertical-align: top; |
| + text-align: center; |
| + padding: 7px 0; |
|
saroyanm
2016/05/03 10:06:30
Detail: Please reorder the properties according to
juliandoucette
2016/05/11 00:45:40
I don't think we should follow that rule.
Done an
saroyanm
2016/05/17 10:19:42
Same as above, we are using that rule as you can s
|
| + margin-right: 7px; |
| + } |
| + |
| + .table-unstyled |
| + { |
| + width: 100%; |
| + margin-bottom: 25px; |
| + } |
| + |
| + .table-unstyled th |
| + { |
| + text-align: left; |
| + font-size: 18px; |
| + line-height: 20px; |
| + font-weight: bold; |
| + padding-bottom: 20px; |
| + } |
| + |
| + .list-unstyled, |
| + .list-unstyled li |
| + { |
| + margin-left: 0; |
| + padding-left: 0; |
| + } |
| + |
| + .list-unstyled li |
| + { |
| + list-style-type: none; |
| + } |
| + |
| + .table-unstyled td, |
| + .list-unstyled li |
| + { |
| + line-height: 20px; |
| + padding-bottom: 10px; |
| + } |
| + |
| + .list-custom |
| + { |
| + padding-left: 40px; |
| + } |
| + |
| + .list-custom li |
| + { |
| + list-style-type: none; |
| + margin-bottom: 25px; |
| + } |
| + |
| + .list-custom .list-unstyled |
| + { |
| + margin-top: 20px; |
| + } |
| + |
| + .list-custom .list-unstyled li |
| + { |
| + margin-bottom: 0; |
| + } |
| + |
| + .list-custom .li-yes:before, |
|
saroyanm
2016/05/03 10:06:32
Please do not use element related class names.
juliandoucette
2016/05/11 00:45:40
If not li-yes, li-no is check-item, cross-item ok?
saroyanm
2016/05/17 10:19:42
The idea behind is that you can assign the rule to
|
| + .list-custom .li-no:before |
| + { |
| + padding: 0; |
| + margin: 0 0 0 -45px; |
| + content: ''; |
| + display: inline-block; |
| + height: 14px; |
| + width: 40px; |
|
saroyanm
2016/05/03 10:06:31
Width of the icon should be same size as the icon
juliandoucette
2016/05/11 00:45:39
- I do have 2 separate icon selectors .li-yes, .li
saroyanm
2016/05/17 10:19:43
SVG is not supported in the browser that we still
|
| + background-position: center center; |
| + background-size: contain; |
| + background-repeat: no-repeat; |
| + } |
| + |
| + .list-custom .li-yes:before |
| + { |
| + background-image: url("/img/check.png"); |
|
saroyanm
2016/05/03 10:06:30
The image size according to style-guide is 20x14px
juliandoucette
2016/05/11 00:45:40
The image should be SVG or higher resolution (the
saroyanm
2016/05/17 10:19:43
Same as the comment above,
|
| + } |
| + |
| + .list-custom .li-no:before |
| + { |
| + height: 18px; |
| + margin-bottom: -3px; |
| + background-image: url("/img/cross.png"); |
| + } |
| + |
| + #content .hr-top |
|
saroyanm
2016/05/03 10:06:32
You can apply this style to the section element it
juliandoucette
2016/05/11 00:45:39
You mean "section" not "select" :D ... That confus
|
| + { |
| + border-top: 1px solid #ccc; |
| + } |
| + |
| + #content h3 |
|
saroyanm
2016/05/03 10:06:30
In general would be great to have as less page spe
juliandoucette
2016/05/11 00:45:40
I agree / acknowledge.
In this case, I think H3
|
| + { |
| + line-height: 34px; |
| + vertical-align: middle; |
| + } |
| + </style> |
| +</head> |
| + |
| +<body> |
| + <h1>{{adware-page-header I’m using Adblock Plus but I still see suspicious ads}}</h1> |
|
saroyanm
2016/05/03 10:06:31
Detail: No need to use adware in the string name t
juliandoucette
2016/05/11 00:45:40
Thanks!
I didn't know this at the time.
|
| + |
| + <section> |
| + <h2 class="text-danger short">{{adware-alert-heading What happened?}}</h2> |
|
saroyanm
2016/05/03 10:06:31
No style is assigned to class "short"
juliandoucette
2016/05/11 00:45:40
Good catch! That was a leftover :-) .
|
| + <p class="alert-danger text-danger">{{adware-alert-content Adblock Plus has detected ads that are likely injected with Adware, which may have infected your computer.}}</p> |
| + </section> |
| + |
| + <section> |
| + <h2>{{what-is-adware-heading What is Adware?}}</h2> |
| + <p>{{what-is-adware-content Adware is one type of Malware, short for "Malicious Software.” 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.}}</p> |
| + </section> |
| + |
| + <section> |
| + <h2>{{why-not-blocked-heading Why doesn't Adblock Plus block these ads?}}</h2> |
| + <p>{{why-not-blocked-content Adblock Plus is designed to block ads that are delivered from websites or their advertising partners. Malicious software can inject ads in such a way that the ads can not reliably be blocked by Adblock Plus. The best way to stop these ads is to remove the Malware that displays them.}}</p> |
| + </section> |
| + |
| + <section> |
| + <h2>{{how-to-solve-heading How can I solve this?}}</h2> |
| + |
| + <section class="hr-top"> |
| + <h3><span class="badge-success">1</span> {{remove-unwanted-programs-heading Get rid of unwanted programs}}</h3> |
| + <p>{{remove-unwanted-programs-content For users unfamiliar with the administration of their computer's operating system, it’s recommended to run automated checks for 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 period) with full functionality, and safe to install alongside your antivirus solution.}}</p> |
| + <table class="table-unstyled"> |
|
saroyanm
2016/05/03 10:06:32
Please do not use Table for layouting, by changing
juliandoucette
2016/05/11 00:45:40
I believe this is tabular data?
(It also looks fi
saroyanm
2016/05/17 10:19:42
Unfortunately Tables are not responsive at all and
|
| + <thead> |
| + <th>{{windows-os Windows}}</th> |
| + <th>{{osx-os OS X}}</th> |
| + </thead> |
| + <tbody> |
| + <tr> |
| + <td><a href="{{malwarebytes-win-affiliate-link buy.malwarebytes.com/get-trial/adblock/en/?c=adblock&s=en&k=trial}}">{{malwarebytes-brand Malwarebytes}}</a></td> |
|
saroyanm
2016/05/03 10:06:31
1. I think this is wrong, I think we shouldn't tra
juliandoucette
2016/05/11 00:45:39
I disagree.
We do not have affiliate links for al
saroyanm
2016/05/17 10:19:43
Sorry I think I couldn't describe my point well, w
|
| + <td><a href="{{malwarebytes-osx affiliate-link https://www.malwarebytes.org/antimalware/mac/">{{malwarebytes-brand Malwarebytes}}</a></td> |
| + </tr> |
| + <tr><td><a href="http://www.surfright.nl/en/hitmanpro">{{hitmanpro-brand HitmanPro}}</a></td></tr> |
| + <tr><td><a href="https://toolslib.net/downloads/viewdownload/1-adwcleaner/">{{adwcleaner-brand AdwCleaner}}</a></td></tr> |
| + </tbody> |
| + </table> |
| + <p>{{advanced-users-content For advanced users, refer to the guides below to remove Malware and other programs on your computer that you don't remember installing. To regain control of your browsing experience, you must uninstall any malicious programs. For more help on uninstalling malicious programs from your computer, click one of the links below.}}</p> |
| + <ul class="list-unstyled"> |
| + <li><a href="http://malwaretips.com/blogs/malware-removal-guide-for-windows/">{{windows-os Windows}}</a></li> |
| + <li><a href="https://support.apple.com/en-us/HT203987">{{osx-os OS X}}</a></li> |
| + </ul> |
| + </section> |
| + |
| + <section class="hr-top"> |
| + <h3><span class="badge badge-success">2</span> {{reset-browser-settings-heading Reset your browser settings}}</h3> |
| + <p>{{reset-browser-settings-content Oftentimes uninstalling unwanted software does not restore your browser settings to their original state. Follow these guides to do this manually:}}</p> |
| + <ul class="list-unstyled"> |
| + <li><a href="https://support.microsoft.com/en-us/kb/923737">{{internet-explorer-browser Internet Explorer}}</a></li> |
| + <li><a href="https://support.mozilla.org/kb/reset-firefox-easily-fix-most-problems">{{firefox-browser Mozilla Firefox}}</a></li> |
| + <li><a href="https://support.google.com/chrome/answer/3296214">{{chrome-browser Google Chrome}}</a></li> |
| + <li><a href="http://winaero.com/blog/how-to-reset-opera-browser-settings-to-their-defaults/">{{opera-browser Opera}}</a></li> |
| + <li><a href="https://help.yandex.com/newbrowser/faq/faq-settings.xml#reset">{{yandex-browser Yandex.Browser}}</a></li> |
| + <li><a href="http://help.coupons.com/articles/177-How-do-I-reset-my-Safari-browser-to-its-default-settings-on-Macintosh">{{safari-6-7-browser Safari 6 & 7}}</a></li> |
| + <li><a href="https://discussions.apple.com/message/26874735">{{safari-8-9-browser Safari 8 & 9}}</a></li> |
| + </ul> |
| + </section> |
| + |
| + <section class="hr-top"> |
| + <h2>{{prevent-infection-heading How do I prevent my computer from getting infected with Malware in the future?}}</h2> |
| + <ul class="list-custom"> |
| + <li class="li-yes"> |
| + <strong>{{use-official-channels-heading Use official channels to download your browser:}}</strong> |
| + <ul class="list-unstyled"> |
| + <li><a href="http://www.mozilla.org/firefox">{{firefox-browser Mozilla Firefox}}</a></li> |
| + <li><a href="https://www.google.com/chrome/browser/desktop/">{{chrome-browser Google Chrome}}</a></li> |
| + <li><a href="http://www.opera.com/">{{opera-browser Opera}}</a></li> |
| + <li><a href="https://browser.yandex.com/">{{yandex-browser Yandex.Browser}}</a></li> |
| + </ul> |
| + </li> |
| + <li class="li-yes"> |
| + <strong>{{install-abp-heading Install Adblock Plus.}}</strong> |
| + {{install-abp-content Adblock Plus can help to block and hide ads that trick you into installing potentially unwanted programs. Get Adblock Plus from}} <a href="https://adblockplus.org/">https://adblockplus.org/</a>. |
| + </li> |
| + <li class="li-yes"> |
| + <strong>{{update-os-heading Keep your operating system and other software up-to-date.}}</strong> |
| + </li> |
| + <li class="li-no"> |
| + <strong class="text-danger">{{avoid-popups-heading Don't click inside misleading pop-up windows.}}</strong> |
| + {{avoid-popups-content Many malicious websites try to install Malware on your system by making images look like pop-up windows, or by displaying an animation of the website scanning your computer.}} |
| + </li> |
| + <li class="li-no"> |
| + <strong class="text-danger">{{dont-install-untrusted-heading Don't install untrusted software.}}</strong> |
| + {{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 software packages. Usually, these programs gather information on your browsing behavior that serve only the people who designed them. Make sure you only install add-ons, extensions and plug-ins from your browser’s web store website and that you uncheck unwanted programs in software installation wizards.}} |
| + </li> |
| + </ul> |
| + </section> |
| +</body> |
« no previous file with comments
|
« no previous file
|
static/img/check.png » ('j')
|
no next file with comments »
