summaryrefslogtreecommitdiffstats
path: root/inventar
diff options
context:
space:
mode:
Diffstat (limited to 'inventar')
-rw-r--r--inventar/templates/base.html6
-rw-r--r--inventar/urls.py6
2 files changed, 7 insertions, 5 deletions
diff --git a/inventar/templates/base.html b/inventar/templates/base.html
index d72414a..a97ed7e 100644
--- a/inventar/templates/base.html
+++ b/inventar/templates/base.html
@@ -13,9 +13,9 @@
<div class="body">
<div class="menu">
<ul>
- <li><a href="{% url home %}"><img src="/static/home.svg" width="24" height="24" /> {% trans "Home" %}</a></li>
- <li><a href="{% url admin:index %}"><img src="/static/admin.svg" width="24" height="24" /> {% trans "Admin Area" %}</a></li>
- <li><a href="{% url stats %}"><img src="/static/stats.svg" width="24" height="24" /> {% trans "Statistics" %}</a></li>
+ <li><a href="{% url "home" %}"><img src="/static/home.svg" width="24" height="24" /> {% trans "Home" %}</a></li>
+ <li><a href="{% url "admin:index" %}"><img src="/static/admin.svg" width="24" height="24" /> {% trans "Admin Area" %}</a></li>
+ <li><a href="{% url "stats" %}"><img src="/static/stats.svg" width="24" height="24" /> {% trans "Statistics" %}</a></li>
<li><br></li>
<li>{% trans "Search Item" %}:
<ul>
diff --git a/inventar/urls.py b/inventar/urls.py
index 7554e92..2a6598b 100644
--- a/inventar/urls.py
+++ b/inventar/urls.py
@@ -13,6 +13,8 @@
# PERFORMANCE OF THIS SOFTWARE.
from django.conf.urls import patterns, include, url
+from django.conf.urls.static import static
+from django.conf import settings
from django.contrib import admin
admin.autodiscover()
@@ -26,7 +28,7 @@ from inventory.views import stats
urlpatterns = patterns('',
url(r'^$', home, name='home'),
- (r'^openid/', include('django_openid_auth.urls')),
+ #(r'^openid/', include('django_openid_auth.urls')),
url(r'^item/(?P<selectedid>[0-9A-Za-z]{4})/$', item, name='item'),
url(r'^search/(?P<term>[^/]+)/$', search, name='search'),
@@ -34,4 +36,4 @@ urlpatterns = patterns('',
url(r'^stats/$', stats, name='stats'),
url(r'^admin/', include(admin.site.urls)),
-)
+) + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)