fnp / wolnelektury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 0ae93a9 57b7dbd)
Merge branch 'master' of git+ssh://github.com/fnp/wolnelektury
authorRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Thu, 13 May 2010 12:33:01 +0000 (14:33 +0200)
committerRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Thu, 13 May 2010 12:33:01 +0000 (14:33 +0200)
1  2 
wolnelektury/templates/base.html patch | diff1 | diff2 | blob | history

diff --combined wolnelektury/templates/base.html
index 7a85fa6,64d1081..fdd375c
--- 1/wolnelektury/templates/base.html
--- 2/wolnelektury/templates/base.html
+++ b/wolnelektury/templates/base.html
@@@ -6,7 -6,7 +6,7 @@@
      <head>
          <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
          <title>{% block title %}WolneLektury.pl{% endblock %}</title>
-         <link rel="icon" href="/static/img/favicon.png" type="image/x-icon" />
+         <link rel="icon" href="{{ STATIC_URL }}img/favicon.png" type="image/x-icon" />
          {% compressed_css "all" %}
          {% compressed_js "jquery" %}
          {% compressed_js "all" %}
@@@ -14,10 -14,10 +14,10 @@@
          {% endblock %}
      </head>
      <body id="{% block bodyid %}base{% endblock %}">
-         <!--[if lt IE 7]><link href=/static/infobar/infobar.css rel=stylesheet>
+         <!--[if lt IE 7]><link href={{ STATIC_URL }}infobar/infobar.css rel=stylesheet>
          <div id=infobar><a href=http://browsehappy.pl/infobar>
          {% trans "Internet Explorer cannot display this site properly. Click here to read more..." %}
-         </a></div><div id=viewplot><script src=/static/infobar/infobar.js></script><![endif]-->
+         </a></div><div id=viewplot><script src={{ STATIC_URL }}infobar/infobar.js></script><![endif]-->
          {% block bodycontent %}
          <div id="top-message">
              {% chunk "top-message" %}
@@@ -28,12 -28,12 +28,12 @@@
          </div>
          <div id="header">
              <div id="logo">
-                 <a href="/"><img src="/static/img/logo.png" alt="WolneLektury.pl - logo" /></a>
+                 <a href="/"><img src="{{ STATIC_URL }}img/logo.png" alt="WolneLektury.pl - logo" /></a>
              </div>
              <div id="user-info" style="display:none">
                  {% if user.is_authenticated %}
                      <p>
 -                        {% trans "Welcome" %},<strong>{{ user.username }}</strong>
 +                        {% trans "Welcome" %}, <strong>{{ user.username }}</strong>
                          | <a href="{% url user_shelves %}" id="user-shelves-link">{% trans "Your shelves" %}</a>
                          {% if user.is_staff %}
                          | <a href="/admin/">{% trans "Administration" %}</a>
@@@ -45,9 -45,9 +45,9 @@@
                  {% endif %}
              </div>
              <div class="social-links" style="float:right">
-                 <a href="http://pl-pl.facebook.com/pages/Wolne-Lektury/203084073268"><img src="/static/img/social/facebook.png" /></a>
-                 <a href="http://twitter.com/wolnelektury"><img src="/static/img/social/twitter.png" /></a>
-                 <a href="http://nasza-klasa.pl/profile/30441509"><img src="/static/img/social/naszaklasa.png" /></a>     
+                 <a href="http://pl-pl.facebook.com/pages/Wolne-Lektury/203084073268"><img src="{{ STATIC_URL }}img/social/facebook.png" /></a>
+                 <a href="http://twitter.com/wolnelektury"><img src="{{ STATIC_URL }}img/social/twitter.png" /></a>
+                 <a href="http://nasza-klasa.pl/profile/30441509"><img src="{{ STATIC_URL }}img/social/naszaklasa.png" /></a>     
              </div>
              <div class="clearboth"></div>
          </div>
@@@ -93,7 -93,7 +93,7 @@@
          <div id="user-shelves-window">
              <div class="header"><a href="#" class="jqmClose">{% trans "Close" %}</a></div>
              <div class="target">
-                 <p><img src="/static/img/indicator.gif" alt="*"/> {% trans "Loading" %}</p>
+                 <p><img src="{{ STATIC_URL }}img/indicator.gif" alt="*"/> {% trans "Loading" %}</p>
              </div>
          </div>
          {% endblock bodycontent %}