From c4da893b2e28dbd2a04f8c6f61c52936119b1148 Mon Sep 17 00:00:00 2001
From: Evgeny Fadeev <evgeny.fadeev@gmail.com>
Date: Sun, 24 Jan 2010 15:13:41 -0500
Subject: fixed small error in html and style of signin view

---
 fbconnect/fb.py                            |  4 ++--
 templates/authopenid/signin.html           | 20 ++++++++++----------
 templates/base.html                        |  2 +-
 templates/content/jquery-openid/openid.css |  6 ++++++
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/fbconnect/fb.py b/fbconnect/fb.py
index a1c3e424..370e160b 100755
--- a/fbconnect/fb.py
+++ b/fbconnect/fb.py
@@ -9,7 +9,7 @@ except:
     from pjson import fread as load_json
 
 from models import FBAssociation
-import md5
+import hashlib 
 import logging
 
 REST_SERVER = 'http://api.facebook.com/restserver.php'
@@ -21,7 +21,7 @@ def generate_sig(values):
         keys.append(key)
         
     signature = ''.join(['%s=%s' % (key,  values[key]) for key in keys]) + settings.FB_SECRET
-    return md5.new(signature).hexdigest()
+    return hashlib.md5(signature).hexdigest()
 
 def check_cookies_signature(cookies):
     API_KEY = settings.FB_API_KEY
diff --git a/templates/authopenid/signin.html b/templates/authopenid/signin.html
index 3d20d408..51b8aa7f 100755
--- a/templates/authopenid/signin.html
+++ b/templates/authopenid/signin.html
@@ -63,7 +63,15 @@
 					<img src="{% href "/content/jquery-openid/images/aol.gif" %}" alt="icon" /><span>http://openid.aol.com/<strong>username</strong></span>
 				</div>
 			  </li>
-              <li title="Facebook Connect">
+              </ul>            
+			  <ul id="openid_small_providers" class="providers"> 
+			  <!--<li class="openid" title="OpenID">
+				  <div class="logo_box openid_box">
+						<img src="/content/jquery-openid/images/openid.gif" alt="icon" /> 
+				  </div>
+			  <span><strong>http://{your-openid-url}</strong></span>
+			  </li>-->
+              <li class="direct first_tiny_li facebook" title="Facebook Connect">
                     {% if question %}
                         <fb:login-button onlogin="window.location = '{% url fb_signin_new_question %}'"></fb:login-button>
                     {% else %}
@@ -74,15 +82,7 @@
                         {% endif %}
                     {% endif %}                    
               </li>
-              </ul>            
-			  <ul class="providers"> 
-			  <!--<li class="openid" title="OpenID">
-				  <div class="logo_box openid_box">
-						<img src="/content/jquery-openid/images/openid.gif" alt="icon" /> 
-				  </div>
-			  <span><strong>http://{your-openid-url}</strong></span>
-			  </li>-->
-			  <li class="openid first_tiny_li" title="OpenID URL"> 
+			  <li class="openid" title="OpenID URL"> 
 					<img src="{% href "/content/jquery-openid/images/openidico16.png" %}" alt="icon" />
 					<span>http://{your-openid-url}</span>
 		      </li> 
diff --git a/templates/base.html b/templates/base.html
index b28f919e..a33512cc 100755
--- a/templates/base.html
+++ b/templates/base.html
@@ -61,7 +61,7 @@
             {% autoescape off %}
                 {% if user_messages %}
                     {% for message in user_messages %}
-                          <p class="darkred">{{ message }}<p>
+                          <p class="darkred">{{ message }}</p>
                     {% endfor %}
                 {% endif %}
             {% endautoescape %}
diff --git a/templates/content/jquery-openid/openid.css b/templates/content/jquery-openid/openid.css
index 88960b56..1b7aaf82 100644
--- a/templates/content/jquery-openid/openid.css
+++ b/templates/content/jquery-openid/openid.css
@@ -67,3 +67,9 @@ form.openid ul.errorlist li {
     float: none;
     color:blue;
 }
+#openid_small_providers li {
+    margin-top:4px;
+}
+#openid_small_providers li.facebook {
+    margin-top:0px;
+}
-- 
cgit v1.2.3-1-g7c22