From 3381b35e25df0852345638fb23a43fde655c9ce4 Mon Sep 17 00:00:00 2001
From: fefa4ka <fefa4ka@gmail.com>
Date: Wed, 7 Oct 2015 14:36:16 +0300
Subject: [PATCH] form and theory

---
 .../templates/djangocms_forms/form_template/default.html  | 5 +++--
 zsite/static/less/theory.less                             | 8 ++++++++
 zsite/templates/menu_header.html                          | 2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/djangocms_forms/templates/djangocms_forms/form_template/default.html b/djangocms_forms/templates/djangocms_forms/form_template/default.html
index d609de3..1bb414d 100644
--- a/djangocms_forms/templates/djangocms_forms/form_template/default.html
+++ b/djangocms_forms/templates/djangocms_forms/form_template/default.html
@@ -60,13 +60,14 @@ var form = {
 					<label for="{{ field.id_for_label }}">
 						{{ field.label }}
 					</label>
-					{% if field|is_textarea %}
+					{% if field|is_textarea or field|is_radioselect %}
 						<div id="help-text-{{ field.auto_id }}" class="help-text">{{ field.help_text|safe }}</div>
 					{% endif %}
 					{% if not field|is_checkbox %}
 						<p>{{ field }}</p>
 					{% endif %}
-					{% if not field|is_textarea and field.help_text %}
+
+					{% if not field|is_textarea and not field|is_radioselect %}
 						<div id="help-text-{{ field.auto_id }}" class="help-text">{{ field.help_text|safe }}</div>
 					{% endif %}
 				</div>
diff --git a/zsite/static/less/theory.less b/zsite/static/less/theory.less
index 6113d43..101c777 100644
--- a/zsite/static/less/theory.less
+++ b/zsite/static/less/theory.less
@@ -3,6 +3,8 @@
 
     padding: 5px 15px;
 
+    margin-bottom: 30px;
+
     h5 { 
         padding-left: 22px;
     
@@ -28,4 +30,10 @@
         margin-top: 15px;
         margin-left: 10px;
     }
+}
+
+.menu {
+    .theory {
+        margin-left: -38px;
+    }
 }
\ No newline at end of file
diff --git a/zsite/templates/menu_header.html b/zsite/templates/menu_header.html
index 8e946ac..5fd99cc 100644
--- a/zsite/templates/menu_header.html
+++ b/zsite/templates/menu_header.html
@@ -5,7 +5,7 @@
 <div class="background-line-pattern"></div>
 <ul class="list-unstyled list-inline header-menu header-menu-font {% if current_page.is_home %}main{% endif %}">
 {% for child in children %}
-    <li {% if child.selected %}class="active"{% endif %}>
+    <li {% if child.selected or child.ancestor %}class="active"{% endif %}>
             <a href="{{ child.get_absolute_url }}"><span>{{ child.get_menu_title }}</span></a>
     </li>
     {% if class and forloop.last and not forloop.parentloop %}{% endif %}