X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/b899f584abdfe9345c90563bf28661756c959356..5a649a9e943f331ec61d2e86c3840397777ccfb6:/redakcja/templates/registration/head_login.html?ds=sidebyside diff --git a/redakcja/templates/registration/head_login.html b/redakcja/templates/registration/head_login.html index 5223da07..9ffb36b9 100644 --- a/redakcja/templates/registration/head_login.html +++ b/redakcja/templates/registration/head_login.html @@ -4,10 +4,10 @@ <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> @@ -16,21 +16,48 @@ <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><a href="/competition/" style="color: white">{% trans "Competition" %}</a></li>#} -<li><a href="{% url 'organizations_new' %}" style="color: white" - {% if request.path == '/' %} +<li class="dropdown" {% if request.path == '/' %} data-toggle="tutorial" data-tutorial="1" data-placement="bottom" - data-content='{% trans "Create an organization here. Organizations help manage team's work." %}' - {% endif %} ->{% trans "New organization" %}</a></li> -<li><a href="{% url 'catalogue_create_missing' %}" style="color: white" - {% if request.path == '/' %} + data-content='{% trans "Organizations help manage teamâs work. You can create a new organization and view all organizations." %}' + {% endif %}> + <a href="#" class="dropdown-toggle" type="button" data-toggle="dropdown" style="color: white"> + {% trans "Organizations" %} + <span class="caret"></span> + </a> + <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 'Start editing a new resource.' %}" - {% endif %} ->{% trans "New resource" %}</a></li> + 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" %} + <span class="caret"></span> + </a> + <ul class="dropdown-menu"> + <li><a href="{% url 'catalogue_create_missing' %}">{% trans "New resource" %}</a></li> + {% if user.is_authenticated %} + <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> + {% if user.is_authenticated %} -<li><a href="{% url 'catalogue_user' %}" style="color: white">{% trans "My resources" %}</a></li> <li class="dropdown"> <style> @@ -43,23 +70,12 @@ <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><a href="{% url 'organizations_new' %}">{% trans "New organization" %}</a></li> - <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> {% endif %} <li><a href="{% url 'logout' %}">{% trans "Logout" %}</a></li> </ul> - </div> </li> @@ -74,8 +90,8 @@ > {% trans "Log in / Register" %} </button> - <div class="dropdown-menu" style="padding:0;margin-top:-5px; border:none;box-shadow:none; min-width:240px"> - <div class="panel panel-default" style="color: #333;"> + <div class="dropdown-menu" style="padding:0;margin-top:-5px; border:none;box-shadow:none; min-width:240px"> + <div class="panel panel-default" style="color: #333;"> <div class="panel-heading"> <h3 class="panel-title">{% trans "Log in / Register" %}</h3> </div> @@ -104,6 +120,7 @@ <p style="margin-bottom:1em">{% trans "<strong>Register now</strong> to start editing your own materials." %}</p> <a class="btn btn-default" href="{% url 'register' %}">{% trans "Register" %}</a> </div> + </div> </div> </li> {% endifnotequal %}