summaryrefslogtreecommitdiffstats
path: root/templates/user_edit.html
diff options
context:
space:
mode:
authorAdolfo Fitoria <fitoria@fitoria-laptop.(none)>2009-12-15 16:57:37 -0600
committerAdolfo Fitoria <fitoria@fitoria-laptop.(none)>2009-12-15 16:57:37 -0600
commit9d1fb9890b97beb55461ca34f9757bc685461130 (patch)
tree1f8f0552ba6f4ca092aaa5a5347f0ad07433f1de /templates/user_edit.html
parentebb0f636ae8f7db4e7a2e7470e449af3d96b15c0 (diff)
parent82d35490db90878f013523c4d1a5ec3af2df8b23 (diff)
downloadaskbot-9d1fb9890b97beb55461ca34f9757bc685461130.tar.gz
askbot-9d1fb9890b97beb55461ca34f9757bc685461130.tar.bz2
askbot-9d1fb9890b97beb55461ca34f9757bc685461130.zip
Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG into evgenyfadeev/master
Conflicts: INSTALL LICENSE TODO cnprog.wsgi context.py development.log forum/feed.py forum/forms.py forum/management/commands/send_email_alerts.py forum/managers.py forum/models.py forum/templatetags/extra_filters.py forum/templatetags/extra_tags.py forum/urls.py forum/views.py locale/en/LC_MESSAGES/django.mo locale/en/LC_MESSAGES/django.po middleware/__init__.py middleware/anon_user.py settings.py settings_local.py.dist templates/about.html templates/authopenid/complete.html templates/authopenid/external_legacy_login_info.html templates/base.html templates/base_content.html templates/content/js/com.cnprog.admin.js templates/content/js/com.cnprog.i18n.js templates/content/js/com.cnprog.post.js templates/content/js/com.cnprog.utils.js templates/content/js/wmd/wmd.js templates/content/style/style.css templates/question.html templates/questions.html templates/unanswered.html templates/user_email_subscriptions.html templates/user_reputation.html templates/user_stats.html templates/user_votes.html
Diffstat (limited to 'templates/user_edit.html')
-rw-r--r--templates/user_edit.html4
1 files changed, 4 insertions, 0 deletions
diff --git a/templates/user_edit.html b/templates/user_edit.html
index 051d6537..5886c071 100644
--- a/templates/user_edit.html
+++ b/templates/user_edit.html
@@ -39,6 +39,10 @@
<th width="100px"></th>
<th></th>
</tr>
+ <tr style="height:35px">
+ <td>{{ form.username.label_tag }}:</td>
+ <td>{{ form.username }} <span class="form-error"></span> {{ form.username.errors }} </td>
+ </tr>
<tr style="height:35px">
<td>{{ form.email.label_tag }}:</td>