From faf167aed99ac4e28927f729b7c7bc94a47ef139 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Sun, 26 Jul 2009 22:33:56 -0400
Subject: merged in latest Mikes changes

---
 templates/user_preferences.html | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'templates/user_preferences.html')

diff --git a/templates/user_preferences.html b/templates/user_preferences.html
index 246a834e..3a760a25 100644
--- a/templates/user_preferences.html
+++ b/templates/user_preferences.html
@@ -1,11 +1,20 @@
-<!-- user_preferences.html -->
 {% extends "user.html" %}
 {% load extra_tags %}
 {% load humanize %}
 
 {% block usercontent %}
         <div style="padding:5px;">
-            <h1>Surprise will be here soon ;-)</h1>
+        <fieldset>
+            <legend><b>同步Twitter消息</b></legend>
+            <form>
+                <label for="name">账号:</label>
+                <input id="name" /><br>
+                <label for="password">密码:</label>
+                <input id="password" type="password"/><br>
+                <input id="cbMessage" type="checkbox" />发布我的提问到我的Twitter<br>
+                <input id="cbReply" type="checkbox" />发布我的回答到我的Twitter<br>
+                <input type="submit" value="保存" />
+            </form>
+        </fieldset>
         </div>
 {% endblock %}
-<!-- end user_preferences.html -->
-- 
cgit v1.2.3-1-g7c22