From 0023fa0472301789e485d8b68fca12b0edba9d4e Mon Sep 17 00:00:00 2001
From: David Convent <davconvent@bruxxel.org>
Date: Mon, 28 Jan 2013 14:38:19 +0100
Subject: [PATCH] Fixed keyword view layout

---
 .../dms/thesaurus/browser/dmskeyword_view.pt  | 97 ++++++++++---------
 .../browser/thesaurus_navigation.css          | 22 ++++-
 2 files changed, 66 insertions(+), 53 deletions(-)

diff --git a/src/collective/dms/thesaurus/browser/dmskeyword_view.pt b/src/collective/dms/thesaurus/browser/dmskeyword_view.pt
index c589713..938125e 100644
--- a/src/collective/dms/thesaurus/browser/dmskeyword_view.pt
+++ b/src/collective/dms/thesaurus/browser/dmskeyword_view.pt
@@ -10,60 +10,61 @@
 <metal:main fill-slot="main">
 
     <div id="dmskeywords-navigation">
-      <div id="dmskeywords-navigation-broader">
-        <tal:parents define="widget python:view.widgets.get('broader')">
-            <div class="field" tal:condition="python:widget.__name__ not in ('IBasic.title', 'IBasic.description', 'title', 'description',)">
-                <label tal:content="widget/label" />
-                <br />
-                <div tal:content="structure widget/render" />
-            </div>
-        </tal:parents>
-      </div>
 
-      <div id="dmskeywords-navigation-focus">
+      <tal:broader define="widget python:view.widgets.get('broader')">
+          <div id="dmskeywords-navigation-broader"
+              class="field"
+              tal:condition="python:widget.__name__ not in ('IBasic.title', 'IBasic.description', 'title', 'description',)">
+              <label tal:content="widget/label" />
+              <br />
+              <div tal:content="structure widget/render" />
+          </div>
+      </tal:broader>
 
-        <div >
-          <tal:parents define="widget python:view.widgets.get('related')">
-              <div id="dmskeywords-navigation-related"
-                   class="field"
-                   tal:condition="python:widget.__name__ not in ('IBasic.title', 'IBasic.description', 'title', 'description',)">
-                  <label tal:content="widget/label" />
-                  <br />
-                  <div tal:content="structure widget/render" />
-              </div>
-          </tal:parents>
-        </div>
+      <div id="dmskeywords-navigation-middle">
 
-        <h1 class="documentFirstHeading" tal:content="context/Title" /> 
-        <!-- p class="documentDescription" tal:content="context/Description" /-->
-        <div tal:replace="structure provider:plone.belowcontenttitle" />
-
-        <tal:equivs define="widget python:view.widgets.get('equivs')">
-            <div class="field" tal:condition="python:widget.__name__ not in ('IBasic.title', 'IBasic.description', 'title', 'description',)">
-                <label tal:content="widget/label" />
-                <br />
-                <div tal:content="structure widget/render" />
-            </div>
-        </tal:equivs>
-
-      </div>
-
-      <div id="dmskeywords-navigation-children">
-        <div class="field">
-            <label tal:content="string:NT (Narrower Terms)" />
+        <tal:related define="widget python:view.widgets.get('related')">
+          <div id="dmskeywords-navigation-related"
+               class="field"
+               tal:condition="python:widget.__name__ not in ('IBasic.title', 'IBasic.description', 'title', 'description',)">
+            <label tal:content="widget/label" />
             <br />
-            <ul id="" class=""
-                  tal:attributes="id string:form-widgets-children;
-                                  class string:contenttree-widget narrowerthesauruskeywords-field;
-                                  "><li tal:repeat="value view/children"
-                ><a class="selected-option"
-                    href="#"
-                    tal:content="value/label"
-                    tal:attributes="href value/url"
-                /></li
-            ></ul>
+            <div tal:content="structure widget/render" />
+          </div>
+        </tal:related>
+
+        <div id="dmskeywords-navigation-focus">
+          <h1 class="documentFirstHeading" tal:content="context/Title" /> 
+          <!-- p class="documentDescription" tal:content="context/Description" /-->
+          <div tal:replace="structure provider:plone.belowcontenttitle" />
+
+          <tal:equivs define="widget python:view.widgets.get('equivs')">
+            <div class="field"
+                 tal:condition="python:widget.__name__ not in ('IBasic.title', 'IBasic.description', 'title', 'description',)">
+              <label tal:content="widget/label" />
+              <br />
+              <div tal:content="structure widget/render" />
+            </div>
+          </tal:equivs>
         </div>
+
       </div>
+
+      <div class="field" id="dmskeywords-navigation-narrower">
+          <label tal:content="string:NT (Narrower Terms)" />
+          <br />
+          <ul id="" class=""
+                tal:attributes="id string:form-widgets-children;
+                                class string:contenttree-widget narrowerthesauruskeywords-field;
+                                "><li tal:repeat="value view/children"
+              ><a class="selected-option"
+                  href="#"
+                  tal:content="value/label"
+                  tal:attributes="href value/url"
+              /></li
+          ></ul>
+      </div>
+
     </div>
 
 </metal:main>
diff --git a/src/collective/dms/thesaurus/browser/thesaurus_navigation.css b/src/collective/dms/thesaurus/browser/thesaurus_navigation.css
index 3ee2205..9dda1dc 100644
--- a/src/collective/dms/thesaurus/browser/thesaurus_navigation.css
+++ b/src/collective/dms/thesaurus/browser/thesaurus_navigation.css
@@ -2,16 +2,28 @@
   margin-top: 1em;
 }
 
-#dmskeywords-navigation-focus {
-  border-top: 1px solid black;
+#dmskeywords-navigation-broader {
   border-bottom: 1px solid black;
 }
 
-#dmskeywords-navigation-related {
-  padding: 0, 1em, 0, 1em;
-  float: right;
+#dmskeywords-navigation-narrower {
+  border-top: 1px solid black;
 }
 
+#dmskeywords-navigation-focus {
+  padding: 0, 1em, 0, 1em;
+  display: inline;
+}
+
+#dmskeywords-navigation-related {
+  float: right;
+  display: inline;
+}
+
+
+
+
+
 #dmskeywords-navigation-left {
   float: left;
   padding-right: 1em;