Merge branch 'thubrecht/navbar' into 'master'

Corrige le look de la navbar du wiki

See merge request klub-dev-ens/WikiENS!13
This commit is contained in:
Martin Pepin 2021-01-28 20:17:30 +01:00
commit 7111ce1583

View file

@ -6,57 +6,50 @@
{% block wiki_header_branding %} {% block wiki_header_branding %}
<a id="navbar-title" class="navbar-brand" href="/"> <a id="navbar-title" class="navbar-brand" href="/">
Wiki&nbsp;<img src="{% static 'img/logoENS-small.png' %}" style="display:inline-block; height:100%;" />&nbsp;ENS Wiki&nbsp;<img src="{% static 'img/logoENS-small.png' %}" style="display:inline-block; height:100%;" />&nbsp;ENS
</a> </a>
{% endblock %} {% endblock %}
{% block wiki_header_navlinks %} {% block wiki_header_navlinks %}
<ul class="nav navbar-nav"> <ul class="navbar-nav mr-auto">
<li class="active"><a href="{% url 'wiki:root' %}">Accueil</a></li> <li class="nav-item">
<a class="nav-link text-primary" href="{% url 'wiki:root' %}">Accueil</a>
</li>
</ul> </ul>
<div class="navbar-right"> <div class="navbar-right">
<ul class="nav navbar-nav"> <ul class="navbar-nav">
{% if user.is_authenticated %} {% if user.is_authenticated %}
<li class="dropdown"> <li class="nav-item dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"> <a class="nav-link dropdown-toggle" href="#" class="dropdown-toggle" data-toggle="dropdown">
{% trans "Paramètres de compte" %} {% trans "Paramètres de compte" %}
<b class="caret"></b> </a>
</a> <div class="dropdown-menu">
<ul class="dropdown-menu"> <a class="dropdown-item" href="{% url "account_email" %}">
<li> <i class="fa fa-envelope"></i>
<a href="{% url "account_email" %}"> {% trans "Email" %}
<i class="fa fa-envelope"></i> </a>
{% trans "Email" %} <a class="dropdown-item" href="{% url "account_change_password" %}">
</a> <i class="fa fa-lock"></i>
{% trans "Mot de passe" %}
</a>
<a class="dropdown-item" href="{% url "socialaccount_connections" %}" title="Clipper…">
<i class="fa fa-sign-in"></i>
{% trans "Connexions par tiers" %}
</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="{% url "account_logout" %}">
<i class="fa fa-power-off"></i>
{% trans "Déconnexion" %}
</a>
</div>
</li> </li>
<li> {% else %}
<a href="{% url "account_change_password" %}"> <li class="nav-item">
<i class="fa fa-lock"></i> <a class="nav-link" href="{% url "account_signup" %}">{% trans "Sign Up" %}</a>
{% trans "Mot de passe" %}
</a>
</li> </li>
<li> {% endif %}
<a href="{% url "socialaccount_connections" %}" title="Clipper…"> </ul>
<i class="fa fa-sign-in"></i>
{% trans "Connexions par tiers" %}
</a>
</li>
<li class="divider"></span>
<li>
<a href="{% url "account_logout" %}">
<i class="fa fa-power-off"></i>
{% trans "Déconnexion" %}
</a>
</li>
</ul>
</li>
{% else %}
<li>
<a href="{% url "account_signup" %}">{% trans "Sign Up" %}</a>
</li>
{% endif %}
</ul>
</div> </div>
{% endblock %} {% endblock %}