fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git@stigma.nowoczesnapolska.org.pl:platforma
[redakcja.git]
/
project
/
templates
/
base.html
diff --git
a/project/templates/base.html
b/project/templates/base.html
index
6e9c389
..
89ebe66
100644
(file)
--- a/
project/templates/base.html
+++ b/
project/templates/base.html
@@
-3,14
+3,18
@@
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:p="http://platforma.wolnelektury.pl/">
<head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:p="http://platforma.wolnelektury.pl/">
<head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
- <title>{% block title %}Platforma Redakcyjna{%
endblock
%}</title>
+ <title>{% block title %}Platforma Redakcyjna{%
block subtitle %}{% endblock subtitle %}{% endblock title
%}</title>
<link rel="stylesheet" href="/static/css/master.css" type="text/css" />
<script src="/static/js/jquery.js" type="text/javascript" charset="utf-8"></script>
<link rel="stylesheet" href="/static/css/master.css" type="text/css" />
<script src="/static/js/jquery.js" type="text/javascript" charset="utf-8"></script>
+ <script src="/static/js/jquery.logging.js" type="text/javascript" charset="utf-8"></script>
{% block extrahead %}
{% endblock %}
</head>
<body id="{% block bodyid %}base{% endblock %}">
{% block extrahead %}
{% endblock %}
</head>
<body id="{% block bodyid %}base{% endblock %}">
- <div id="breadcrumbs">{% block breadcrumbs %}Platforma Redakcyjna{% endblock breadcrumbs %}</div>
+ <div id="header">
+ <span id="breadcrumbs">{% block breadcrumbs %}Platforma Redakcyjna{% endblock breadcrumbs %}</span>
+ <span id="login_info">{% include "registration/head_login.html" %}</span>
+ </div>
{% block maincontent %}
{% endblock %}
{% block maincontent %}
{% endblock %}