Merge branch 'master' into view-refactor

[redakcja.git] / project / templates / base.html
diff --git a/project/templates/base.html b/project/templates/base.html

index 6e9c389..48ad036 100644 (file)
--- a/project/templates/base.html
+++ b/project/templates/base.html
@@ -3,16 +3,24 @@
  <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>
-        <link rel="stylesheet" href="/static/css/master.css" type="text/css" />
-        <script src="/static/js/jquery.js" type="text/javascript" charset="utf-8"></script>
+        <title>{% block title %}Platforma Redakcyjna{% block subtitle %}{% endblock subtitle %}{% endblock title%}</title>
+        <link rel="stylesheet" href="{{ STATIC_URL }}css/master.css" type="text/css" />
+        <script src="{{ STATIC_URL }}js/lib/jquery.js" type="text/javascript" charset="utf-8"></script>
+       <script src="{{ STATIC_URL }}js/lib/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>
-        {% block maincontent %}
-            
-        {% endblock %}
+       <div id="header">
+               <span id="breadcrumbs">{% block breadcrumbs %}<a href="{% url file_list %}">Platforma Redakcyjna</a>{% endblock breadcrumbs %}</span>
+               <span id="header-right-toolbar">
+                       {% block header-toolbar %}{% endblock %}
+                       <span id="login_info">{% include "registration/head_login.html" %}</span>
+               </span>
+        <div id="message-box">{% block message-box %} {% endblock %}</div>
+       </div>
+    <div id="content">{% block maincontent %} {% endblock %}</div>
+
+    {% block extrabody %}{% endblock %}
      </body>
  </html>
      </body>
  </html>