Merge branch 'master' of git.linux-kernel.at:oliver/ivatar into devel

This commit is contained in:
Oliver Falk
2019-02-12 15:28:25 +01:00
3 changed files with 22 additions and 5 deletions

View File

@@ -2,9 +2,6 @@
{% load i18n %}<!DOCTYPE HTML> {% load i18n %}<!DOCTYPE HTML>
{% include 'header.html' %} {% include 'header.html' %}
<title>iVatar :: {% block title %}{% trans 'Freeing the Web, one face at a time!' %}{% endblock title %}</title> <title>iVatar :: {% block title %}{% trans 'Freeing the Web, one face at a time!' %}{% endblock title %}</title>
{% if not user.is_anonymous %}
{% include 'navbar.html' %}
{% endif %}
{% spaceless %} {% spaceless %}
<div id="page"> <div id="page">

View File

@@ -13,8 +13,30 @@
<header> <header>
<h1>{% trans 'ivatar' %}</h1> <h1>{% trans 'ivatar' %}</h1>
<h2>{% trans 'freeing the web one face at a time' %}</h2> <h2>{% trans 'freeing the web one face at a time' %}</h2>
{% if user.is_anonymous %}
<a href="/accounts/login/" class="btn btn-lg btn-primary">{% trans 'Login' %}</a>&nbsp; <a href="/accounts/login/" class="btn btn-lg btn-primary">{% trans 'Login' %}</a>&nbsp;
<a href="/accounts/new/" class="btn btn-lg btn-primary">{% trans 'Sign up' %}</a>&nbsp; <a href="/accounts/new/" class="btn btn-lg btn-primary">{% trans 'Sign up' %}</a>&nbsp;
{% else %}
<div class="btn-group">
<a class="btn btn-lg btn-primary dropdown-toggle" href="#" id="account_dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<i class="fa fa-user" aria-hidden="true"></i> {{ request.user }}
</a>
<ul class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
<li><a href="{% url 'profile' %}"><i class="fa fa-fw fa-image" aria-hidden="true"></i> {% trans 'Profile' %}</a></li>
<li><a href="{% url 'user_preference' %}"><i class="fa fa-fw fa-cog" aria-hidden="true"></i> {% trans 'Preferences' %}</a></li>
<li><a href="{% url 'import_photo' %}"><i class="fa fa-fw fa-envelope-square" aria-hidden="true"></i> {% trans 'Import photo via mail address' %}</a></li>
<li><a href="{% url 'upload_export' %}"><i class="fa fa-fw fa-file-archive-o" aria-hidden="true"></i> {% trans 'Import libravatar XML export' %}</a></li>
<li><a href="{% url 'password_change' %}"><i class="fa fa-fw fa-key" aria-hidden="true"></i> {% trans 'Change password' %}</a></li>
<li><a href="{% url 'password_reset' %}"><i class="fa fa-fw fa-unlock-alt" aria-hidden="true"></i> {% trans 'Reset password' %}</a></li>
<li><a href="{% url 'logout' %}"><i class="fa fa-fw fa-sign-out" aria-hidden="true"></i> {% trans 'Logout' %}</a></li>
{% if user.is_staff %}
<li>
<a href="{% url 'admin:index' %}" target="_new"><i class="fa fa-fw fa-user-secret" aria-hidden="true"></i> {% trans 'Admin' %}</a>
</li>
{% endif %}
</ul>
</div>
{% endif %}
<a href="/tools/check/" class="btn btn-lg btn-primary">{% trans 'Check email' %}</a>&nbsp; <a href="/tools/check/" class="btn btn-lg btn-primary">{% trans 'Check email' %}</a>&nbsp;
</header> </header>
</div> </div>

View File

@@ -23,13 +23,11 @@
{% block nav %} {% block nav %}
<div class="collapse navbar-collapse" id="navbar"> <div class="collapse navbar-collapse" id="navbar">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
{% if not user.is_anonymous %}
<li> <li>
<a href="/"><i class="fa fa-home" aria-hidden="true"></i> <a href="/"><i class="fa fa-home" aria-hidden="true"></i>
{% trans 'Home' %} {% trans 'Home' %}
</a> </a>
</li> </li>
{% endif %}
<li> <li>
<a class="nav-link" href="{% url 'contact' %}"><i class="fa fa-envelope" aria-hidden="true"></i> <a class="nav-link" href="{% url 'contact' %}"><i class="fa fa-envelope" aria-hidden="true"></i>
{% trans 'Contact' %} {% trans 'Contact' %}