Fixed some old references to verdant

pull/3/head
Karl Hobley 2014-01-28 16:10:33 +00:00
rodzic 67a069dbd3
commit 30dea1ca1b
2 zmienionych plików z 9 dodań i 9 usunięć

Wyświetl plik

@ -11,7 +11,7 @@
<li><a href="{% url 'wagtailadmin_pages_select_type' %}" class="icon teal icon-plus-inverse">New page</a></li>
{% endcomment %}
<li class="footer">
<div class="avatar icon icon-user"><a href="{% url 'verdantadmin_account' %}" title="Account settings">{% if request.user.email %}<img src="{% gravatar_url request.user.email %}" />{% else %}Account{% endif %}</a></div>
<div class="avatar icon icon-user"><a href="{% url 'wagtailadmin_account' %}" title="Account settings">{% if request.user.email %}<img src="{% gravatar_url request.user.email %}" />{% else %}Account{% endif %}</a></div>
<a href="{% url 'django.contrib.auth.views.logout' %}">Log out</a>
</li>
{% if request.user.is_superuser %} {# for now, 'More' links will be superuser-only #}

Wyświetl plik

@ -7,18 +7,18 @@ urlpatterns = patterns('django.contrib.auth.views',
# Password reset
url(r'^password_reset/$', 'password_reset', {
'template_name': 'verdantadmin/account/password_reset/form.html',
'email_template_name': 'verdantadmin/account/password_reset/email.txt',
'subject_template_name': 'verdantadmin/account/password_reset/email_subject.txt',
'template_name': 'wagtailadmin/account/password_reset/form.html',
'email_template_name': 'wagtailadmin/account/password_reset/email.txt',
'subject_template_name': 'wagtailadmin/account/password_reset/email_subject.txt',
'password_reset_form': PasswordResetForm,
}, name='password_reset'),
url(r'^password_reset/done/$', 'password_reset_done', {'template_name': 'verdantadmin/account/password_reset/done.html'}, name='password_reset_done'),
url(r'^password_reset/done/$', 'password_reset_done', {'template_name': 'wagtailadmin/account/password_reset/done.html'}, name='password_reset_done'),
url(r'^password_reset/confirm/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$',
'password_reset_confirm',
{'template_name': 'verdantadmin/account/password_reset/confirm.html'},
{'template_name': 'wagtailadmin/account/password_reset/confirm.html'},
name='password_reset_confirm',
),
url(r'^password_reset/complete/$', 'password_reset_complete', {'template_name': 'verdantadmin/account/password_reset/complete.html'}, name='password_reset_complete'),
url(r'^password_reset/complete/$', 'password_reset_complete', {'template_name': 'wagtailadmin/account/password_reset/complete.html'}, name='password_reset_complete'),
)
urlpatterns += patterns('wagtail.wagtailadmin.views',
@ -63,6 +63,6 @@ urlpatterns += patterns('wagtail.wagtailadmin.views',
url(r'^tag-autocomplete/$', 'tags.autocomplete', name='wagtailadmin_tag_autocomplete'),
url(r'^account/$', 'account.account', name='verdantadmin_account'),
url(r'^account/change_password/$', 'account.change_password', name='verdantadmin_account_change_password'),
url(r'^account/$', 'account.account', name='wagtailadmin_account'),
url(r'^account/change_password/$', 'account.change_password', name='wagtailadmin_account_change_password'),
)