X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/039112897b09b05153d79ca9a2d9ed114827d294..6d4d8644ae79d264dda4e9d3cb0322962a182463:/redakcja/templates/registration/head_login.html

diff --git a/redakcja/templates/registration/head_login.html b/redakcja/templates/registration/head_login.html
index 3077af38..01edf112 100644
--- a/redakcja/templates/registration/head_login.html
+++ b/redakcja/templates/registration/head_login.html
@@ -4,17 +4,26 @@
 
 
 <li><a style="color: white">
-  <form action="{% url 'django.views.i18n.set_language' %}" method="post" style="display: inline">
+  <form action="{% url 'set_language' %}" method="post" style="display: inline">
   {% csrf_token %}
   <input type="hidden" name="language" value="en" /><button type="submit" style="border: 0; background: none">en</button></form> |
-  <form action="{% url 'django.views.i18n.set_language' %}" method="post" style="display: inline">
+  <form action="{% url 'set_language' %}" method="post" style="display: inline">
   {% csrf_token %}
   <input type="hidden" name="language" value="pl" /><button type="submit" style="border: 0; background: none">pl</button></form> |
 </a>
 </li>
 
 <li><a href="/platform/" style="color: white">{% trans "About" %}</a></li>
-<li><a href="/appyourschool/" style="color: white">{% trans "App Your School" %}</a></li>
+<li class="dropdown">
+    <a href="#" class="dropdown-toggle" type="button" data-toggle="dropdown" style="color: white">
+        {% trans "Projects" %}
+        <span class="caret"></span>
+    </a>
+    <ul class="dropdown-menu">
+        <li><a href="/appyourschool/">{% trans "App Your School" %}</a></li>
+        <li><a href="https://emels.eu">{% trans "Emels" %}</a></li>
+    </ul>
+</li>
 {#<li><a href="/competition/" style="color: white">{% trans "Competition" %}</a></li>#}
 <li class="dropdown" {% if request.path == '/' %}
     data-toggle="tutorial" data-tutorial="1" data-placement="bottom"
@@ -27,11 +36,20 @@
     <ul class="dropdown-menu">
         <li><a href="{% url 'organizations_new' %}">{% trans "New organization" %}</a></li>
         <li><a href="{% url 'organizations' %}">{% trans "All organizations" %}</a></li>
+        <li role="presentation" class="divider"></li>
+        {% if user.membership_set.all.exists %}
+            <li role="presentation" class="dropdown-header">{% trans "My organizations" %}:</li>
+            {% for membership in user.membership_set.all %}
+                <li><a href="{% url 'organizations_main' membership.organization.pk %}">{{ membership.organization }}</a></li>
+            {% endfor %}
+        {% else %}
+            <li role="presentation" class="dropdown-header">{% trans "You are not a member of any organizations" %}</li>
+        {% endif %}
     </ul>
 </li>
 <li class="dropdown" {% if request.path == '/' %}
     data-toggle="tutorial" data-tutorial="2" data-placement="bottom"
-    data-content='{% trans "Here you can start editing a new resource or view your resources and all published resources." %}'
+    data-content='{% trans "Here you can start editing a new resource or view your resources and all published resources. To continue this tutorial, go to “New resource” or open an existing resource." %}'
     {% endif %}>
     <a href="#" class="dropdown-toggle" type="button" data-toggle="dropdown" style="color: white">
         {% trans "Resources" %}
@@ -43,6 +61,7 @@
             <li><a href="{% url 'catalogue_user' %}">{% trans "My resources" %}</a></li>
         {% endif %}
         <li><a href="{% url 'catalogue_finished' %}">{% trans "Finished resources" %}</a></li>
+        <li><a href="{% url 'catalogue_upcoming' %}">{% trans "Upcoming resources" %}</a></li>
     </ul>
 </li>
 
@@ -60,15 +79,6 @@
             <span class="caret"></span>
         </a>
         <ul class="dropdown-menu" style="">
-            {% if user.membership_set.all.exists %}
-            <li role="presentation" class="dropdown-header">{% trans "My organizations" %}:</li>
-            {% for membership in user.membership_set.all %}
-                <li><a href="{% url 'organizations_main' membership.organization.pk %}">{{ membership.organization }}</a></li>
-            {% endfor %}
-            {% else %}
-            <li role="presentation" class="dropdown-header">{% trans "You are not a member of any organizations" %}</li>
-            {% endif %}
-            <li role="presentation" class="divider"></li>
             <li><a href="{% url 'organizations_user_edit' %}">{% trans "Edit my data" %}</a></li>
             {% if user.is_staff %}
                 <li><a href="{% url 'admin:index' %}">{% trans "Admin" %}</a></li>