Merge branch 'devel'

[qcg-portal.git] / qcg / templates / qcg / base.html

diff --git a/qcg/templates/qcg/base.html b/qcg/templates/qcg/base.html
index fdcc2fe..56f37e1 100644 (file)
--- a/qcg/templates/qcg/base.html
+++ b/qcg/templates/qcg/base.html
@@ -62,7 +62,8 @@
                                     </li>
                                 </ul>
                             </li>
-                    {% else %}
+                    {% elif request %}
+                        {# trick to prevent below link from showing up on error pages #}
                         <li><a href="{% url 'login' %}" class="navbar-link">Zaloguj</a></li>
                     {% endif %}
                 </ul>
@@ -77,6 +78,8 @@
             {% endfor %}
         {% endblock messages %}
 
+        {% include 'better_sessions/alerts.html' %}
+
         {% block container %}
 
 
@@ -115,6 +118,23 @@
 
     <script src="{% static 'qcg/jquery/jquery.min.js' %}"></script>
     <script src="{% static 'qcg/bootstrap/js/bootstrap.min.js' %}"></script>
+    <script src="{% static 'qcg/cookie/jquery.cookie.min.js' %}"></script>
+    <script src="{% static 'qcg/globals.js' %}"></script>
+    <script src="{% static 'filex/underscore/underscore-min.js' %}"></script>
+    <script src="{% static 'filex/humanize/humanize-duration.js' %}"></script>
+    <script src="{% static 'better_sessions/better_sessions.js' %}"></script>
+
+    {% if user.is_authenticated %}
+        <script>
+            var psnc = psnc || {},
+                bs = new psnc.BetterSession({
+                    warnAfter: {{ session_warn_after }},
+                    expireAfter: {{ session_expire_after }},
+                    pingUrl: '{% url 'session:ping' %}'
+                });
+        </script>
+    {% endif %}
+
     {% block extra_js %}{% endblock %}
 </body>
 </html>