{% block title %}WolneLektury.pl{% endblock %}

From: Marek Stępniowski Date: Thu, 14 Aug 2008 15:20:34 +0000 (+0200) Subject: Changed MEDIA_URL to /media/ X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/ec9a0abcd6bf2c7b3bce436a74e48d96c8b713d2?ds=sidebyside Changed MEDIA_URL to /media/ --- diff --git a/media/css/jquery.autocomplete.css b/media/css/jquery.autocomplete.css index 031589cda..9c5a36dfb 100644 --- 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 f9ff89535..aa636f4a0 100644 --- 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 d95de048d..8baaf69d1 100644 --- 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 a8e21fbb1..a98dcdf64 100644 --- a/templates/base.html +++ b/templates/base.html @@ -5,7 +5,7 @@ {% block title %}WolneLektury.pl{% endblock %} - + {% compressed_css "all" %} {% compressed_js "all" %} {% block extrahead %} @@ -14,7 +14,7 @@

-

+

{% 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: fundacja@nowoczesnapolska.org.pl

-

Partnerzy serwisu

+

Partnerzy serwisu

diff --git a/templates/catalogue/tagged_book_list.html b/templates/catalogue/tagged_book_list.html index 2ce9b8a5f..1d2b5f7c9 100644 --- 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('

Åadowanie

'); + target.html('

Åadowanie

'); hash.w.css({position: 'absolute', left: offset.left, top: offset.top}).show() }, onLoad: function(hash) { $('form', hash.w).ajaxForm({ @@ -147,7 +147,7 @@

-

Åadowanie

+

Åadowanie

{% endblock %} \ No newline at end of file diff --git a/urls.py b/urls.py index 0804ca8a3..dfa68fc36 100644 --- 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.*)$', 'django.views.static.serve', + (r'^media/(?P.*)$', '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/'}), )