Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG

 * Merge of Spanish translation, still missing some texts.
 * Custom colors for preguntalo project

Conflicts:
	locale/es/LC_MESSAGES/django.mo
	locale/es/LC_MESSAGES/django.po
	templates/content/style/style.css

1 files changed, 31 insertions, 33 deletions

diff --git a/templates/user.html b/templates/user.html
index 53a30dc0..efca80e6 100644
--- a/templates/user.html
+++ b/templates/user.html
@@ -1,35 +1,33 @@
+{% extends "base_content.html" %}
 <!-- user.html -->
-{% extends "base_content.html" %}

-{% load extra_tags %}

-{% load humanize %}

-{% block title %}{% spaceless %}{{ page_title }}{% endspaceless %}{% endblock %}

-{% block forestyle%}

-    <style type="text/css">

- 		.history-table td { padding: 5px; }

- 		.user-stats-table { margin-left:50px; }

-	</style>

-{% endblock %}

-{% block forejs %}

-        <script type="text/javascript">

-            $().ready(function(){

-                {% ifequal view_user request.user%}

-                    $("#nav_profile").attr('className',"on");

-                {% else %}

-                    $("#nav_users").attr('className',"on");

-               

-                {% endifequal %}

-            });     

-        </script>

-        {% block userjs %}

-        {% endblock %}

-{% endblock %}

-

-{% block content %}

-    <div id="mainbar-full">

-        {% include "user_info.html" %}

-        {% include "user_tabs.html" %}

-        {% block usercontent %}

-        {% endblock %}

-        {% include "user_footer.html" %}

-	</div>

+{% load extra_tags %}
+{% load humanize %}
+{% block title %}{% spaceless %}{{ page_title }}{% endspaceless %}{% endblock %}
+{% block forestyle%}
+    <style type="text/css">
+ 		.history-table td { padding: 5px; }
+ 		.user-stats-table { margin-left:50px; }
+	</style>
+{% endblock %}
+{% block forejs %}
+        <script type="text/javascript">
+            $().ready(function(){
+                {% ifequal view_user request.user%}
+                    $("#nav_profile").attr('className',"on");
+                {% else %}
+                    $("#nav_users").attr('className',"on");
+                {% endifequal %}
+            }); 
+        </script>
+        {% block userjs %}
+        {% endblock %}
+{% endblock %}
+{% block content %}
+    <div id="mainbar-full">
+        {% include "user_info.html" %}
+        {% include "user_tabs.html" %}
+        {% block usercontent %}
+        {% endblock %}
+        {% include "user_footer.html" %}
+	</div>
 {% endblock %}<!-- end user.html -->