From 6aeca83ae573a88c2825188584b061c11043b3b6 Mon Sep 17 00:00:00 2001 From: Sanj Date: Sat, 7 May 2011 16:21:26 +0530 Subject: [PATCH] sandbox relative links --- .../templates/registration/.svn/all-wcprops | 53 ++++ edgware/templates/registration/.svn/entries | 300 ++++++++++++++++++ .../.svn/text-base/logged_out.html.svn-base | 1 + .../.svn/text-base/login.html.svn-base | 1 + .../password_change_form.html.svn-base | 1 + .../password_reset_complete.html.svn-base | 1 + .../password_reset_confirm.html.svn-base | 5 + .../password_reset_done.html.svn-base | 1 + .../password_reset_email.html.svn-base | 1 + .../password_reset_form.html.svn-base | 1 + .../templates/registration/logged_out.html | 1 + edgware/templates/registration/login.html | 28 +- .../registration/password_change_form.html | 1 + .../registration/password_reset_complete.html | 1 + .../registration/password_reset_confirm.html | 5 + .../registration/password_reset_done.html | 1 + .../registration/password_reset_email.html | 1 + .../registration/password_reset_form.html | 1 + edgware/urls.py | 3 +- 19 files changed, 381 insertions(+), 26 deletions(-) create mode 100644 edgware/templates/registration/.svn/all-wcprops create mode 100644 edgware/templates/registration/.svn/entries create mode 100644 edgware/templates/registration/.svn/text-base/logged_out.html.svn-base create mode 100644 edgware/templates/registration/.svn/text-base/login.html.svn-base create mode 100644 edgware/templates/registration/.svn/text-base/password_change_form.html.svn-base create mode 100644 edgware/templates/registration/.svn/text-base/password_reset_complete.html.svn-base create mode 100644 edgware/templates/registration/.svn/text-base/password_reset_confirm.html.svn-base create mode 100644 edgware/templates/registration/.svn/text-base/password_reset_done.html.svn-base create mode 100644 edgware/templates/registration/.svn/text-base/password_reset_email.html.svn-base create mode 100644 edgware/templates/registration/.svn/text-base/password_reset_form.html.svn-base create mode 100644 edgware/templates/registration/logged_out.html create mode 100644 edgware/templates/registration/password_change_form.html create mode 100644 edgware/templates/registration/password_reset_complete.html create mode 100644 edgware/templates/registration/password_reset_confirm.html create mode 100644 edgware/templates/registration/password_reset_done.html create mode 100644 edgware/templates/registration/password_reset_email.html create mode 100644 edgware/templates/registration/password_reset_form.html diff --git a/edgware/templates/registration/.svn/all-wcprops b/edgware/templates/registration/.svn/all-wcprops new file mode 100644 index 0000000..6549c09 --- /dev/null +++ b/edgware/templates/registration/.svn/all-wcprops @@ -0,0 +1,53 @@ +K 25 +svn:wc:ra_dav:version-url +V 81 +/svn/!svn/ver/14003/django/trunk/django/contrib/auth/tests/templates/registration +END +password_reset_complete.html +K 25 +svn:wc:ra_dav:version-url +V 110 +/svn/!svn/ver/12420/django/trunk/django/contrib/auth/tests/templates/registration/password_reset_complete.html +END +password_reset_confirm.html +K 25 +svn:wc:ra_dav:version-url +V 109 +/svn/!svn/ver/12420/django/trunk/django/contrib/auth/tests/templates/registration/password_reset_confirm.html +END +password_reset_form.html +K 25 +svn:wc:ra_dav:version-url +V 106 +/svn/!svn/ver/12420/django/trunk/django/contrib/auth/tests/templates/registration/password_reset_form.html +END +logged_out.html +K 25 +svn:wc:ra_dav:version-url +V 97 +/svn/!svn/ver/14003/django/trunk/django/contrib/auth/tests/templates/registration/logged_out.html +END +login.html +K 25 +svn:wc:ra_dav:version-url +V 91 +/svn/!svn/ver/8497/django/trunk/django/contrib/auth/tests/templates/registration/login.html +END +password_reset_done.html +K 25 +svn:wc:ra_dav:version-url +V 106 +/svn/!svn/ver/12420/django/trunk/django/contrib/auth/tests/templates/registration/password_reset_done.html +END +password_change_form.html +K 25 +svn:wc:ra_dav:version-url +V 107 +/svn/!svn/ver/14003/django/trunk/django/contrib/auth/tests/templates/registration/password_change_form.html +END +password_reset_email.html +K 25 +svn:wc:ra_dav:version-url +V 107 +/svn/!svn/ver/12420/django/trunk/django/contrib/auth/tests/templates/registration/password_reset_email.html +END diff --git a/edgware/templates/registration/.svn/entries b/edgware/templates/registration/.svn/entries new file mode 100644 index 0000000..3ffbc9c --- /dev/null +++ b/edgware/templates/registration/.svn/entries @@ -0,0 +1,300 @@ +10 + +dir +15449 +http://code.djangoproject.com/svn/django/trunk/django/contrib/auth/tests/templates/registration +http://code.djangoproject.com/svn + + + +2010-10-08T13:50:54.908742Z +14003 +russellm + + + + + + + + + + + + + + +bcc190cf-cafb-0310-a4f2-bffc1f526a37 + +password_reset_complete.html +file + + + + +2011-02-08T11:05:45.677065Z +b086e39450cc1801a75d6eb86f9642b8 +2010-02-13T12:02:11.708906Z +12420 +russellm + + + + + + + + + + + + + + + + + + + + + +27 + +password_reset_confirm.html +file + + + + +2011-02-08T11:05:45.677065Z +8c94e1c987778dc8ff3376e7fa38d5ae +2010-02-13T12:02:11.708906Z +12420 +russellm + + + + + + + + + + + + + + + + + + + + + +120 + +password_reset_form.html +file + + + + +2011-02-08T11:05:45.677065Z +c940547712a34ed88f1ce2fbbd0defee +2010-02-13T12:02:11.708906Z +12420 +russellm + + + + + + + + + + + + + + + + + + + + + +10 + +logged_out.html +file + + + + +2011-02-08T11:05:45.677065Z +213c9cdec05da9c0102d625e71d52769 +2010-10-08T13:50:54.908742Z +14003 +russellm + + + + + + + + + + + + + + + + + + + + + +10 + +login.html +file + + + + +2011-02-08T11:05:45.677065Z +e56718e1b6e87fb618d296bb52cd15ee +2008-08-23T18:20:49.470504Z +8497 +mtredinnick + + + + + + + + + + + + + + + + + + + + + +16 + +password_reset_done.html +file + + + + +2011-02-08T11:05:45.677065Z +6e96998ce833f63031ef6f66a7693586 +2010-02-13T12:02:11.708906Z +12420 +russellm + + + + + + + + + + + + + + + + + + + + + +11 + +password_change_form.html +file + + + + +2011-02-08T11:05:45.677065Z +c940547712a34ed88f1ce2fbbd0defee +2010-10-08T13:50:54.908742Z +14003 +russellm + + + + + + + + + + + + + + + + + + + + + +10 + +password_reset_email.html +file + + + + +2011-02-08T11:05:45.677065Z +3c3a5c49b9d1b6802ca1dfe360a06a64 +2010-02-13T12:02:11.708906Z +12420 +russellm + + + + + + + + + + + + + + + + + + + + + +58 + diff --git a/edgware/templates/registration/.svn/text-base/logged_out.html.svn-base b/edgware/templates/registration/.svn/text-base/logged_out.html.svn-base new file mode 100644 index 0000000..d690653 --- /dev/null +++ b/edgware/templates/registration/.svn/text-base/logged_out.html.svn-base @@ -0,0 +1 @@ +Logged out \ No newline at end of file diff --git a/edgware/templates/registration/.svn/text-base/login.html.svn-base b/edgware/templates/registration/.svn/text-base/login.html.svn-base new file mode 100644 index 0000000..027da71 --- /dev/null +++ b/edgware/templates/registration/.svn/text-base/login.html.svn-base @@ -0,0 +1 @@ +{{ form.as_ul }} \ No newline at end of file diff --git a/edgware/templates/registration/.svn/text-base/password_change_form.html.svn-base b/edgware/templates/registration/.svn/text-base/password_change_form.html.svn-base new file mode 100644 index 0000000..d960111 --- /dev/null +++ b/edgware/templates/registration/.svn/text-base/password_change_form.html.svn-base @@ -0,0 +1 @@ +{{ form }} \ No newline at end of file diff --git a/edgware/templates/registration/.svn/text-base/password_reset_complete.html.svn-base b/edgware/templates/registration/.svn/text-base/password_reset_complete.html.svn-base new file mode 100644 index 0000000..3dd79d8 --- /dev/null +++ b/edgware/templates/registration/.svn/text-base/password_reset_complete.html.svn-base @@ -0,0 +1 @@ +Password reset successfully \ No newline at end of file diff --git a/edgware/templates/registration/.svn/text-base/password_reset_confirm.html.svn-base b/edgware/templates/registration/.svn/text-base/password_reset_confirm.html.svn-base new file mode 100644 index 0000000..8f06c57 --- /dev/null +++ b/edgware/templates/registration/.svn/text-base/password_reset_confirm.html.svn-base @@ -0,0 +1,5 @@ +{% if validlink %} +Please enter your new password: {{ form }} +{% else %} +The password reset link was invalid +{% endif %} \ No newline at end of file diff --git a/edgware/templates/registration/.svn/text-base/password_reset_done.html.svn-base b/edgware/templates/registration/.svn/text-base/password_reset_done.html.svn-base new file mode 100644 index 0000000..d56b10f --- /dev/null +++ b/edgware/templates/registration/.svn/text-base/password_reset_done.html.svn-base @@ -0,0 +1 @@ +E-mail sent \ No newline at end of file diff --git a/edgware/templates/registration/.svn/text-base/password_reset_email.html.svn-base b/edgware/templates/registration/.svn/text-base/password_reset_email.html.svn-base new file mode 100644 index 0000000..1b9a482 --- /dev/null +++ b/edgware/templates/registration/.svn/text-base/password_reset_email.html.svn-base @@ -0,0 +1 @@ +{{ protocol }}://{{ domain }}/reset/{{ uid }}-{{ token }}/ \ No newline at end of file diff --git a/edgware/templates/registration/.svn/text-base/password_reset_form.html.svn-base b/edgware/templates/registration/.svn/text-base/password_reset_form.html.svn-base new file mode 100644 index 0000000..d960111 --- /dev/null +++ b/edgware/templates/registration/.svn/text-base/password_reset_form.html.svn-base @@ -0,0 +1 @@ +{{ form }} \ No newline at end of file diff --git a/edgware/templates/registration/logged_out.html b/edgware/templates/registration/logged_out.html new file mode 100644 index 0000000..d690653 --- /dev/null +++ b/edgware/templates/registration/logged_out.html @@ -0,0 +1 @@ +Logged out \ No newline at end of file diff --git a/edgware/templates/registration/login.html b/edgware/templates/registration/login.html index f99e9a2..bee0232 100644 --- a/edgware/templates/registration/login.html +++ b/edgware/templates/registration/login.html @@ -1,26 +1,4 @@ -{% extends "base.html" %} - -{% block content %} - -{% if form.errors %} -

Your username and password didn't match. Please try again.

-{% endif %} - -
{% csrf_token %} - - - - - - - - - -
{{ form.username.label_tag }}{{ form.username }}
{{ form.password.label_tag }}{{ form.password }}
- - - + +{{ form.as_ul }}
+
- -{% endblock %} - diff --git a/edgware/templates/registration/password_change_form.html b/edgware/templates/registration/password_change_form.html new file mode 100644 index 0000000..d960111 --- /dev/null +++ b/edgware/templates/registration/password_change_form.html @@ -0,0 +1 @@ +{{ form }} \ No newline at end of file diff --git a/edgware/templates/registration/password_reset_complete.html b/edgware/templates/registration/password_reset_complete.html new file mode 100644 index 0000000..3dd79d8 --- /dev/null +++ b/edgware/templates/registration/password_reset_complete.html @@ -0,0 +1 @@ +Password reset successfully \ No newline at end of file diff --git a/edgware/templates/registration/password_reset_confirm.html b/edgware/templates/registration/password_reset_confirm.html new file mode 100644 index 0000000..8f06c57 --- /dev/null +++ b/edgware/templates/registration/password_reset_confirm.html @@ -0,0 +1,5 @@ +{% if validlink %} +Please enter your new password: {{ form }} +{% else %} +The password reset link was invalid +{% endif %} \ No newline at end of file diff --git a/edgware/templates/registration/password_reset_done.html b/edgware/templates/registration/password_reset_done.html new file mode 100644 index 0000000..d56b10f --- /dev/null +++ b/edgware/templates/registration/password_reset_done.html @@ -0,0 +1 @@ +E-mail sent \ No newline at end of file diff --git a/edgware/templates/registration/password_reset_email.html b/edgware/templates/registration/password_reset_email.html new file mode 100644 index 0000000..1b9a482 --- /dev/null +++ b/edgware/templates/registration/password_reset_email.html @@ -0,0 +1 @@ +{{ protocol }}://{{ domain }}/reset/{{ uid }}-{{ token }}/ \ No newline at end of file diff --git a/edgware/templates/registration/password_reset_form.html b/edgware/templates/registration/password_reset_form.html new file mode 100644 index 0000000..d960111 --- /dev/null +++ b/edgware/templates/registration/password_reset_form.html @@ -0,0 +1 @@ +{{ form }} \ No newline at end of file diff --git a/edgware/urls.py b/edgware/urls.py index 55c5148..60ac7f3 100644 --- a/edgware/urls.py +++ b/edgware/urls.py @@ -10,7 +10,8 @@ admin.autodiscover() urlpatterns = patterns('', # Example: # (r'^edge/', include('edge.foo.urls')), - (r'^sandbox$', 'main.views.home'), + (r'^sandbox/$', 'main.views.home'), + (r'^sandbox/home$', 'main.views.home'), (r'^sandbox/contact$', 'main.views.contact'), (r'^sandbox/archive$', 'main.views.archive'), (r'^sandbox/publish$', 'main.views.publish'),