fnp / prawokultury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 7277b3b)
update migdal
authorJan Szejko <janek37@gmail.com>
Fri, 7 Apr 2017 08:23:49 +0000 (10:23 +0200)
committerJan Szejko <janek37@gmail.com>
Fri, 7 Apr 2017 08:23:49 +0000 (10:23 +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/2015-register [deleted symlink] patch | blob | history
prawokultury/templates/contact/2015-register-speaker [deleted symlink] 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
requirements.txt patch | blob | history

diff --git a/contact/templates/contact/form.html b/contact/templates/contact/form.html
index 22ca246..f291a4c 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 6194e4e..fa4d8d5 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 b6dd773..ad2a92c 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 62bbbe8..1ef6711 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 6d58deb..97e1537 100755 (executable)
--- a/prawokultury/templates/base.html
+++ b/prawokultury/templates/base.html
@@ -8,17 +8,17 @@
 {% load entry_url %}
 <html prefix="og: http://ogp.me/ns#">
     <head>
 {% load entry_url %}
 <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>
@@ -52,7 +52,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>
@@ -63,7 +63,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 %}
                 {# <a href="{% entry_url "warsztaty" %}" style="display: block; margin-bottom: 10px; width: 220px; text-align:center; background: #ED7F00; color: white; font-size: 24px; text-transform: uppercase;">{% trans "Workshops" %}</a> #}
                 <div class="sidebar-box" style="text-align:center; font-size: 1.3em;">
                     <strong><a target="_blank" style="display: block" href="http://prawokultury.pl/publikacje/konrad-gliscinski-wszystkie-prawa-zastrzezone-hist/">
                 {# <a href="{% entry_url "warsztaty" %}" style="display: block; margin-bottom: 10px; width: 220px; text-align:center; background: #ED7F00; color: white; font-size: 24px; text-transform: uppercase;">{% trans "Workshops" %}</a> #}
                 <div class="sidebar-box" style="text-align:center; font-size: 1.3em;">
                     <strong><a target="_blank" style="display: block" href="http://prawokultury.pl/publikacje/konrad-gliscinski-wszystkie-prawa-zastrzezone-hist/">
@@ -79,7 +79,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/2015-register b/prawokultury/templates/contact/2015-register
deleted file mode 120000 (symlink)
index 26263cf..0000000
--- a/prawokultury/templates/contact/2015-register
+++ /dev/null
@@ -1 +0,0 @@
-register
\ No newline at end of file
diff --git a/prawokultury/templates/contact/2015-register-speaker b/prawokultury/templates/contact/2015-register-speaker
deleted file mode 120000 (symlink)
index de0a0f4..0000000
--- a/prawokultury/templates/contact/2015-register-speaker
+++ /dev/null
@@ -1 +0,0 @@
-register-speaker
\ No newline at end of file
diff --git a/prawokultury/templates/contact/register-speaker/form.html b/prawokultury/templates/contact/register-speaker/form.html
index 740c9e6..87b799d 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 a117e2b..dff155b 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 de5c6c8..a65d3af 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>
 
diff --git a/requirements.txt b/requirements.txt
index 6dbd69c..e4f018c 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ South>=0.7.4
 Pillow
 sorl-thumbnail>=11.09,<12
 django-pagination
 Pillow
 sorl-thumbnail>=11.09,<12
 django-pagination
-django-migdal>=0.4,<0.5
+django-migdal==0.5.2
 pytz
 
 jsonfield>=0.9.20
 pytz
 
 jsonfield>=0.9.20