diff options
| author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2010-02-09 14:12:05 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2010-02-09 14:12:05 -0600 |
| commit | 8de2b9131ddcef647799cf8e1e79921284523073 (patch) | |
| tree | 81e17d84530990e35a0accba3a7886266a601482 /templates/user_preferences.html | |
| parent | 7e95e6481d1e81e43d4b442cbcf3fe37f20d89cc (diff) | |
| parent | 9d1fb9890b97beb55461ca34f9757bc685461130 (diff) | |
| download | askbot-8de2b9131ddcef647799cf8e1e79921284523073.tar.gz askbot-8de2b9131ddcef647799cf8e1e79921284523073.tar.bz2 askbot-8de2b9131ddcef647799cf8e1e79921284523073.zip | |
Merge branch 'evgenyfadeev/master'
Conflicts:
.gitignore
INSTALL
TODO
cnprog.wsgi
django_authopenid/urls.py
django_authopenid/views.py
drop-all-tables.sh
forum/auth.py
forum/managers.py
forum/models.py
forum/templatetags/extra_tags.py
forum/views.py
locale/es/LC_MESSAGES/django.mo
locale/es/LC_MESSAGES/django.po
settings.py
settings_local.py.dist
sql_scripts/update_2009_01_25_001.sql
sql_scripts/update_2009_02_26_001.sql
sql_scripts/update_2009_04_10_001.sql
templates/authopenid/confirm_email.txt
templates/authopenid/sendpw_email.txt
templates/content/js/compress.bat
templates/content/js/flot-build.bat
templates/content/style/style.css
templates/footer.html
templates/question.html
templates/user_reputation.html
templates/user_stats.html
templates/user_votes.html
templates/users_questions.html
urls.py
Diffstat (limited to 'templates/user_preferences.html')
| -rw-r--r-- | templates/user_preferences.html | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/templates/user_preferences.html b/templates/user_preferences.html deleted file mode 100644 index 00129c28..00000000 --- a/templates/user_preferences.html +++ /dev/null @@ -1,24 +0,0 @@ -{% extends "user.html" %} -<!-- user_preferences.html --> -{% load i18n %} -{% load extra_tags %} -{% load humanize %} - -{% block usercontent %} - <div style="padding:5px;"> - <fieldset> - <legend><b>{% trans "Connect with Twitter" %}</b></legend> - <!-- todo: form action needs to be fixed --> - <form name="twittersync" action="/sdfgsdlgjkhsdfljh"> - <label for="name">{% trans "Twitter account name:" %}</label> - <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 type="submit" value="{% trans "Save" %}" /> - </form> - </fieldset> - </div> -{% endblock %} -<!-- end user_preferences.html --> |