diff options
| author | Dusty Phillips <dusty@gerolde.archlinux.org> | 2009-08-12 23:33:23 +0200 |
|---|---|---|
| committer | Dusty Phillips <dusty@gerolde.archlinux.org> | 2009-08-12 23:33:23 +0200 |
| commit | 6bcf9709f20db8b8e3e40c16b20448f3899f3624 (patch) | |
| tree | ffc8ef24c6e6d21f0e79c4c3e172ddb490939f76 | |
| parent | a085da1c22f7cc8ea245ec2fc018cd5eaadc3032 (diff) | |
| download | archweb-6bcf9709f20db8b8e3e40c16b20448f3899f3624.tar.gz archweb-6bcf9709f20db8b8e3e40c16b20448f3899f3624.tar.xz | |
merge fix
| -rw-r--r-- | devel/views.py | 6 | ||||
| -rw-r--r-- | templates/admin/index.html | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/devel/views.py b/devel/views.py index 4c34d9f..f9aacec 100644 --- a/devel/views.py +++ b/devel/views.py @@ -8,8 +8,8 @@ from archweb_dev.main.models import Package, Todolist from archweb_dev.main.models import Arch, Repo from archweb_dev.main.models import UserProfile, News import random -from string import letters, digits -pwletters = letters + digits +from string import ascii_letters, digits +pwletters = ascii_letters + digits def index(request): @@ -94,7 +94,7 @@ class NewUserForm(forms.ModelForm): profile.save() send_mail("Your new archweb account", - """You can now log into: + """You can now log into: https://dev.archlinux.org/ with these login details: Username: %s diff --git a/templates/admin/index.html b/templates/admin/index.html index af4d0b7..6f7f98e 100644 --- a/templates/admin/index.html +++ b/templates/admin/index.html @@ -10,7 +10,6 @@ {% block breadcrumbs %}{% endblock %} {% block content %} -pppppppp <div id="content-main"> <div class="module"> <table> |