Permalink
Browse files

favicon, static and media through nginx

  • Loading branch information...
1 parent 116da7d commit f6b1b2dd4068f90582c1b8bcaf4a60cc8c9aef29 @d1ffuz0r committed Sep 27, 2012
Showing with 4 additions and 10 deletions.
  1. +3 −1 homesite/templates/base.haml
  2. BIN static/images/favicon.ico
  3. +1 −1 static/js/site.js
  4. +0 −8 urls.py
@@ -7,6 +7,8 @@
%meta{'name': 'author', 'content': 'Roman Gladkov, d1fffuz0r@gmail.com'}
%meta{'name': 'keywords', 'content': 'd1ffuz0r, blog, contacts, portfolio, python, django, tornado, jQuery, Erlang'}
%meta{'name': 'description', 'content': 'd1ffuz0r personal site, blog, portfolio'}
+ %link{'rel': 'icon', 'href': '{{ STATIC_URL }}/images/favicon.ico'}
+ %link{'rel': 'shortcut icon', 'href': '{{ STATIC_URL }}/images/favicon.ico'}
%link{'rel': 'stylesheet', 'href': '{{ STATIC_URL }}css/style.css', 'type': 'text/css', 'charset': 'utf-8', 'media': 'screen'}
%script{'type': 'text/javascript', 'src': '{{ STATIC_URL }}js/jquery-1.6.2.min.js', 'charset': 'utf-8'}
%script{'type': 'text/javascript', 'src': '{{ STATIC_URL }}js/site.js', 'charset': 'utf-8'}
@@ -82,4 +84,4 @@
%img{'src': '{{ STATIC_URL }}images/django-logo.gif'}
.rss
%a{'href': '/blog/rss/'}
- %img{'src': '{{ STATIC_URL }}images/rss_logo.png'}
+ %img{'src': '{{ STATIC_URL }}images/rss_logo.png'}
View
Binary file not shown.
View
@@ -34,4 +34,4 @@ $(document).ready(function(){
});
}
);
-});
+});
View
@@ -9,13 +9,5 @@
urlpatterns = patterns('',
url(r'', include('homesite.urls')),
- url(r'^media/(?P<path>.*)$',
- 'django.views.static.serve',
- {'document_root': settings.MEDIA_ROOT}
- ),
- url(r'^static/(?P<path>.*)$',
- 'django.views.static.serve',
- {'document_root': settings.STATIC_ROOT}
- ),
url(r'^admin/', include(admin.site.urls)),
)

0 comments on commit f6b1b2d

Please sign in to comment.