X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/5b62a88ffbb4e529be32e3f552c32497ab4666e5..945987f6388d123bce3ba543618cae13f5bfce8f:/edumed/templates/base_super.html
diff --git a/edumed/templates/base_super.html b/edumed/templates/base_super.html
index 497a868..a4e93c1 100644
--- a/edumed/templates/base_super.html
+++ b/edumed/templates/base_super.html
@@ -2,11 +2,10 @@
{% load i18n static %}
{% load fnp_common fnp_share fnp_lang macros %}
{% load compressed static %}
-{% load subdomainurls %}
{% load piwik_tags %}
{% macro title %}{% block title %}{% endblock %}{% endmacro %}
-{% macro site_name %}Edukacja medialna{% endmacro %}
+{% macro site_name %}Olimpiada Cyfrowa{% endmacro %}
<html prefix="og: http://ogp.me/ns#">
<head>
@@ -15,12 +14,12 @@
{% 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: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:image' content='{% block og_image %}http://edukacjamedialna.edu.pl/static/img/logo-oc.png{% endblock %}' />
<meta property='og:locale' content='pl_PL' />
<!--[if lt IE 9]><script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script></script><![endif]-->
</head>
@@ -41,10 +40,10 @@
style="position:absolute; opacity: 0.5; top:0; left: -83px; z-index:1000"
-->
{% if request.user.is_authenticated %}
- <a href="{% url 'logout' subdomain=None %}" style="position: absolute; top:5px; right: 10px; font-size: 12px;">Wyloguj</a>
+ <a href="{% url 'logout' %}" style="position: absolute; top:5px; right: 10px; font-size: 12px;">Wyloguj</a>
{% endif %}
<div id="header-top">
- <a id="logo" href="/">{% block logo %}<img src="{% static "img/logo.png" %}" alt="Edukacja medialna"/>{% endblock %}</a>
+ <a id="logo" href="/">{% block logo %}<img src="{% static "img/logo-oc.png" %}" alt="Olimpiada Cyfrowa" height="73"/>{% endblock %}</a>
<div id="organizer">
{% block organizer %}
Projekt prowadzi:<br/>
@@ -75,23 +74,22 @@
<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/fax: +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/>