From: Jan Szejko <janek37@gmail.com>
Date: Wed, 5 Sep 2018 11:10:26 +0000 (+0200)
Subject: add favicon, reverse page titles
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/1e373b12f008865c90a75cc56202d8adde06e2b7?ds=sidebyside;hp=0c15e06e080d45122c9b2ad9a05937c13af35e8e
add favicon, reverse page titles
---
diff --git a/apps/catalogue/templates/catalogue/base.html b/apps/catalogue/templates/catalogue/base.html
index fad35c00..8577f104 100644
--- a/apps/catalogue/templates/catalogue/base.html
+++ b/apps/catalogue/templates/catalogue/base.html
@@ -4,9 +4,10 @@
<html>
<head lang="{{ LANGUAGE_CODE }}">
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+ <link rel="icon" href="{{ STATIC_URL }}img/pr-icon.png" type="image/png" />
{% stylesheet 'catalogue' %}
- <title>{% block title %}{% trans "Platforma Redakcyjna" %} ::
- {% block titleextra %}{% endblock %}{% endblock title %}</title>
+ <title>{% block title %}{% block titleextra %}{% endblock %} ::
+ {% trans "Platforma Redakcyjna" %}{% endblock title %}</title>
{% block add_css %}{% endblock %}
</head>
<body>
diff --git a/apps/cover/templates/cover/add_image.html b/apps/cover/templates/cover/add_image.html
index 9e3c71d7..293c1001 100755
--- a/apps/cover/templates/cover/add_image.html
+++ b/apps/cover/templates/cover/add_image.html
@@ -1,6 +1,8 @@
{% extends "catalogue/base.html" %}
{% load i18n %}
+{% block titleextra %}{% trans "Add image" %}{% endblock %}
+
{% block add_js %}
{{block.super}}
<script>
diff --git a/apps/cover/templates/cover/image_detail.html b/apps/cover/templates/cover/image_detail.html
index cf8f921f..db9b176f 100755
--- a/apps/cover/templates/cover/image_detail.html
+++ b/apps/cover/templates/cover/image_detail.html
@@ -3,6 +3,8 @@
{% load thumbnail %}
{% load build_absolute_uri from fnp_common %}
+{% block titleextra %}{% trans "Cover image" %}{% endblock %}
+
{% block content %}
<h1>{% trans "Cover image" %}</h1>
diff --git a/apps/cover/templates/cover/image_list.html b/apps/cover/templates/cover/image_list.html
index 2b799fe5..50443edd 100755
--- a/apps/cover/templates/cover/image_list.html
+++ b/apps/cover/templates/cover/image_list.html
@@ -2,6 +2,7 @@
{% load i18n %}
{% load thumbnail pagination_tags %}
+{% block titleextra %}{% trans "Cover images" %}{% endblock %}
{% block content %}
<h1>{% trans "Cover images" %}</h1>
diff --git a/apps/wiki/templates/wiki/document_details_base.html b/apps/wiki/templates/wiki/document_details_base.html
index 8cd603bb..00c4f6a3 100644
--- a/apps/wiki/templates/wiki/document_details_base.html
+++ b/apps/wiki/templates/wiki/document_details_base.html
@@ -1,7 +1,7 @@
{% extends "base.html" %}
{% load toolbar_tags i18n %}
-{% block titleextra %}{{ chunk.pretty_title }}{% endblock %}
+{% block titleextra %}{% if chunk.pretty_title %}{{ chunk.pretty_title }}{% else %}{{ chunk.book.title }}{% endif %}{% endblock %}
{% block extrahead %}
{% load pipeline %}
{% stylesheet 'detail' %}
diff --git a/redakcja/static/img/pr-icon.png b/redakcja/static/img/pr-icon.png
new file mode 100644
index 00000000..fc0f9fe8
Binary files /dev/null and b/redakcja/static/img/pr-icon.png differ
diff --git a/redakcja/static/img/wl-orange.svg b/redakcja/static/img/wl-orange.svg
new file mode 100644
index 00000000..a7ef60b9
--- /dev/null
+++ b/redakcja/static/img/wl-orange.svg
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ width="171.35579"
+ height="172.75761"
+ viewBox="0 0 171.35578 172.75761"
+ sodipodi:docname="wl-orange.svg"
+ inkscape:export-filename="/home/janek/Desktop/pr-icon.png"
+ inkscape:export-xdpi="8.4035673"
+ inkscape:export-ydpi="8.4035673">
+ <metadata
+ id="metadata8">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs6" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1012"
+ inkscape:window-height="652"
+ id="namedview4"
+ showgrid="false"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:zoom="1.5132586"
+ inkscape:cx="81.786073"
+ inkscape:cy="104.54976"
+ inkscape:window-x="444"
+ inkscape:window-y="29"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg2" />
+ <path
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ff8000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.89411765;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+ d="M 69.761219,87.45616 35.01474,92.310571 2.9997126,63.566463 38.619672,51.969714 73.499413,79.979772 c 2.693747,2.268439 7.087505,-2.82549 5.220188,-5.333568 l -28.116626,-29.712"
+ id="path3338"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ inkscape:connector-curvature="0"
+ id="path4140"
+ d="M 83.899635,69.761218 79.045224,35.014739 107.78933,2.9997126 119.38608,38.619671 91.376023,73.499408 c -2.929265,3.189374 2.329871,9.069983 4.672742,6.54184 L 126.42159,50.602974"
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ff8000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.89411765;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+ <path
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ff8000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.89411765;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+ d="m 101.59457,85.301455 34.74649,-4.854411 32.01502,28.744106 -35.61996,11.59675 -34.879733,-28.010057 c -2.693755,-2.433646 -8.739571,2.164664 -6.54184,4.672742 l 29.438273,30.372825"
+ id="path4142"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccc" />
+ <path
+ sodipodi:nodetypes="ccccccc"
+ inkscape:connector-curvature="0"
+ id="path4144"
+ d="m 86.054345,102.99639 4.85441,34.74649 -28.74411,32.01502 -11.59675,-35.61996 28.01006,-34.879733 c 3.230746,-3.230746 -2.164666,-8.904777 -4.67274,-6.54184 l -30.37283,29.438273"
+ style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ff8000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.89411765;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+</svg>
diff --git a/redakcja/templates/404.html b/redakcja/templates/404.html
index 9c506b9c..11edc9d5 100644
--- a/redakcja/templates/404.html
+++ b/redakcja/templates/404.html
@@ -1,6 +1,7 @@
{% extends "catalogue/base.html" %}
{% load i18n %}
+{% block titleextra %}{% trans "Page not found" %}{% endblock %}
{% block content %}
diff --git a/redakcja/templates/base.html b/redakcja/templates/base.html
index 65174e44..fc609954 100644
--- a/redakcja/templates/base.html
+++ b/redakcja/templates/base.html
@@ -3,8 +3,9 @@
<html>
<head lang="{{ LANGUAGE_CODE }}">
<meta charset="utf-8" />
- <title>{% block title %}{% trans "Platforma Redakcyjna" %} ::
- {% block titleextra %}{% endblock titleextra %}{% endblock title%}</title>
+ <link rel="icon" href="{{ STATIC_URL }}img/pr-icon.png" type="image/png" />
+ <title>{% block title %}{% block titleextra %}{% endblock titleextra %} ::
+ {% trans "Platforma Redakcyjna" %}{% endblock title %}</title>
{% block extrahead %}
{% endblock %}
</head>
diff --git a/redakcja/templates/registration/login.html b/redakcja/templates/registration/login.html
index 4a46bd32..adbef3cb 100644
--- a/redakcja/templates/registration/login.html
+++ b/redakcja/templates/registration/login.html
@@ -1,5 +1,6 @@
{% extends "catalogue/base.html" %}
+{% block titleextra %}Logowanie{% endblock %}
{% block subtitle %} - Logowanie {% endblock subtitle %}
{% block content %}