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

1 files changed, 28 insertions, 8 deletions

diff --git a/templates/content/jquery-openid/openid.css b/templates/content/jquery-openid/openid.css
index 2ec8adf4..88960b56 100644
--- a/templates/content/jquery-openid/openid.css
+++ b/templates/content/jquery-openid/openid.css
@@ -1,28 +1,35 @@
-fieldset {border-style:none;}
+fieldset { border-style:none; }
 img {border-style:none;}
 
-.logo_box {display:inline-block;width:90px;height:40px;background:white;border:1px solid #dddddd;}
+.logo_box {display:inline-block;float:left;width:90px;height:40px;background:white;border:1px solid #dddddd;}
 .openid_box img {margin-top:6px;}
 .aol_box img {margin-top:6px;}
 .yahoo_box img {margin-top:13px;}
 .google_box img {margin-top:6px;}
-.local_login_box img {margin-top:9px;}
+.local_login_box img {margin-top:2px;margin-left:-3px;}
 
 form.openid ul{ margin:0;padding:0;text-align:center; list-style-type:none; display:block;}
-form.openid ul li {float:left; padding:4px;} 
+form.openid ul li {float:left; padding:4px;display:inline-block;} 
+form.openid ul li div {display:inline-block;} 
 form.openid ul li span {padding:0 1em 0 3px}
 form.openid ul li.first_tiny_li {clear:left;}
 form.openid fieldset {clear:both;padding:10px 0px 0px 0px;}
 form.openid div+fieldset {display:none}
-form.openid label {display:block; font-weight:bold; margin-bottom:.5em}
+form.openid label {display:block; font-weight:bold;}
 input[name=openid_username] {width:8em}
 input[name=openid_identifier] {width:18em}
 form.openid ul li.highlight { -moz-border-radius:4px; -webkit-border-radius:4px; background-color: #FD6}
-form.openid fieldset div {-moz-border-radius:4px; -webkit-border-radius:4px; 
-                          background: #DCDCDC;
-						  padding:10px;display:inline-block}
+form.openid fieldset div {
+    -moz-border-radius:4px; 
+    -webkit-border-radius:4px; 
+    background: #DCDCDC;
+    padding:10px;
+    display:inline-block;
+    float:left;
+}
 form.openid p {margin-bottom:4px;}
 form.openid fieldset div p {padding:0px;margin:0px;}
+form.openid fieldset div p.login {padding:0px;margin:0 0 10px 0;}
 form.openid label {
     display:inline-block;
     font-weight:normal;
@@ -47,3 +54,16 @@ background: url(images/openidico.png) no-repeat;
 
 #openid_login {float:left; width:30%; margin:2em 1em; text-align:center}
 #openid_login div{margin-top:0.5em}
+
+form.openid ul.errorlist {
+    border: none;
+    list-style-position:inside;
+    list-style-type: disc;
+    margin-bottom:5px;
+}
+form.openid ul.errorlist li {
+    text-align: left;
+    margin: 5px;
+    float: none;
+    color:blue;
+}