Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Django 1.5 support #4

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Django 1.5 support #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions userenabootstrap/templates/userena/email_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
{% block title %}{% trans "Change email address" %}{% endblock %}

{% block profile_sidenav %}
<li><a href="{% url userena_profile_detail user.username %}"><span>{% trans 'View profile' %}</span></a></li>
<li><a href="{% url userena_profile_edit user.username %}">{% trans "Edit profile" %}</a></li>
<li><a href="{% url userena_password_change user.username %}">{% trans "Change password" %}</a></li>
<li class="active"><a href="{% url userena_email_change user.username %}">{% trans "Change email" %}</a></li>
<li><a href="{% url 'userena_profile_detail' user.username %}"><span>{% trans 'View profile' %}</span></a></li>
<li><a href="{% url 'userena_profile_edit' user.username %}">{% trans "Edit profile" %}</a></li>
<li><a href="{% url 'userena_password_change' user.username %}">{% trans "Change password" %}</a></li>
<li class="active"><a href="{% url 'userena_email_change' user.username %}">{% trans "Change email" %}</a></li>
{% endblock %}

{% block profile_content %}
Expand Down
8 changes: 4 additions & 4 deletions userenabootstrap/templates/userena/password_complete.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
{% block title %}{% trans "Password changed" %}{% endblock %}

{% block profile_sidenav %}
<li><a href="{% url userena_profile_detail user.username %}"><span>{% trans 'View profile' %}</span></a></li>
<li><a href="{% url userena_profile_edit user.username %}">{% trans "Edit profile" %}</a></li>
<li class="active"><a href="{% url userena_password_change user.username %}">{% trans "Change password" %}</a></li>
<li><a href="{% url userena_email_change user.username %}">{% trans "Change email" %}</a></li>
<li><a href="{% url 'userena_profile_detail' user.username %}"><span>{% trans 'View profile' %}</span></a></li>
<li><a href="{% url 'userena_profile_edit' user.username %}">{% trans "Edit profile" %}</a></li>
<li class="active"><a href="{% url 'userena_password_change' user.username %}">{% trans "Change password" %}</a></li>
<li><a href="{% url 'userena_email_change' user.username %}">{% trans "Change email" %}</a></li>
{% endblock %}

{% block profile_content %}
Expand Down
8 changes: 4 additions & 4 deletions userenabootstrap/templates/userena/password_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
{% block title %}{% trans "Change password" %}{% endblock %}

{% block profile_sidenav %}
<li><a href="{% url userena_profile_detail user.username %}"><span>{% trans 'View profile' %}</span></a></li>
<li><a href="{% url userena_profile_edit user.username %}">{% trans "Edit profile" %}</a></li>
<li class="active"><a href="{% url userena_password_change user.username %}">{% trans "Change password" %}</a></li>
<li><a href="{% url userena_email_change user.username %}">{% trans "Change email" %}</a></li>
<li><a href="{% url 'userena_profile_detail' user.username %}"><span>{% trans 'View profile' %}</span></a></li>
<li><a href="{% url 'userena_profile_edit' user.username %}">{% trans "Edit profile" %}</a></li>
<li class="active"><a href="{% url 'userena_password_change' user.username %}">{% trans "Change password" %}</a></li>
<li><a href="{% url 'userena_email_change' user.username %}">{% trans "Change email" %}</a></li>
{% endblock %}

{% block profile_content %}
Expand Down
8 changes: 4 additions & 4 deletions userenabootstrap/templates/userena/profile_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
{% block profile_sidenav %}
{% comment %}Dirty hack. Will use django-guardian in the future.{% endcomment %}
{% if user.username == profile.user.username %}
<li class="active"><a href="{% url userena_profile_detail user.username %}">{% trans "View profile" %}</a></li>
<li><a href="{% url userena_profile_edit user.username %}">{% trans "Edit details" %}</a></li>
<li><a href="{% url userena_password_change user.username %}">{% trans "Change password" %}</a></li>
<li><a href="{% url userena_email_change user.username %}">{% trans "Change email" %}</a></li>
<li class="active"><a href="{% url 'userena_profile_detail' user.username %}">{% trans "View profile" %}</a></li>
<li><a href="{% url 'userena_profile_edit' user.username %}">{% trans "Edit details" %}</a></li>
<li><a href="{% url 'userena_password_change' user.username %}">{% trans "Change password" %}</a></li>
<li><a href="{% url 'userena_email_change' user.username %}">{% trans "Change email" %}</a></li>
{% endif %}
{% endblock %}

Expand Down
8 changes: 4 additions & 4 deletions userenabootstrap/templates/userena/profile_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@


{% block profile_sidenav %}
<li><a href="{% url userena_profile_detail user.username %}"><span>{% trans 'View profile' %}</span></a></li>
<li class="active"><a href="{% url userena_profile_edit user.username %}">{% trans "Edit profile" %}</a></li>
<li><a href="{% url userena_password_change user.username %}">{% trans "Change password" %}</a></li>
<li><a href="{% url userena_email_change user.username %}">{% trans "Change email" %}</a></li>
<li><a href="{% url 'userena_profile_detail' user.username %}"><span>{% trans 'View profile' %}</span></a></li>
<li class="active"><a href="{% url 'userena_profile_edit' user.username %}">{% trans "Edit profile" %}</a></li>
<li><a href="{% url 'userena_password_change' user.username %}">{% trans "Change password" %}</a></li>
<li><a href="{% url 'userena_email_change' user.username %}">{% trans "Change email" %}</a></li>
{% endblock %}

{% block profile_content %}
Expand Down
8 changes: 4 additions & 4 deletions userenabootstrap/templates/userena/profile_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<ul id="profile_list">
{% for profile in profile_list %}
<li>
<a href="{% url userena_profile_detail profile.user.username %}"><img src="{{ profile.get_mugshot_url }}" /></a>
<a href="{% url userena_profile_detail profile.user.username %}">{{ profile.user.username }}</a>
<a href="{% url 'userena_profile_detail' profile.user.username %}"><img src="{{ profile.get_mugshot_url }}" /></a>
<a href="{% url 'userena_profile_detail' profile.user.username %}">{{ profile.user.username }}</a>
</li>
{% endfor %}

Expand All @@ -18,7 +18,7 @@
<div class="pagination">
<span class="step-links">
{% if page_obj.has_previous %}
<a href="{% url userena_profile_list_paginated page_obj.previous_page_number %}">{% trans 'previous' %}</a>
<a href="{% url 'userena_profile_list_paginated' page_obj.previous_page_number %}">{% trans 'previous' %}</a>
{% endif %}

<span class="current">
Expand All @@ -28,7 +28,7 @@
</span>

{% if page_obj.has_next %}
<a href="{% url userena_profile_list_paginated page_obj.next_page_number %}">{% trans 'next' %}</a>
<a href="{% url 'userena_profile_list_paginated' page_obj.next_page_number %}">{% trans 'next' %}</a>
{% endif %}
</span>
</div>
Expand Down
2 changes: 1 addition & 1 deletion userenabootstrap/templates/userena/signin_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</fieldset>
<div class="form-actions">
<input type="submit" value="{% trans "Signin" %}" class="btn btn-primary" />
<p class="forgot-password"><a href="{% url userena_password_reset %}" title="{% trans "Forgot your password?" %}">{% trans "Forgot your password?" %}</a></p>
<p class="forgot-password"><a href="{% url 'userena_password_reset' %}" title="{% trans "Forgot your password?" %}">{% trans "Forgot your password?" %}</a></p>
</div>
{% if next %}<input type="hidden" name="next" value="{{ next }}" />{% endif %}
</form>
Expand Down