Unified Diff: templates/default.tmpl
Issue 29340844:
Issue 3802 - Create page to inform users about adware on web.adblockplus.org (Closed)
Patch Set: Fixed styles, moved styles back to page, fixed translation error
Created May 31, 2016, 7:25 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« pages/adware.md ('K')
|
« static/img/cross.png ('k')
|
no next file »
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: templates/default.tmpl |
| =================================================================== |
| --- a/templates/default.tmpl |
| +++ b/templates/default.tmpl |
| @@ -13,20 +13,43 @@ |
| # |
| # You should have received a copy of the GNU General Public License |
| # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
| #} |
| <!DOCTYPE html> |
| <html lang="{{locale}}" dir="{{"rtl" if config.has_option("rtl", locale) else "ltr"}}" itemscope="itemscope" itemtype="http://schema.org/WebPage"> |
| <head> |
| - <title>{{title|translate("title")}}</title> |
| - |
| <meta charset="utf-8"> |
| <meta name="viewport" content="width=device-width, initial-scale=1"> |
| + |
| + <title>{{title|translate("title")}}</title> |
| + <meta name="author" content="{{author|translate("author") if author else "Eyeo GmbH / Adblock Plus"|translate("meta")}}" /> |
| + {% if description %} |
| + <meta name="description" content="{{description|translate("description")}}"> |
| + {% endif %} |
| + |
| + {# facebook / Open Graph http://ogp.me/ #} |
| + {% if og_title %} |
| + <meta property="og:title" content="{{og_title|translate("og_title")}}" /> |
| + {% endif %} |
| + <meta property="og:type" content="{{og_type if og_type else 'website'}}" /> |
| + {% if og_url %} |
|
saroyanm
2016/06/01 14:38:01
This is not being used anywhere, we can add it as
juliandoucette
2016/06/01 15:56:38
It is like a canonical URL. I chose to include it
saroyanm
2016/06/01 15:59:28
So maybe in this case we can have something like:
juliandoucette
2016/06/01 16:09:50
~no
See:
https://developers.facebook.com/docs/sha
saroyanm
2016/06/02 15:05:11
Same goes here as my previous comment, we need to
juliandoucette
2016/06/13 18:12:51
Done.
|
| + <meta property="og:url" content="{{og_url}}" /> |
| + {% endif %} |
| + {% if og_description %} |
| + <meta property="og:description" content="{{og_description|translate("og_description")}}" /> |
| + {% endif %} |
| + <meta property="og:image" content="{{og_image if og_image else '/img/adblockplus_promo.png'}}" /> |
| + |
| + {# twitter https://dev.twitter.com/cards/markup #} |
| + <meta name="twitter:card" content="{{twitter_card if twitter_card else 'summary'}}" /> |
|
saroyanm
2016/06/21 14:58:03
Shouldn't we also include twitter:card ? Why was i
juliandoucette
2016/06/23 16:10:56
I removed twitter:card because we were not using i
|
| + <meta name="twitter:site" content="{{twitter_site if twitter_site else '@AdblockPlus'}}" /> |
| + <meta name="twitter:creator" content="{{twitter_creator if twitter_creator else '@AdblockPlus'}}" /> |
| + |
| <link rel="stylesheet" href="/css/main.css" class="cssfx"> |
| <link rel="stylesheet" href="/css/main-desktop.css" media="(min-width: 1000px)" class="cssfx"> |
| <link rel="stylesheet" href="/css/main-mobile.css" media="(max-width: 1000px)"> |
| <link rel="canonical" href="https://adblockplus.org/{{page}}"> |
| <link rel="apple-touch-icon" href="/img/favicon-large.png" /> |
| <!--[if IE 8]> |
« pages/adware.md ('K')
|
« static/img/cross.png ('k')
|
no next file »
|
no next file with comments »
