fnp / prawokultury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ebc2f30)
block tags, bleh (migdal compatibility)
authorJan Szejko <janek37@gmail.com>
Mon, 19 Sep 2016 13:47:12 +0000 (15:47 +0200)
committerJan Szejko <janek37@gmail.com>
Mon, 19 Sep 2016 13:47:12 +0000 (15:47 +0200)
contact/templates/contact/form.html patch | blob | history
contact/templates/contact/thanks.html patch | blob | history
events/templates/events/event_list.html patch | blob | history
prawokultury/templates/404.html patch | blob | history
prawokultury/templates/base.html patch | blob | history
prawokultury/templates/contact/register-speaker/form.html patch | blob | history
prawokultury/templates/contact/register/form.html patch | blob | history
prawokultury/templates/contact/workshop/form.html patch | blob | history

diff --git a/contact/templates/contact/form.html b/contact/templates/contact/form.html
index f1b06fb..29fdfa8 100644 (file)
--- a/contact/templates/contact/form.html
+++ b/contact/templates/contact/form.html
@@ -1,9 +1,9 @@
 {% extends "base.html" %}
 {% load i18n chunks %}
 
 {% extends "base.html" %}
 {% load i18n chunks %}
 
-{% block titleextra %}{{ form.form_title }} :: {% endblock %}
+{% block "titleextra" %}{{ form.form_title }} :: {% endblock %}
 
 
-{% block body %}
+{% block "body" %}
 
     <h1>{% block contact_form_title %}{{ form.form_title }}{% endblock %}</h1>
 
 
     <h1>{% block contact_form_title %}{{ form.form_title }}{% endblock %}</h1>
 
diff --git a/contact/templates/contact/thanks.html b/contact/templates/contact/thanks.html
index fa4d8d5..6194e4e 100644 (file)
--- a/contact/templates/contact/thanks.html
+++ b/contact/templates/contact/thanks.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% extends "base.html" %}
 {% load i18n %}
-{% block body %}
+{% block "body" %}
 
     <h1>{% block contact_form_title %}{% trans "Thank you" %}{% endblock %}</h1>
 
 
     <h1>{% block contact_form_title %}{% trans "Thank you" %}{% endblock %}</h1>
 
diff --git a/events/templates/events/event_list.html b/events/templates/events/event_list.html
index ad2a92c..b6dd773 100755 (executable)
--- a/events/templates/events/event_list.html
+++ b/events/templates/events/event_list.html
@@ -3,7 +3,7 @@
 {% load i18n pagination_tags fnp_prevnext %}
 {% load events_tags %}
 
 {% load i18n pagination_tags fnp_prevnext %}
 {% load events_tags %}
 
-{% block body %}
+{% block "body" %}
 <h1>{% trans "Events" %}</h1>
 
 {% autopaginate object_list 10 %}
 <h1>{% trans "Events" %}</h1>
 
 {% autopaginate object_list 10 %}
diff --git a/prawokultury/templates/404.html b/prawokultury/templates/404.html
index 1ef6711..62bbbe8 100755 (executable)
--- a/prawokultury/templates/404.html
+++ b/prawokultury/templates/404.html
@@ -2,10 +2,10 @@
 {% load i18n %}
 
 
 {% load i18n %}
 
 
-{% block titleextra %}{% trans "Page not found" %} :: {% endblock %}
+{% block "titleextra" %}{% trans "Page not found" %} :: {% endblock %}
 
 
 
 
-{% block body %}
+{% block "body" %}
 
 <h1>{% trans "Page not found" %}</h1>
 
 
 <h1>{% trans "Page not found" %}</h1>
 
diff --git a/prawokultury/templates/base.html b/prawokultury/templates/base.html
index 8c80fc9..94d9954 100755 (executable)
--- a/prawokultury/templates/base.html
+++ b/prawokultury/templates/base.html
@@ -7,17 +7,17 @@
 {% load piwik_tags %}
 <html prefix="og: http://ogp.me/ns#">
     <head>
 {% load piwik_tags %}
 <html prefix="og: http://ogp.me/ns#">
     <head>
-       <title>{% block titleextra %}{% endblock %}CopyCamp</title>
+       <title>{% block "titleextra" %}{% endblock %}CopyCamp</title>
        <link rel="shortcut icon" type="image/png" href="{% static "img/favicon.png" %}" />
         {% compressed_css 'base' %}
 
         <meta charset="UTF-8" />
        <link rel="shortcut icon" type="image/png" href="{% static "img/favicon.png" %}" />
         {% compressed_css 'base' %}
 
         <meta charset="UTF-8" />
-        <meta property='og:url' content='{% block ogurl %}{{ request.get_full_path|build_absolute_uri:request }}{% endblock %}' />
-        <meta property='og:title' content='{% block ogtitle %}CopyCamp{% endblock %}' />
+        <meta property='og:url' content='{% block "ogurl" %}{{ request.get_full_path|build_absolute_uri:request }}{% endblock %}' />
+        <meta property='og:title' content='{% block "ogtitle" %}CopyCamp{% endblock %}' />
         <meta property='og:site_name' content='CopyCamp' />
         <meta property='og:site_name' content='CopyCamp' />
-        <meta property='og:description' content='{% block ogdescription %}{% trans "CopyCamp Conference is the first large-scale meeting in Poland devoted to the issues of copyright in both ideological and practical terms." %}{% endblock %}' />
-        <meta property='og:type' content='{% block ogtype %}website{% endblock %}' />
-        <meta property='og:image' content='{% block ogimage %}https://copycamp.pl{% static "img/copycamp_2016_"|add:request.LANGUAGE_CODE|add:"_big.png" %}{% endblock %}' />
+        <meta property='og:description' content='{% block "ogdescription" %}{% trans "CopyCamp Conference is the first large-scale meeting in Poland devoted to the issues of copyright in both ideological and practical terms." %}{% endblock %}' />
+        <meta property='og:type' content='{% block "ogtype" %}website{% endblock %}' />
+        <meta property='og:image' content='{% block "ogimage" %}https://copycamp.pl{% static "img/copycamp_2016_"|add:request.LANGUAGE_CODE|add:"_big.png" %}{% endblock %}' />
         <meta property='og:locale' content='{% if LANGUAGE_CODE == 'en'%}en_US{% else %}pl_PL{% endif %}' />
     </head>
     <body>
         <meta property='og:locale' content='{% if LANGUAGE_CODE == 'en'%}en_US{% else %}pl_PL{% endif %}' />
     </head>
     <body>
@@ -51,7 +51,7 @@
             </button></form-->
         </div>
         <ul id="menu" class="bar-left">
             </button></form-->
         </div>
         <ul id="menu" class="bar-left">
-            {% block main_menu %}
+            {% block "main_menu" %}
                 {% main_menu %}
             {% endblock %}
             <li id="item-lang">{% lang_switcher %}</li>
                 {% main_menu %}
             {% endblock %}
             <li id="item-lang">{% lang_switcher %}</li>
@@ -62,7 +62,7 @@
 
         <div id="main-bar">
         <div id="sidebar" class="bar-right">
 
         <div id="main-bar">
         <div id="sidebar" class="bar-right">
-            {% block sidebar %}
+            {% block "sidebar" %}
 <div class="sidebar-box" style="text-align:center; font-size: 1.3em;">
 <strong><a target="_blank" style="display: block" href="https://prawokultury.pl/publikacje/cory-doctorow-kontekst/">
 <img style="margin-bottom: .5em;" src="//prawokultury.pl/media/entry/image/cory_cvr_fb_2_maly.jpg" alt="Cory Doctorow &ndash; Kontekst"><br>
 <div class="sidebar-box" style="text-align:center; font-size: 1.3em;">
 <strong><a target="_blank" style="display: block" href="https://prawokultury.pl/publikacje/cory-doctorow-kontekst/">
 <img style="margin-bottom: .5em;" src="//prawokultury.pl/media/entry/image/cory_cvr_fb_2_maly.jpg" alt="Cory Doctorow &ndash; Kontekst"><br>
@@ -77,7 +77,7 @@
             {% endblock %}
         </div>
         <div id="content" class="bar-left">
             {% endblock %}
         </div>
         <div id="content" class="bar-left">
-            {% block body %}{% endblock %}
+            {% block "body" %}{% endblock %}
         </div>
         <div style="clear: both;"></div>
         </div>
         </div>
         <div style="clear: both;"></div>
         </div>
diff --git a/prawokultury/templates/contact/register-speaker/form.html b/prawokultury/templates/contact/register-speaker/form.html
index 87b799d..740c9e6 100644 (file)
--- a/prawokultury/templates/contact/register-speaker/form.html
+++ b/prawokultury/templates/contact/register-speaker/form.html
@@ -1,9 +1,9 @@
 {% extends "base.html" %}
 {% load i18n chunks %}
 
 {% extends "base.html" %}
 {% load i18n chunks %}
 
-{% block titleextra %}{{ form.form_title }} :: {% endblock %}
+{% block "titleextra" %}{{ form.form_title }} :: {% endblock %}
 
 
-{% block body %}
+{% block "body" %}
     <h1>{% block contact_form_title %}{{ form.form_title }}{% endblock %}</h1>
 
     {% if not form.started %}
     <h1>{% block contact_form_title %}{{ form.form_title }}{% endblock %}</h1>
 
     {% if not form.started %}
diff --git a/prawokultury/templates/contact/register/form.html b/prawokultury/templates/contact/register/form.html
index dff155b..a117e2b 100644 (file)
--- a/prawokultury/templates/contact/register/form.html
+++ b/prawokultury/templates/contact/register/form.html
@@ -1,9 +1,9 @@
 {% extends "base.html" %}
 {% load i18n chunks %}
 
 {% extends "base.html" %}
 {% load i18n chunks %}
 
-{% block titleextra %}{{ form.form_title }} :: {% endblock %}
+{% block "titleextra" %}{{ form.form_title }} :: {% endblock %}
 
 
-{% block body %}
+{% block "body" %}
     <h1>{% block contact_form_title %}{{ form.form_title }}{% endblock %}</h1>
 
 
     <h1>{% block contact_form_title %}{{ form.form_title }}{% endblock %}</h1>
 
 
diff --git a/prawokultury/templates/contact/workshop/form.html b/prawokultury/templates/contact/workshop/form.html
index a65d3af..de5c6c8 100644 (file)
--- a/prawokultury/templates/contact/workshop/form.html
+++ b/prawokultury/templates/contact/workshop/form.html
@@ -1,9 +1,9 @@
 {% extends "base.html" %}
 {% load i18n chunks %}
 
 {% extends "base.html" %}
 {% load i18n chunks %}
 
-{% block titleextra %}{{ form.form_title }} :: {% endblock %}
+{% block "titleextra" %}{{ form.form_title }} :: {% endblock %}
 
 
-{% block body %}
+{% block "body" %}
 
     <h1>{% block contact_form_title %}{{ form.form_title }}{% endblock %}</h1>
 
 
     <h1>{% block contact_form_title %}{{ form.form_title }}{% endblock %}</h1>