commit 495561fb02bd5e5bb3045452948617d54ccd5264 Author: kez kez@torproject.org Date: Tue Jun 22 10:03:48 2021 -0400
Make meta.html self-contained, add block for head --- templates/homepage.html | 1 + templates/meta.html | 43 +++++++++++++++++++++---------------------- 2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/templates/homepage.html b/templates/homepage.html index 4eb22bec..551e668b 100644 --- a/templates/homepage.html +++ b/templates/homepage.html @@ -1,4 +1,5 @@ {% include 'meta.html' %} +<body> <div class="page"> <div class="container-fluid bg-dark"> <div class="row flex-xl-nowrap {{ bag('alternatives', this.alt, 'order') }}"> diff --git a/templates/meta.html b/templates/meta.html index 9f121524..321462e9 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -1,24 +1,23 @@ <!doctype html> <html xmlns="http://www.w3.org/1999/xhtml" lang="{{ this.alt }}" {% if bag('alternatives', this.alt, 'direction') == 'text-right' %}dir="rtl" {% endif %}> -<meta charset="utf-8"> -<meta name="viewport" content="width=device-width, initial-scale=1"> -<meta name="description" content="{{ _('Defend yourself against tracking and surveillance. Circumvent censorship.') }} | {{ this.title }}"> -<meta name="twitter:card" content="summary_large_image"/> -<meta name="twitter:site" content="@torproject" /> -<meta name="twitter:creator" content="@torproject" /> -<meta name="twitter:image" content="https://donate.torproject.org/static/images/donate/social-media-card.png"/> -<meta property="og:url" content="https://donate.torproject.org/" /> -<meta property="og:title" content="{{ _('Use a mask, Use Tor') }}" /> -<meta property="og:description" content="{{ _('Resist the surveillance pandemic. Donate to the Tor Project.') }}" /> -<meta property="og:image" content="https://donate.torproject.org/static/images/donate/social-media-card.png" /> -<link rel="stylesheet" href="{{ '/static/css/bootstrap.css'|asseturl }}"> -<link rel="stylesheet" href="{{ '/static/fonts/fontawesome/css/all.min.css'|asseturl }}" rel="stylesheet"> -<!-- Standard favicon --> -<link rel="icon" type="image/x-icon" href="https://www.torproject.org/static/images/favicon/favicon.ico"> -<!-- Recommended favicon format --> -<link rel="icon" type="image/png" href="https://www.torproject.org/static/images/favicon/favicon.png"> -<title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title> -<body class="no-gutters"> - <header> - {% include 'navbar-min.html' %} - </header> +<head> + <meta charset="utf-8"> + <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="description" content="{{ _('Defend yourself against tracking and surveillance. Circumvent censorship.') }} | {{ this.title }}"> + <meta name="twitter:card" content="summary_large_image"/> + <meta name="twitter:site" content="@torproject" /> + <meta name="twitter:creator" content="@torproject" /> + <meta name="twitter:image" content="https://donate.torproject.org/static/images/donate/social-media-card.png"/> + <meta property="og:url" content="https://donate.torproject.org/" /> + <meta property="og:title" content="{{ _('Use a mask, Use Tor') }}" /> + <meta property="og:description" content="{{ _('Resist the surveillance pandemic. Donate to the Tor Project.') }}" /> + <meta property="og:image" content="https://donate.torproject.org/static/images/donate/social-media-card.png" /> + <link rel="stylesheet" href="{{ '/static/css/bootstrap.css'|asseturl }}"> + <link rel="stylesheet" href="{{ '/static/fonts/fontawesome/css/all.min.css'|asseturl }}" rel="stylesheet"> + <!-- Standard favicon --> + <link rel="icon" type="image/x-icon" href="https://www.torproject.org/static/images/favicon/favicon.ico"> + <!-- Recommended favicon format --> + <link rel="icon" type="image/png" href="https://www.torproject.org/static/images/favicon/favicon.png"> + <title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title> + {% block head %}{% endblock %} +</head>