Merge remote-tracking branch 'zopieux/zopieux-fixes' into rezine

celutz/settings.py

@@ -111,7 +111,7 @@ USE_TZ = True
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.7/howto/static-files/
 
-STATIC_ROOT = 'static'
+STATIC_ROOT = os.path.join(BASE_DIR, 'static')
 STATIC_URL = '/static/'
 
 

panorama/templates/panorama/base.html

@@ -48,7 +48,7 @@
                 {% block top-menu-items %}
                 {% endblock top-menu-items %}
                 <li>
-                    <a href="/admin"><i class="fa fa-pencil-square-o"></i>  {% trans "Admin" %}</a>
+                    <a href="{% url 'admin:index' %}"><i class="fa fa-pencil-square-o"></i>  {% trans "Admin" %}</a>
                 </li>
                 <li class="dropdown langue">
                   <form action="{% url 'set_language' %}" method="post">{% csrf_token %}