Merge remote branch 'origin/master'

[wolnelektury.git] / apps / infopages / templates / infopages / infopage.html

diff --git a/apps/infopages/templates/infopages/infopage.html b/apps/infopages/templates/infopages/infopage.html
index 2d00d5d..db2d49b 100755 (executable)
--- a/apps/infopages/templates/infopages/infopage.html
+++ b/apps/infopages/templates/infopages/infopage.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 {% load chunks %}
 
 {% load i18n %}
 {% load chunks %}
 

-{% block titleextra %}:: {{ page.title }}{% endblock %}
+{% block titleextra %}{{ page.title }}{% endblock %}

 
 {% block metadescription %}{{ left_column|striptags|truncatewords:10 }}{% endblock %}
 
 
 {% block metadescription %}{{ left_column|striptags|truncatewords:10 }}{% endblock %}
 


@@ -10,11 +10,15 @@
     <h1>{{ page.title }}</h1>
 
     {% autoescape off %}
     <h1>{{ page.title }}</h1>
 
     {% autoescape off %}

-    <div class="column-left">
-       {{ left_column }}
+    <div class="left-column">
+        <div class="normal-text">
+            {{ left_column }}
+        </div>

     </div>
     </div>

-    <div class="column-right">
-       {{ right_column }}
+    <div class="right-column">
+        <div class="normal-text">
+            {{ right_column }}
+        </div>

     </div>
     {% endautoescape %}
 {% endblock %}
     </div>
     {% endautoescape %}
 {% endblock %}