diff options
| author | Bruno Sarlo <bruno@bruno-laptop.(none)> | 2009-08-11 02:07:20 -0300 |
|---|---|---|
| committer | Bruno Sarlo <bruno@bruno-laptop.(none)> | 2009-08-11 02:07:20 -0300 |
| commit | f98fd296e8adddd61bd76a5cf025b5278c74780e (patch) | |
| tree | b8d7deb8f9e245f8b5f8330860f867803a0e74dd /templates/user_preferences.html | |
| parent | 5deaa09e3afce6fc295eed868bea72a30418da08 (diff) | |
| parent | 22237890caf3c65f6ecc696a619299cba91ff90c (diff) | |
| download | askbot-f98fd296e8adddd61bd76a5cf025b5278c74780e.tar.gz askbot-f98fd296e8adddd61bd76a5cf025b5278c74780e.tar.bz2 askbot-f98fd296e8adddd61bd76a5cf025b5278c74780e.zip | |
Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG
Conflicts:
forum/views.py
locale/es/LC_MESSAGES/django.mo
settings_local.py
templates/answer_edit_tips.html
templates/book.html
templates/header.html
templates/index.html
templates/question_edit_tips.html
templates/user_stats.html
templates/user_tabs.html
templates/users_questions.html
Diffstat (limited to 'templates/user_preferences.html')
| -rw-r--r-- | templates/user_preferences.html | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/templates/user_preferences.html b/templates/user_preferences.html index eb7c4761..00129c28 100644 --- a/templates/user_preferences.html +++ b/templates/user_preferences.html @@ -8,13 +8,14 @@ <div style="padding:5px;"> <fieldset> <legend><b>{% trans "Connect with Twitter" %}</b></legend> - <form> + <!-- todo: form action needs to be fixed --> + <form name="twittersync" action="/sdfgsdlgjkhsdfljh"> <label for="name">{% trans "Twitter account name:" %}</label> - <input id="name" /><br> + <input id="name" /><br/> <label for="password">{% trans "Twitter password:" %}</label> - <input id="password" type="password"/><br> - <input id="cbMessage" type="checkbox" />{% trans "Send my Questions to Twitter" %}<br> - <input id="cbReply" type="checkbox" />{% trans "Send my Answers to Twitter" %}<br> + <input id="password" type="password"/><br/> + <input id="cbMessage" type="checkbox" />{% trans "Send my Questions to Twitter" %}<br/> + <input id="cbReply" type="checkbox" />{% trans "Send my Answers to Twitter" %}<br/> <input type="submit" value="{% trans "Save" %}" /> </form> </fieldset> |