fnp / wolnelektury.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
widget
[wolnelektury.git] / src / wolnelektury / templates / base / app.html
diff --git a/src/wolnelektury/templates/base/app.html b/src/wolnelektury/templates/base/app.html
index c10cc4c..e10b689 100644 (file)
--- a/src/wolnelektury/templates/base/app.html
+++ b/src/wolnelektury/templates/base/app.html
@@ -2,12 +2,8 @@
 {% spaceless %}
   <html lang="{{ LANGUAGE_CODE }}" prefix="og: http://ogp.me/ns# fb: http://ogp.me/ns/fb#">
     {% load pipeline i18n %}
 {% spaceless %}
   <html lang="{{ LANGUAGE_CODE }}" prefix="og: http://ogp.me/ns# fb: http://ogp.me/ns/fb#">
     {% load pipeline i18n %}
-    {% load static from staticfiles %}
-    {% load catalogue_tags funding_tags reporting_stats %}
+    {% load static %}
     {% load piwik_tags %}
     {% load piwik_tags %}
-    {% load ssi_include from ssify %}
-    {% load user_username user_is_staff from common_tags %}
-    {% load cache %}
     {% get_current_language as LANGUAGE_CODE %}
     <head>
       <meta charset="utf-8">
     {% get_current_language as LANGUAGE_CODE %}
     <head>
       <meta charset="utf-8">
@@ -43,7 +39,7 @@
 
               <div id="lang-menu" class="hoverget">
                 <span id='lang-button' class='hoverclick'>
 
               <div id="lang-menu" class="hoverget">
                 <span id='lang-button' class='hoverclick'>
-                  <span class="lang-flag">⚐</span>
+                 <img src="{% static "img/contrib/language/language.svg" %}" alt="{% trans "Language" %}">
                   <span class="label"> {% trans "Language" %}</span>
                 </span>
                 <div id="lang-menu-items">
                   <span class="label"> {% trans "Language" %}</span>
                 </span>
                 <div id="lang-menu-items">
@@ -52,7 +48,7 @@
                       {% csrf_token %}
                       <input type="hidden" name="language" value="{{ lang.0 }}"/>
                       <button type="submit" lang="{{ lang.0 }}"
                       {% csrf_token %}
                       <input type="hidden" name="language" value="{{ lang.0 }}"/>
                       <button type="submit" lang="{{ lang.0 }}"
-                              class="{% ifequal lang.0 LANGUAGE_CODE %}active{% endifequal %}">{{ lang.1 }}</button>
+                              class="{% if lang.0 == LANGUAGE_CODE %}active{% endif %}">{{ lang.1 }}</button>
                     </form>
                   {% endfor %}
                 </div>
                     </form>
                   {% endfor %}
                 </div>
@@ -60,20 +56,16 @@
 
               <nav id="menu">
                 <ul id="user-info">
 
               <nav id="menu">
                 <ul id="user-info">
-                  {% user_username as user_username %}
-                  {% user_is_staff as user_is_staff %}
-                  {{ user_username.if }}
+                  {% if request.user.is_authenticated %}
                     <li>
                       <a href="{% url 'user_settings' %}">
                     <li>
                       <a href="{% url 'user_settings' %}">
-                        <strong>{{ user_username }}</strong>
+                        <strong>{{ request.user.username }}</strong>
                       </a>
                     </li>
                       </a>
                     </li>
-                  {{ user_username.endif }}
-                  {{ user_username.if }}
                     <li>
                       <a href="{% url 'logout' %}?next={% block logout %}{{ request.get_full_path }}{% endblock %}">{% trans "Logout" %}</a>
                     </li>
                     <li>
                       <a href="{% url 'logout' %}?next={% block logout %}{{ request.get_full_path }}{% endblock %}">{% trans "Logout" %}</a>
                     </li>
-                  {{ user_username.endif }}
+                  {% endif %}
                 </ul>
 
               </nav>
                 </ul>
 
               </nav>
@@ -89,7 +81,7 @@
 
       {% endblock bodycontent %}
 
 
       {% endblock bodycontent %}
 
-      <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
+      <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.7.1/jquery.min.js" integrity="sha512-BkBgWiL0N/EFIbLZYGTgbksKG5bS6PtwnWvVk3gccv+KhtK/4wkLxCRGh+kelKiXx7Ey4jfTabLg3AEIPC7ENA==" crossorigin="anonymous"></script>
       <script type="text/javascript">
         var LANGUAGE_CODE = "{{ LANGUAGE_CODE }}";
         var STATIC_URL = "{{ STATIC_URL }}";
       <script type="text/javascript">
         var LANGUAGE_CODE = "{{ LANGUAGE_CODE }}";
         var STATIC_URL = "{{ STATIC_URL }}";