fnp / wolnelektury.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 61b4089)
Changed MEDIA_URL to /media/
authorMarek Stępniowski <marek@stepniowski.com>
Thu, 14 Aug 2008 15:20:34 +0000 (17:20 +0200)
committerMarek Stępniowski <marek@stepniowski.com>
Thu, 14 Aug 2008 15:20:34 +0000 (17:20 +0200)
media/css/jquery.autocomplete.css patch | blob | history
media/css/master.css patch | blob | history
settings.py patch | blob | history
templates/base.html patch | blob | history
templates/catalogue/tagged_book_list.html patch | blob | history
urls.py patch | blob | history

diff --git a/media/css/jquery.autocomplete.css b/media/css/jquery.autocomplete.css
index 031589c..9c5a36d 100644 (file)
--- a/media/css/jquery.autocomplete.css
+++ b/media/css/jquery.autocomplete.css
@@ -1,7 +1,7 @@
 .ac_results {
        padding: 0px;
-       border: 1px solid black;
-       background-color: white;
+       border: 0.1em solid #999;
+       background-color: #FFF;
        overflow: hidden;
        z-index: 99999;
 }
@@ -15,34 +15,22 @@
 }
 
 .ac_results li {
-       margin: 0px;
-       padding: 2px 5px;
+       margin: 0;
+       padding: 0.2em 0.5em;
        cursor: default;
        display: block;
-       /* 
-       if width will be 100% horizontal scrollbar will apear 
-       when scroll mode will be used
-       */
-       /*width: 100%;*/
-       font: menu;
-       font-size: 12px;
-       /* 
-       it is very important, if line-height not setted or setted 
-       in relative units scroll will be broken in firefox
-       */
-       line-height: 16px;
        overflow: hidden;
 }
 
 .ac_loading {
-       background: white url(/pliki/img/indicator.gif) right center no-repeat;
+       background: white url(/media/img/indicator.gif) right center no-repeat;
 }
 
 .ac_odd {
-       background-color: #eee;
+       background-color: #EEE;
 }
 
 .ac_over {
        background-color: #0A246A;
-       color: white;
+       color: #FFF;
 }
diff --git a/media/css/master.css b/media/css/master.css
index f9ff895..aa636f4 100644 (file)
--- a/media/css/master.css
+++ b/media/css/master.css
@@ -2,7 +2,7 @@ body {
     margin: 2em;
     font: 70% Verdana, Arial, Helvetica, sans-serif;
     line-height: 1.5em;
-    background: #FFF url(/pliki/img/bg.png) repeat-x;
+    background: #FFF url(/media/img/bg.png) repeat-x;
     color: #000;
 }
 
@@ -43,6 +43,11 @@ h3 {
     color: #333;
 }
 
+em {
+    font-style: normal;
+    background-color: #F5DC7D;
+}
+
 .clearboth {
     clear: both;
 }
@@ -275,7 +280,7 @@ h3 {
 }
 
 .book-thumbnail {
-    background: transparent url(/pliki/img/book.png) no-repeat 0 0;
+    background: transparent url(/media/img/book.png) no-repeat 0 0;
     width: 3em;
     height: 3em;
     float: left;
diff --git a/settings.py b/settings.py
index d95de04..8baaf69 100644 (file)
--- a/settings.py
+++ b/settings.py
@@ -44,12 +44,12 @@ MEDIA_ROOT = PROJECT_DIR + '/media/'
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash if there is a path component (optional in other cases).
 # Examples: "http://media.lawrence.com", "http://example.com/media/"
-MEDIA_URL = 'http://localhost:8000/pliki/'
+MEDIA_URL = 'http://localhost:8000/media/'
 
 # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
 # trailing slash.
 # Examples: "http://foo.com/media/", "/media/".
-ADMIN_MEDIA_PREFIX = '/media/'
+ADMIN_MEDIA_PREFIX = '/admin-media/'
 
 # Make this unique, and don't share it with anybody.
 
diff --git a/templates/base.html b/templates/base.html
index a8e21fb..a98dcdf 100644 (file)
--- a/templates/base.html
+++ b/templates/base.html
@@ -5,7 +5,7 @@
     <head>
         <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
         <title>{% block title %}WolneLektury.pl{% endblock %}</title>
-        <link rel="icon" href="/pliki/img/favicon.png" type="image/x-icon" />
+        <link rel="icon" href="/media/img/favicon.png" type="image/x-icon" />
         {% compressed_css "all" %}
         {% compressed_js "all" %}
         {% block extrahead %}
@@ -14,7 +14,7 @@
     <body id="{% block bodyid %}base{% endblock %}">
         <div id="header">
             <div id="logo">
-                <a href="/"><img src="/pliki/img/logo.png" alt="WolneLektury.pl - logo" /></a>
+                <a href="/"><img src="/media/img/logo.png" alt="WolneLektury.pl - logo" /></a>
             </div>
             <div id="user-info">
                 {% if user.is_authenticated %}
@@ -40,7 +40,7 @@
                 Fundacja Nowoczesna Polska, 00-514 Warszawa, ul. Marszałkowska 84/92 lok. 125, tel/fax: (22) 621-30-17,
                 e-mail: <a href="mailto:fundacja@nowoczesnapolska.org.pl">fundacja@nowoczesnapolska.org.pl</a>
             </p>
-            <img src="/pliki/img/footer.png" usemap="#footermap" alt="Partnerzy serwisu" />
+            <img src="/media/img/footer.png" usemap="#footermap" alt="Partnerzy serwisu" />
             <map name="footermap" id="footermap">
                 <area alt="Biblioteka Analiz" coords="618,59,679,77" href="http://www.rynek-ksiazki.pl/" shape="rect" />
                 <area alt="Przekrój" coords="590,53,615,74" href="http://www.przekroj.pl/" shape="rect" />
diff --git a/templates/catalogue/tagged_book_list.html b/templates/catalogue/tagged_book_list.html
index 2ce9b8a..1d2b5f7 100644 (file)
--- a/templates/catalogue/tagged_book_list.html
+++ b/templates/catalogue/tagged_book_list.html
@@ -42,7 +42,7 @@
                 trigger: 'a.jqm-trigger', 
                 onShow: function(hash) { 
                     var offset = $(hash.t).offset();
-                    target.html('<p><img src="/pliki/img/indicator.gif" /> Ładowanie</p>');
+                    target.html('<p><img src="/.txt/img/indicator.gif" /> Ładowanie</p>');
                     hash.w.css({position: 'absolute', left: offset.left, top: offset.top}).show() },
                 onLoad: function(hash) { 
                     $('form', hash.w).ajaxForm({
@@ -147,7 +147,7 @@
     <div id="set-window">
         <div class="header"><a href="#" class="jqmClose">Zamknij</a></div>
         <div class="target">
-            <p><img src="/pliki/img/indicator.gif" /> Ładowanie</p>
+            <p><img src="/.txt/img/indicator.gif" /> Ładowanie</p>
         </div>
     </div>
 {% endblock %}
\ No newline at end of file
diff --git a/urls.py b/urls.py
index 0804ca8..dfa68fc 100644 (file)
--- a/urls.py
+++ b/urls.py
@@ -20,7 +20,7 @@ urlpatterns = patterns('',
     url(r'^uzytkownicy/wyloguj/$', 'django.contrib.auth.views.logout_then_login', name='logout'),
     
     # Pliki statyczne
-    (r'^pliki/(?P<path>.*)$', 'django.views.static.serve', 
+    (r'^media/(?P<path>.*)$', 'django.views.static.serve', 
         {'document_root': os.path.join(os.path.dirname(__file__), 'media'), 'show_indexes': True}),
     (r'^$', 'django.views.generic.simple.redirect_to', {'url': 'katalog/'}),
 )