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, 14 insertions, 13 deletions

diff --git a/templates/content/style/default.css b/templates/content/style/default.css
index 0221cc03..2bc185ad 100644
--- a/templates/content/style/default.css
+++ b/templates/content/style/default.css
@@ -7,9 +7,9 @@ Style sheet for cnprog.com
 All rights reserved. 2008 CNPROG.COM
 */
 
-@import url(/content/style/jquery.autocomplete.css);
-@import url(/content/style/openid.css);
-@import url(/content/style/prettify.css);
+@import url(content/style/jquery.autocomplete.css);
+@import url(content/style/openid.css);
+@import url(content/style/prettify.css);
 
 html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, form, label, table, caption, tbody, tfoot, thead, tr, th, td
 {
@@ -232,19 +232,19 @@ h4 {display:block;font-size:90%; font-family:Verdana;color:#ccc;}
 }
 
 #main-bar .golden{
-    background:url(/content/images/bg_title_golden.gif) no-repeat;
+    background:url(../../images/bg_title_golden.gif) no-repeat;
 }
 
 #main-bar .pink{
-    background:url(/content/images/bg_title_red.gif) no-repeat;
+    background:url(../../images/bg_title_red.gif) no-repeat;
 }
 
 #main-bar .orange{
-    background:url(/content/images/bg_title_orange.gif) no-repeat;
+    background:url(../../images/bg_title_orange.gif) no-repeat;
 }
 
 #main-bar .green{
-    background:url(/content/images/bg_title_green.gif) no-repeat;
+    background:url(../../images/bg_title_green.gif) no-repeat;
 }
 
 #tab{
@@ -906,7 +906,7 @@ h4 {display:block;font-size:90%; font-family:Verdana;color:#ccc;}
 
 /* 2 textarea resizer styles */
 div.grippie {
-    background:#EEEEEE url(/content/images/grippie.png) no-repeat scroll center 2px;
+    background:#EEEEEE url(../../images/grippie.png) no-repeat scroll center 2px;
     border-color:#DDDDDD;
     border-style:solid;
     border-width:0pt 1px 1px;
@@ -923,14 +923,14 @@ div.grippie {
 }
 
 .openid-input{
-    background:url(/content/images/openid.gif) no-repeat;
+    background:url(../../images/openid.gif) no-repeat;
     padding-left:15px;
     cursor:pointer;
 }
 
 .openid-login-input{
     background-position:center left;
-    background:url(/content/images/openid.gif) no-repeat 0% 50%;
+    background:url(../../images/openid.gif) no-repeat 0% 50%;
     padding:5px 5px 5px 15px;
     cursor:pointer;
     font-family:Trebuchet MS;
@@ -941,7 +941,7 @@ div.grippie {
 
 .openid-login-submit{
     padding:6px;
-    #padding:4px;
+    /*padding:4px;*/
     cursor:pointer;
     font-weight:bold;
     font-size:120%;
@@ -990,7 +990,6 @@ div.grippie {
 
 .item-right{
     float:left;
-
 }
 
 .vote-number{
@@ -1609,7 +1608,9 @@ div.comments {
 }
 
 div.post-comments{
-    width:585px
+    width:585px;
+    clear:both;
+    float:left;
 }
 
 form.post-comments textarea {