diff --git a/senat_campaign/static/senat_campaign/favicon/favicon-128.png b/senat_campaign/static/senat_campaign/favicon/favicon-128.png new file mode 100644 index 0000000000000000000000000000000000000000..0db38b403954d9af36eda4ad74a2d7905ca3a741 Binary files /dev/null and b/senat_campaign/static/senat_campaign/favicon/favicon-128.png differ diff --git a/senat_campaign/static/senat_campaign/favicon/favicon-16.png b/senat_campaign/static/senat_campaign/favicon/favicon-16.png new file mode 100644 index 0000000000000000000000000000000000000000..111c4875ac2e00011e0b31f13ab150f1dfcb6f6b Binary files /dev/null and b/senat_campaign/static/senat_campaign/favicon/favicon-16.png differ diff --git a/senat_campaign/static/senat_campaign/favicon/favicon-196.png b/senat_campaign/static/senat_campaign/favicon/favicon-196.png new file mode 100644 index 0000000000000000000000000000000000000000..819126c749b3335134893d13561fd74a007e8f2a Binary files /dev/null and b/senat_campaign/static/senat_campaign/favicon/favicon-196.png differ diff --git a/senat_campaign/static/senat_campaign/favicon/favicon-32.png b/senat_campaign/static/senat_campaign/favicon/favicon-32.png new file mode 100644 index 0000000000000000000000000000000000000000..692825ca491803927e79f1a2ec848f6f54fd6a61 Binary files /dev/null and b/senat_campaign/static/senat_campaign/favicon/favicon-32.png differ diff --git a/senat_campaign/static/senat_campaign/favicon/favicon-96.png b/senat_campaign/static/senat_campaign/favicon/favicon-96.png new file mode 100644 index 0000000000000000000000000000000000000000..0d910b7bf65de257ad5c76791dd3b68bbd52e2c8 Binary files /dev/null and b/senat_campaign/static/senat_campaign/favicon/favicon-96.png differ diff --git a/senat_campaign/templates/senat_campaign/base.html b/senat_campaign/templates/senat_campaign/base.html index abbd43fb4d6c2e9071febd8cb3c9cc3d8fa80ef1..9323e99c77f857649a3b8dd43a8493c17bc6e828 100644 --- a/senat_campaign/templates/senat_campaign/base.html +++ b/senat_campaign/templates/senat_campaign/base.html @@ -22,9 +22,13 @@ <!-- Meta --> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> - <meta name="description" content="{{ page.search_description }}"> + <meta name="description" content="{% firstof page.search_description page.perex|truncatechars:150 %}"> <meta name="author" content="Piráti"> - <title>{% firstof page.seo_title page.title web_settings.full_name %}</title> + {% if page.seo_title %} + <title>{{ page.seo_title }}</title> + {% else %} + <title>{{ page.title }} | {{ web_settings.full_name }}</title> + {% endif %} <!-- OpenGraph info --> <meta property="og:title" content="{% firstof page.seo_title page.title web_settings.full_name %}" /> @@ -33,7 +37,14 @@ <meta property="og:url" content="{{ page.full_url }}" /> {# TODO #} <meta property="og:image" content="https://danielhlavacek.cz/pirati/img/og_image.jpg" /> - <meta property="og:description" content="{{ page.search_description }}" /> + <meta property="og:description" content="{% firstof page.search_description page.perex %}" /> + + <!-- Favicon --> + <link rel="icon" type="image/png" href="{% static "senat_campaign/favicon/favicon-196.png" %}" sizes="196x196"> + <link rel="icon" type="image/png" href="{% static "senat_campaign/favicon/favicon-128.png" %}" sizes="128x128"> + <link rel="icon" type="image/png" href="{% static "senat_campaign/favicon/favicon-96.png" %}" sizes="96x96"> + <link rel="icon" type="image/png" href="{% static "senat_campaign/favicon/favicon-32.png" %}" sizes="32x32"> + <link rel="icon" type="image/png" href="{% static "senat_campaign/favicon/favicon-16.png" %}" sizes="16x16"> <!-- Bootstrap CSS --> <link rel="stylesheet" href="{% static "senat_campaign/vendor/bootstrap-4.4.1/css/bootstrap.min.css" %}"> diff --git a/senat_campaign/templates/senat_campaign/senat_campaign_home_page.html b/senat_campaign/templates/senat_campaign/senat_campaign_home_page.html index 2670108b40be52280ed6f8853f920c0cf1ba241b..a3bddbc395928f384ff27b36352f15fb4ae0ef4a 100644 --- a/senat_campaign/templates/senat_campaign/senat_campaign_home_page.html +++ b/senat_campaign/templates/senat_campaign/senat_campaign_home_page.html @@ -34,7 +34,7 @@ {% image page.top_photo original as top_photo %} <img data-src="{{ top_photo.url }}" class="lazyload img-fluid mb-4" alt="{{ web_settings.full_name }}"> {% endif %} - <h3 class="lead mb-5">{% if page.claim %}„{{ page.claim }}“{% endif %}</h3> + <h3 class="lead mb-0">{% if page.claim %}„{{ page.claim }}“{% endif %}</h3> </div><!-- /column --> </div> <!-- /row --> @@ -151,7 +151,7 @@ {% if web_settings.has_news %} - <section class="section--primary section--no-bottom-padding" id="aktuality"> + <section class="section--primary{% if web_settings.has_callendar %} section--no-bottom-padding{% endif %}" id="aktuality"> <div class="container"> <h2 class="lead page-subheading mb-4">Aktuality</h2>