Merge branch 'master' into wizard_form

ippisite/ippidb/templates/contribute.html

@@ -3,7 +3,7 @@
     
 {% block title %}inhibitors of Protein-Protein Interaction Database{% endblock %}
 {% block extra_css %}
-    <link rel="stylesheet" href="/static/css/admin-session.css">
+    <link rel="stylesheet" href="{% sstatic '/css/admin-session.css' %}">
 {% endblock %}
 
 {% block content %}

ippisite/ippidb/templatetags/sstatic.py

@@ -15,9 +15,9 @@ def sstatic(path):
     '''
     Returns absolute URL to static file with versioning.
     '''
+    full_path = os.path.join(settings.STATIC_URL, path[1:] if path[0] == '/' else path)
     if not settings.DEBUG:
-        return path
-    full_path = os.path.join(settings.STATIC_ROOT, path[1:] if path[0] == '/' else path)
+        return full_path
     try:
         # Get file modification time.
         mtime = os.path.getmtime(full_path)