Commit 9c5dbbde authored by Oliver Falk's avatar Oliver Falk
Browse files

Merge branch 'devel' into 'master'

Show mail address of the user in the user prefs

See merge request oliver/ivatar!155
parents f6520eee ff7539a5
Loading
Loading
Loading
Loading
Loading
+5 −0
Changes for ivatar/ivataraccount/templates/preferences.html: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -7,6 +7,11 @@
{% block content %}
<h1>{% trans 'Account settings' %}</h1>

<div class="form-group">
<label for="id_email">{% trans 'Your email' %}:</label>
<input type="text" name="email" disabled class="form-control" value="{{ user.email }}" id="id_email" style="max-width:600px;">
</div>

<!-- TODO: Language stuff not yet fully implemented; Esp. translations are only half-way there

<h2>{% trans 'Language' %}</h2>