ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update user setting page

Browse Source
This commit is contained in:
Oskar Hahn 2012-07-10 02:46:00 +02:00
parent 403f8e7917
commit 96aca54f61
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openslides/participant/templates/participant/password_change.html
View File

@ -2,9 +2,14 @@
{% load i18n %} {% load i18n %}
{% block title %}{{ block.super }} - {%trans "New password" %}{% endblock %} {% block title %}{{ block.super }} – {% trans "Password Settings" %}{% endblock %}
{% block submenu %} {% block submenu %}
<h4 class="sectiontitle">{% trans "User Settings" %}</h4>
<ul>
<li><a href="{% url user_settings %}">{% trans "Personal Settings" %}</a></li>
<li class="selected"><a href="{% url password_change %}">{% trans "Password Settings" %}</a></li>
</ul>
{% endblock %} {% endblock %}
{% block content %} {% block content %}
@ -16,8 +21,8 @@
<button class="button" type="submit"> <button class="button" type="submit">
<span class="icon ok">{%trans 'Save' %}</span> <span class="icon ok">{%trans 'Save' %}</span>
</button> </button>
<a href='{% url item_overview %}'> <a href=''>
<button class="button" type="button" onclick="window.location='{% url item_overview %}'"> <button class="button" type="button">
<span class="icon cancel">{%trans 'Cancel' %}</span> <span class="icon cancel">{%trans 'Cancel' %}</span>
</button> </button>
</a> </a>

15
openslides/participant/templates/participant/settings.html
View File

@ -2,13 +2,18 @@
{% load i18n %} {% load i18n %}
{% block title %}{{ block.super }} - {%trans "Your Settings" %}{% endblock %} {% block title %}{{ block.super }} – {% trans "Personal Settings" %}{% endblock %}
{% block submenu %} {% block submenu %}
<h4 class="sectiontitle">{% trans "User Settings" %}</h4>
<ul>
<li class="selected"><a href="{% url user_settings %}">{% trans "Personal Settings" %}</a></li>
<li><a href="{% url password_change %}">{% trans "Password Settings" %}</a></li>
</ul>
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<h1>{%trans "Your Settings" %}</h1> <h1>{% trans "Personal Settings" %}</h1>
<form action="" method="post">{% csrf_token %} <form action="" method="post">{% csrf_token %}
{{ form_user.as_p }} {{ form_user.as_p }}
@ -16,12 +21,10 @@
<button class="button" type="submit"> <button class="button" type="submit">
<span class="icon ok">{%trans 'Save' %}</span> <span class="icon ok">{%trans 'Save' %}</span>
</button> </button>
<a href='{% url item_overview %}'> <a href=''>
<button class="button" type="button" onclick="window.location='{% url item_overview %}'"> <button class="button" type="button">
<span class="icon cancel">{%trans 'Cancel' %}</span> <span class="icon cancel">{%trans 'Cancel' %}</span>
</button> </button>
</a> </a>
</form> </form>
<a href="{% url password_change %}">{% trans 'Change your password' %}</a>
<p></p>
{% endblock %} {% endblock %}

2
openslides/templates/base.html
View File

@ -26,7 +26,7 @@
{% if user.is_authenticated %} {% if user.is_authenticated %}
<li>|<a href="{% url user_logout %}">{%trans "Logout" %}</a></li> <li>|<a href="{% url user_logout %}">{%trans "Logout" %}</a></li>
{% url user_settings as url_usersettings %} {% url user_settings as url_usersettings %}
<li>|<a href="{% url user_settings %}">{% if request.path == url_usersettings %}<strong>{% endif %}{%trans "User Settings" %}{% if request.path == url_usersettings %}</strong>{% endif %}</a></li> <li>|<a href="{% url user_settings %}">{% if request.path == url_usersettings %}<strong>{% endif %}{% trans "User Settings" %}{% if request.path == url_usersettings %}</strong>{% endif %}</a></li>
<li>{%trans "Welcome" %}, <strong>{{ user.username }}</strong></li> <li>{%trans "Welcome" %}, <strong>{{ user.username }}</strong></li>
{% else %} {% else %}
<li><a href="{% url user_login %}">{%trans "Login" %}</a></li> <li><a href="{% url user_login %}">{%trans "Login" %}</a></li>