fnp
/
edumed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'leveling'
[edumed.git]
/
edumed
/
templates
/
base_super.html
diff --git
a/edumed/templates/base_super.html
b/edumed/templates/base_super.html
index
9ee9cec
..
b3ba9d8
100644
(file)
--- a/
edumed/templates/base_super.html
+++ b/
edumed/templates/base_super.html
@@
-3,6
+3,7
@@
{% load fnp_common fnp_share fnp_lang macros %}
{% load compressed static %}
{% load subdomainurls %}
{% 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 title %}{% block title %}{% endblock %}{% endmacro %}
{% macro site_name %}Edukacja medialna{% endmacro %}
@@
-25,7
+26,7
@@
</head>
<body id="{% block body-id %}body{% endblock %}">
<div id="header-wrapper">
</head>
<body id="{% block body-id %}body{% endblock %}">
<div id="header-wrapper">
- <header class="main" style="position:relative;">
+ <header class="main
{% block header_class %}{% endblock %}
" style="position:relative;">
<!--img
src="{% static "tlo.png" %}"
style="position:absolute; opacity: 0.5; top:0; left: -83px; z-index:1000"
<!--img
src="{% static "tlo.png" %}"
style="position:absolute; opacity: 0.5; top:0; left: -83px; z-index:1000"
@@
-34,7
+35,7
@@
<a href="{% url 'logout' subdomain=None %}" style="position: absolute; top:5px; right: 10px; font-size: 12px;">Wyloguj</a>
{% endif %}
<div id="header-top">
<a href="{% url 'logout' subdomain=None %}" style="position: absolute; top:5px; right: 10px; font-size: 12px;">Wyloguj</a>
{% endif %}
<div id="header-top">
- <a id="logo" href="/">
<img src="{% static "img/logo.png" %}" alt="Edukacja medialna"/>
</a>
+ <a id="logo" href="/">
{% block logo %}<img src="{% static "img/logo.png" %}" alt="Edukacja medialna"/>{% endblock %}
</a>
<div id="organizer">
{% block organizer %}
Projekt prowadzi:<br/>
<div id="organizer">
{% block organizer %}
Projekt prowadzi:<br/>
@@
-96,8
+97,7
@@
</footer>
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
</footer>
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
- {% compressed_js 'base' %}
{% block extra_script %}{% endblock %}
{% block extra_script %}{% endblock %}
- {
{ piwik_tag|safe }
}
+ {
% tracking_code %
}
</body>
</html>
</body>
</html>