Changes "/static/" to {{ STATIC_URL }} in templates.
authorŁukasz Rekucki <lrekucki@gmail.com>
Tue, 11 May 2010 14:32:54 +0000 (16:32 +0200)
committerŁukasz Rekucki <lrekucki@gmail.com>
Tue, 11 May 2010 14:32:54 +0000 (16:32 +0200)
13 files changed:
wolnelektury.vhost.tmpl
wolnelektury/templates/1percent.html
wolnelektury/templates/404.html
wolnelektury/templates/500.html
wolnelektury/templates/base.html
wolnelektury/templates/catalogue/book_detail.html
wolnelektury/templates/catalogue/book_fragments.html
wolnelektury/templates/catalogue/book_stub_detail.html
wolnelektury/templates/catalogue/book_text.html
wolnelektury/templates/catalogue/main_page.html
wolnelektury/templates/catalogue/search_no_hits.html
wolnelektury/templates/catalogue/tagged_object_list.html
wolnelektury/templates/info/voluntary_services.html

index fbd21a9..6fac756 100644 (file)
@@ -1,6 +1,5 @@
 <VirtualHost *:80>
     ServerName $DOMAIN
-    ServerAlias $DOMAIN_ALIASES
     ServerAdmin $ADMIN_EMAIL
 
     WSGIDaemonProcess $PROJECT_NAME user=$WSGI_USER group=$WSGI_USER processes=$WSGI_PROCESSES threads=$WSGI_THREADS display-name=%{GROUP}
@@ -14,7 +13,6 @@
 
     Alias /media $MEDIA_ROOT
     <Directory $MEDIA_ROOT >
-        Options Indexes, FollowLinks
         Order allow,deny
         Allow from all
     </Directory>
index e53caee..d7bbdc0 100644 (file)
@@ -4,10 +4,10 @@
 {% block title %}1% podatku na WolneLektury.pl{% endblock title %}
 
 {% block extrahead %}
-    <link rel="stylesheet" href="/static/css/reset.css" type="text/css" charset="utf-8" />
-    <link rel="stylesheet" href="/static/css/960.css" type="text/css" charset="utf-8" />
-    <link rel="stylesheet" href="/static/css/text.css" type="text/css" charset="utf-8" />
-    <link rel="stylesheet" href="/static/css/1percent.css" type="text/css" charset="utf-8" />
+    <link rel="stylesheet" href="{{ STATIC_URL }}css/reset.css" type="text/css" charset="utf-8" />
+    <link rel="stylesheet" href="{{ STATIC_URL }}css/960.css" type="text/css" charset="utf-8" />
+    <link rel="stylesheet" href="{{ STATIC_URL }}css/text.css" type="text/css" charset="utf-8" />
+    <link rel="stylesheet" href="{{ STATIC_URL }}css/1percent.css" type="text/css" charset="utf-8" />
 {% endblock extrahead %}
 
 {% block bodycontent %}
         
         <div id="header" class="grid_12">
             <div id="logos" class="alpha grid_5 suffix_1">
-                <img src="/static/img/logo-big.png" />
-                <img src="/static/img/1percent-big.png" />
+                <img src="{{ STATIC_URL }}img/logo-big.png" />
+                <img src="{{ STATIC_URL }}img/1percent-big.png" />
             </div>
             <div id="title" class="omega grid_6">
-                <img src="/static/img/tagline.png" />
+                <img src="{{ STATIC_URL }}img/tagline.png" />
             </div>
         </div>
         
@@ -41,7 +41,7 @@
                 <p>Przy wypełnianiu formularza PIT w polu <em>wniosek o przekazanie 1% podatku na rzecz OPP</em> wpisz:</p>
 <pre>Fundacja Nowoczesna Polska
 KRS 0000070056</pre>
-                <img src="/static/img/pit37.png" />
+                <img src="{{ STATIC_URL }}img/pit37.png" />
                 <a href="https://www.pitroczny.pl/pit?krs=0000070056"><img src="http://www.pitroczny.pl/pl/resources/images/1oppmini.png" alt="1% dla OPP" style="float: left; margin: 8px 8px 0 0" ></a>
                 <p>Skorzystaj z programu ułatwiającego przygotowanie deklaracji podatkowej on-line.</p>
             </div>
index b4968a2..b761b48 100644 (file)
@@ -6,12 +6,12 @@
 <title>404 - {% trans "Site does not exist" %} - WolneLektury.pl</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.5.2/build/reset/reset-min.css"> 
-<link rel="stylesheet" href="/static/css/error.css" type="text/css" />
+<link rel="stylesheet" href="{{ STATIC_URL }}css/error.css" type="text/css" />
 </head>
 
 <body>
 
-<a href="/"><img src="/static/img/logo.png" /></a>
+<a href="/"><img src="{{ STATIC_URL }}img/logo.png" /></a>
 <p class="haj" style="font-weight: bold">{% trans "Site does not exist" %}</p>
 <p>
 {% trans "We are sorry, but this site does not exist. Please check if you entered correct address or go to "%} <a href="/">{% trans "homepage" %}</a>.
index e778d4f..702d9a4 100644 (file)
@@ -6,12 +6,12 @@
 <title>500 - {% trans "Server error" %} WolneLektury.pl</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.5.2/build/reset/reset-min.css"> 
-<link rel="stylesheet" href="/static/css/error.css" type="text/css" />
+<link rel="stylesheet" href="{{ STATIC_URL }}css/error.css" type="text/css" />
 </head>
 
 <body>
 
-<a href="/"><img src="/static/img/logo.png" /></a>
+<a href="/"><img src="{{ STATIC_URL }}img/logo.png" /></a>
 <p class="haj" style="font-weight: bold">{% trans "Server error" %}</p>
 <p>
 {% trans "We are sorry for your inconvenience, but server error occured. We are working on fixing it as soon as possible. Meanwhile, please go to " %}<a href="/">{% trans "homepage" %}</a>.
index 7538206..430e093 100644 (file)
@@ -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" %}
         {% 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,7 +28,7 @@
         </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 %}
@@ -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 }}social/twitter.png" /></a>
+                <a href="http://nasza-klasa.pl/profile/30441509"><img src="{{ STATIC_URL }}social/naszaklasa.png" /></a>     
             </div>
             <div class="clearboth"></div>
         </div>
@@ -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 %}
index f436353..e4afcb7 100644 (file)
@@ -41,7 +41,7 @@
             {% endif %}
             {% if book.mp3_file %}
                 <div id="czytamy-sluchajac-info">
-                    <a href="http://czytamysluchajac.pl/" id="czytamysluchajac-logo"><img src="/static/img/czytamysluchajac-logo-small.png" /></a>     
+                    <a href="http://czytamysluchajac.pl/" id="czytamysluchajac-logo"><img src="{{ STATIC_URL }}img/czytamysluchajac-logo-small.png" /></a>     
                     <p>{% trans "Artist" %}: {{ book.get_extra_info_value.artist_name }}</p>
                                        {% if book.get_extra_info_value.director_name %}
                         <p>{% trans "Director" %}: {{ book.get_extra_info_value.director_name }}</p>
@@ -51,8 +51,8 @@
             {% if book.mp3_file %}<a href="{{ book.mp3_file.url }}">{% trans "Download MP3" %}</a>{% endif %}
             {% if book.ogg_file %}<a href="{{ book.ogg_file.url }}">{% trans "Download Ogg Vorbis" %}</a>{% endif %}
             {% if book.mp3_file %}
-            <object type="application/x-shockwave-flash" style="margin-top: 0.5em" data="/static/player.swf" width="426" height="20">
-                <param name="movie" value="/static/player.swf" />
+            <object type="application/x-shockwave-flash" style="margin-top: 0.5em" data="{{ STATIC_URL }}player.swf" width="426" height="20">
+                <param name="movie" value="{{ STATIC_URL }}player.swf" />
                 <param name="bgcolor" value="#ffffff" />
                 <param name="FlashVars" value="mp3={{ book.mp3_file.url }}&amp;width=426&amp;showvolume=1&amp;bgcolor1=eeeeee&amp;bgcolor2=eeeeee&amp;buttoncolor=666666" />
             </object>
     <div id="set-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 %}
\ No newline at end of file
index 0a90e45..550787d 100644 (file)
@@ -32,7 +32,7 @@
     <div id="set-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 %}
\ No newline at end of file
index 5037ecb..387e123 100644 (file)
@@ -31,7 +31,7 @@
     <div id="set-window">
         <div class="header"><a href="#" class="jqmClose">Zamknij</a></div>
         <div class="target">
-            <p><img src="/static/img/indicator.gif" alt="*"/> Ładowanie</p>
+            <p><img src="{{ STATIC_URL }}img/indicator.gif" alt="*"/> Ładowanie</p>
         </div>
     </div>
 {% endblock %}
\ No newline at end of file
index 55eef8e..2b800f5 100644 (file)
@@ -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 "book" %}
         {% compressed_js "jquery" %}
         {% compressed_js "book" %}
@@ -20,7 +20,7 @@
         </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>
         <div id="themes">
index be6d900..defa62a 100644 (file)
@@ -43,7 +43,7 @@
                 <p class="see-more"><a href="{% url lessons_document_list %}">{% trans " See more" %} ⇒</a></p>
             </div>
             <div id="czytamysluchajac">
-                <a href="http://czytamysluchajac.pl/"><img src="/static/img/czytamysluchajac-logo-small.png" /></a>
+                <a href="http://czytamysluchajac.pl/"><img src="{{ STATIC_URL }}img/czytamysluchajac-logo-small.png" /></a>
                 <p><a href="http://czytamysluchajac.pl/">Czytamy Słuchając</a> {% trans "are professional recordings of literary texts from our repository, available on free license in MP3 and Ogg Vorbis formats as well as in DAISY system." %}</p>
                 <p class="see-more"><a href="http://czytamysluchajac.pl/index.php/o-projekcie/">{% trans "See more" %} ⇒</a></p>
             </div>
index 8e4e788..7642606 100644 (file)
@@ -17,7 +17,7 @@
     <div id="set-window">
         <div class="header"><a href="#" class="jqmClose">Zamknij</a></div>
         <div class="target">
-            <p><img src="/static/img/indicator.gif" alt="*"/> Ładowanie</p>
+            <p><img src="{{ STATIC_URL }}img/indicator.gif" alt="*"/> Ładowanie</p>
         </div>
     </div>
 {% endblock %}
\ No newline at end of file
index d36fb1d..9f269e1 100644 (file)
@@ -39,7 +39,7 @@
                     <li data-format="txt"><label for="id_formats_4"><input type="checkbox" name="formats" value="txt" id="id_formats_4" /> TXT</label> <em><strong>do czytania</strong> na małych ekranach, np. na komórce</em></li>
                     <li data-format="mp3"><label for="id_formats_0"><input type="checkbox" name="formats" value="mp3" id="id_formats_0" /> MP3</label> <em><strong>do słuchania</strong> w ulubionym odtwarzaczu MP3</em></li>
                     <li data-format="ogg"><label for="id_formats_1"><input type="checkbox" name="formats" value="ogg" id="id_formats_1" /> Ogg Vorbis</label> <em><strong>do słuchania</strong> &mdash; otwarty format <a href="http://www.vorbis.com/">Fundacji Xiph.Org</a></em></li>
-                    <li id="download-formats-form-submit-li"><label><input type="submit" name="submit" value="Pobierz" id="download-formats-form-submit" disabled="disabled" />&nbsp;<img src="/static/img/indicator.gif" /></label> <span id="updating-formats">Uaktualniam listę formatów książek na półce.</span><span id="formats-updated" style="display:none;">lub <a href="#" id="download-formats-form-cancel">anuluj</a></span></li>
+                    <li id="download-formats-form-submit-li"><label><input type="submit" name="submit" value="Pobierz" id="download-formats-form-submit" disabled="disabled" />&nbsp;<img src="{{ STATIC_URL }}img/indicator.gif" /></label> <span id="updating-formats">Uaktualniam listę formatów książek na półce.</span><span id="formats-updated" style="display:none;">lub <a href="#" id="download-formats-form-cancel">anuluj</a></span></li>
                     <div class="clearboth"></div>
                 </form>
             </div>
     <div id="set-window">
         <div class="header"><a href="#" class="jqmClose">Zamknij</a></div>
         <div class="target">
-            <p><img src="/static/img/indicator.gif" alt="*"/> Ładowanie</p>
+            <p><img src="{{ STATIC_URL }}img/indicator.gif" alt="*"/> Ładowanie</p>
         </div>
     </div>
 {% endblock %}
\ No newline at end of file
index b835671..01daa5e 100644 (file)
        </p>
 
        <p>
-               <a href="/static/wolontariat.pdf">Raport z realizacji projektu „Wolontariat dla wiedzy"</a>.
+               <a href="{{ STATIC_URL }}wolontariat.pdf">Raport z realizacji projektu „Wolontariat dla wiedzy"</a>.
        </p>
        <p>
-       <img src="/static/img/wolontariat/okladka.jpg" style='margin: 10px' />
-       <img src="/static/img/wolontariat/01.jpg" style='margin: 10px' />
-       <img src="/static/img/wolontariat/02.jpg" style='margin: 10px' />
-    <img src="/static/img/wolontariat/03.jpg" style='margin: 10px' />
-    <img src="/static/img/wolontariat/04.jpg" style='margin: 10px' />
+       <img src="{{ STATIC_URL }}img/wolontariat/okladka.jpg" style='margin: 10px' />
+       <img src="{{ STATIC_URL }}img/wolontariat/01.jpg" style='margin: 10px' />
+       <img src="{{ STATIC_URL }}img/wolontariat/02.jpg" style='margin: 10px' />
+    <img src="{{ STATIC_URL }}img/wolontariat/03.jpg" style='margin: 10px' />
+    <img src="{{ STATIC_URL }}img/wolontariat/04.jpg" style='margin: 10px' />
        </p>
        
     </div>