From d4f4d965e1f4c3b4b7ecd89bf0b4ee653a80245b Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Mon, 29 Apr 2013 08:39:14 +0200
Subject: [PATCH] improve questionnaire layout

---
 browser/skin/lobo/lobo.css      | 8 ++++++++
 knowledge/survey/browser.py     | 2 +-
 knowledge/survey/view_macros.pt | 9 +++++----
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/browser/skin/lobo/lobo.css b/browser/skin/lobo/lobo.css
index ec06252..3e15e5c 100644
--- a/browser/skin/lobo/lobo.css
+++ b/browser/skin/lobo/lobo.css
@@ -120,6 +120,10 @@ thead th {
     margin-bottom: 0.3em;
 }
 
+.infotext {
+    font-size: 90%;
+}
+
 .fields td {
     vertical-align: top;
 }
@@ -163,6 +167,10 @@ table.listing td {
     border-bottom: 1px dotted #dddddd;
 }
 
+table.listing tr.vpad td {
+    padding: 7px 2px 7px 2px;
+}
+
 fieldset.box table.listing td {
     padding: 0 1px 0 1px;
 }
diff --git a/knowledge/survey/browser.py b/knowledge/survey/browser.py
index 99eac6d..d9075d6 100644
--- a/knowledge/survey/browser.py
+++ b/knowledge/survey/browser.py
@@ -112,7 +112,7 @@ class SurveyView(ConceptView):
                                mapping=dict(minAnswers=qugroup.minAnswers)),
                              target_language=lang)
         if info:
-            text = u'%s<br />(%s)' % (text, info)
+            text = u'<i>%s</i><br />(%s)' % (text, info)
         return text
 
     def getValues(self, question):
diff --git a/knowledge/survey/view_macros.pt b/knowledge/survey/view_macros.pt
index 51c2c6a..bdb6ded 100644
--- a/knowledge/survey/view_macros.pt
+++ b/knowledge/survey/view_macros.pt
@@ -47,12 +47,12 @@
       <table class="listing">
         <tal:qugroup repeat="qugroup item/adapted/questionGroups">
           <tr><td colspan="6">&nbsp;</td></tr>
-          <tr>
+          <tr class="vpad">
             <td tal:define="infoText python:item.getInfoText(qugroup)">
               <b tal:content="qugroup/title" />
-              <div tal:condition="infoText">
+              <div class="infotext"
+                   tal:condition="infoText">
                 <span tal:content="structure infoText" />
-                <br />&nbsp;
               </div>
             </td>
             <td style="text-align: center"
@@ -63,7 +63,8 @@
                 style="text-align: right"
                 i18n:translate="">Does not apply</td>
           </tr>
-          <tr tal:repeat="question qugroup/questions">
+          <tr class="vpad"
+              tal:repeat="question qugroup/questions">
             <td tal:content="question/text" />
             <td style="white-space: nowrap; text-align: center"
                 tal:repeat="value python:item.getValues(question)">