fnp / edumed.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
update requirements
[edumed.git] / edumed / templates / base_super.html
diff --git a/edumed/templates/base_super.html b/edumed/templates/base_super.html
index bc3be93..50897ee 100644 (file)
--- a/edumed/templates/base_super.html
+++ b/edumed/templates/base_super.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 {% load i18n static %}
 <!DOCTYPE html>
 {% load i18n static %}
-{% load fnp_common fnp_share fnp_lang macros fnp_annoy %}
+{% load fnp_common fnp_share fnp_lang macros %}
 {% load compressed static %}
 {% load subdomainurls %}
 {% load piwik_tags %}
 {% load compressed static %}
 {% load subdomainurls %}
 {% load piwik_tags %}
@@ -15,9 +15,9 @@
         {% compressed_css 'base' %}
 
         <meta charset="UTF-8" />
         {% compressed_css 'base' %}
 
         <meta charset="UTF-8" />
-        <meta property='og:url' content='{% block "ogurl" %}{{ "/"|build_absolute_uri:request }}{% endblock %}' />
+        <meta property='og:url' content='{% block ogurl %}{{ "/"|build_absolute_uri:request }}{% endblock %}' />
         <meta property='og:title' content='{% block og_title %}{% usemacro title %}{% endblock %}' />
         <meta property='og:title' content='{% block og_title %}{% usemacro title %}{% endblock %}' />
-        <meta property='og:site_name' content='{% usemacro site_name %}' />
+        <meta property='og:site_name' content='{% block og_site_name %}{% usemacro site_name %}{% endblock %}' />
         <meta property='og:description' content='{% block og_description %}{% endblock %}' />
         <meta property='og:type' content='{% block og_type %}website{% endblock %}' />
         <meta property='og:image' content='{% block og_image %}http://edukacjamedialna.edu.pl/static/img/logo.png{% endblock %}' />
         <meta property='og:description' content='{% block og_description %}{% endblock %}' />
         <meta property='og:type' content='{% block og_type %}website{% endblock %}' />
         <meta property='og:image' content='{% block og_image %}http://edukacjamedialna.edu.pl/static/img/logo.png{% endblock %}' />
@@ -25,7 +25,20 @@
         <!--[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 %}">
-       {% annoy %}
+        {% load fnp_annoy %}{% annoy %}
+        {% comment %}
+        <div id="banners">
+            <a href="https://nowoczesnapolska.org.pl/pomoz-nam/wesprzyj-nas/">
+                <img src="{% static 'img/banners/960x150_edukacjaMedialna.jpg' %}"
+                     alt="Wesprzyj działalność Nowoczesnej Polski"/>
+            </a>
+        </div>
+        {% endcomment %}
+        <div id="banners">
+            <a href="https://olimpiadacyfrowa.pl/zglos/olimpiada/">
+                <img src="{% static 'img/banners/oc-banner.png' %}" width="960"/>
+            </a>
+        </div>
         <div id="header-wrapper">
         <header class="main {% block header_class %}{% endblock %}" style="position:relative;">
             <!--img
         <div id="header-wrapper">
         <header class="main {% block header_class %}{% endblock %}" style="position:relative;">
             <!--img
@@ -52,11 +65,13 @@
             </div>
 
             <div id="tagline">{% block tagline %}{% endblock %}</div>
             </div>
 
             <div id="tagline">{% block tagline %}{% endblock %}</div>
-            <div id="search">
-                <form action="{% url 'haystack_search' None %}">
-                    <input name="q" placeholder="szukaj" /><button><span>&rarr;</span></button>
-                </form>
-            </div>
+            {% block searchbox %}
+              <div id="search">
+                  <form action="{% url 'haystack_search' None %}">
+                      <input name="q" placeholder="szukaj" /><button><span>&rarr;</span></button>
+                  </form>
+              </div>
+            {% endblock %}
             <div class="clr"></div>
         </header>
         </div>
             <div class="clr"></div>
         </header>
         </div>
@@ -65,23 +80,22 @@
 
         <footer class="main">
             {# chunks? #}
 
         <footer class="main">
             {# chunks? #}
-            <div class="footer-item">
-                <p>
-                Fundacja Nowoczesna Polska<br/>
-                <br/>
-                ul. Marszałkowska 84/92 lok. 125<br/>
-                00-514 Warszawa<br/>
-                tel/fax: +48 22 621 30 17<br/>
-                e-mail: fundacja@nowoczesnapolska.org.pl
-                </p>
-            </div>
-            <div class="footer-item">
-                <p><br/><br/>
-                KRS: 0000070056<br/>
-                REGON: 017423865<br/>
-                Nr konta: 59 1030 0019 0109 8530 0040 5685<br/>
-                </p>
-            </div>
+            {% block footer_contact %}
+                <div class="footer-item">
+                    <p>
+                    fundacja Nowoczesna Polska<br/>
+                    <br/>
+                    ul. Marszałkowska 84/92 lok. 125<br/>
+                    00-514 Warszawa<br/>
+                    tel: +48 22 621 30 17<br/>
+                    e-mail: fundacja@nowoczesnapolska.org.pl
+                    <br/><br/>
+                    KRS: 0000070056<br/>
+                    REGON: 017423865<br/>
+                    Nr konta: 59 1030 0019 0109 8530 0040 5685
+                    </p>
+                </div>
+            {% endblock %}
             <div class="footer-item" style="margin-right:0;">
                 <p>
                 Webdesign Ortografika<br/>
             <div class="footer-item" style="margin-right:0;">
                 <p>
                 Webdesign Ortografika<br/>
@@ -89,6 +103,7 @@
                 Jeśli nie oznaczono inaczej, wszystkie materiały na stronie są objęte wolną licencją
                 <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.pl">Creative Commons Uznanie autorstwa
                 – Na tych samych warunkach 3.0</a>.
                 Jeśli nie oznaczono inaczej, wszystkie materiały na stronie są objęte wolną licencją
                 <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.pl">Creative Commons Uznanie autorstwa
                 – Na tych samych warunkach 3.0</a>.
+                {% block copyrights %}{% endblock %}
                 </p>
             </div>
             {% block sponsors %}
                 </p>
             </div>
             {% block sponsors %}