fnp / emels.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 9a562b7)
minor stuff
authorJan Szejko <janek37@gmail.com>
Wed, 5 Apr 2017 15:09:00 +0000 (17:09 +0200)
committerJan Szejko <janek37@gmail.com>
Wed, 5 Apr 2017 15:09:00 +0000 (17:09 +0200)
emels/templates/404.html patch | blob | history
emels/templates/base_super.html patch | blob | history
emels/templates/flatpages/default.html [deleted file] patch | blob | history

diff --git a/emels/templates/404.html b/emels/templates/404.html
index 74ee437..c95ef3f 100644 (file)
--- a/emels/templates/404.html
+++ b/emels/templates/404.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% load i18n %}
 
 {% extends "base.html" %}
 {% load i18n %}
 
-{% block title %}{% trans "Page not found" %}{% endblock %}
+{% block titleextra %}{% trans "Page not found" %} ::{% endblock %}
 
 {% block body %}
 
 
 {% block body %}
 
diff --git a/emels/templates/base_super.html b/emels/templates/base_super.html
index 99f2fbd..fcd5fda 100644 (file)
--- a/emels/templates/base_super.html
+++ b/emels/templates/base_super.html
@@ -4,12 +4,12 @@
 {% load pipeline static %}
 {% load piwik_tags %}
 
 {% load pipeline static %}
 {% load piwik_tags %}
 
-{% macro title %}{% block title %}{% endblock %}{% endmacro %}
+{% macro title %}{% block titleextra %}{% endblock %}{% endmacro %}
 {% macro site_name %}Emels{% endmacro %}
 
 <html prefix="og: http://ogp.me/ns#">
     <head>
 {% macro site_name %}Emels{% endmacro %}
 
 <html prefix="og: http://ogp.me/ns#">
     <head>
-       <title>{% block full_title %}{% usemacro title %} :: {% usemacro site_name %}{% endblock %}</title>
+       <title>{% block full_title %}{% usemacro title %} {% usemacro site_name %}{% endblock %}</title>
        <link rel="shortcut icon" type="image/png" href="{% static "img/favicon.png" %}" />
         {% stylesheet 'base' %}
 
        <link rel="shortcut icon" type="image/png" href="{% static "img/favicon.png" %}" />
         {% stylesheet 'base' %}
 
@@ -21,6 +21,7 @@
         <meta property='og:type' content='{% block og_type %}website{% endblock %}' />
         <meta property='og:image' content='{% block og_image %}http://emels.eu/static/img/logo.png{% endblock %}' />
         <meta property='og:locale' content='pl_PL' />
         <meta property='og:type' content='{% block og_type %}website{% endblock %}' />
         <meta property='og:image' content='{% block og_image %}http://emels.eu/static/img/logo.png{% endblock %}' />
         <meta property='og:locale' content='pl_PL' />
+        <link href="{% url 'migdal_main_feed' %}" rel="alternate" type="application/rss+xml" title="Emels" />
         <!--[if lt IE 9]><script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script></script><![endif]-->
     </head>
     <body id="{% block body-id %}body{% endblock %}">
         <!--[if lt IE 9]><script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script></script><![endif]-->
     </head>
     <body id="{% block body-id %}body{% endblock %}">
diff --git a/emels/templates/flatpages/default.html b/emels/templates/flatpages/default.html
deleted file mode 100755 (executable)
index 1ab012c..0000000
--- a/emels/templates/flatpages/default.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{% extends "base.html" %}
-{% load textile_pl from fnp_markup %}
-
-{% block title %}{{ flatpage.title }}{% endblock %}
-
-{% block body %}
-<div id="main-bar" class="flatpage">
-{{ flatpage.content|textile_pl }}
-</div>
-{% endblock %}