From 62dd4e92f7fd1a23548f39dc4570cc34dc33b05a Mon Sep 17 00:00:00 2001
From: martimiz <martine@balbus.nl>
Date: Thu, 8 Nov 2012 16:24:20 +0100
Subject: [PATCH] Relocate breadcrumbs to the top of the document

Remove breadcrumbs from the searchbar to the top of the page content,
and make sure they only display if there is more then the current link.
Wrap the module and version selectors to fill the gap in the searchbar.
---
 code/controllers/DocumentationViewer.php      |  2 +-
 css/DocumentationViewer.css                   |  5 ++-
 templates/DocumentationViewer.ss              | 42 +++++++++----------
 templates/Includes/DocBreadcrumbs.ss          |  4 +-
 templates/Layout/DocumentationViewer.ss       |  3 ++
 .../Layout/DocumentationViewer_folder.ss      |  3 ++
 6 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/code/controllers/DocumentationViewer.php b/code/controllers/DocumentationViewer.php
index c763e7b..b16cfca 100755
--- a/code/controllers/DocumentationViewer.php
+++ b/code/controllers/DocumentationViewer.php
@@ -628,7 +628,7 @@ class DocumentationViewer extends Controller {
 			}
 		}
 		
-		return $output;
+		return ($output->count() > 1)? $output : '';
 	}
 	
 	/**
diff --git a/css/DocumentationViewer.css b/css/DocumentationViewer.css
index 6edfae1..fdcf45e 100644
--- a/css/DocumentationViewer.css
+++ b/css/DocumentationViewer.css
@@ -105,11 +105,14 @@ fieldset { border: none; }
 	}
 		#footer p a { color: #798D85;}
 
+/* module and version selection */
+#top-nav { float: left; }
+
 /* Search */
 #search { float: right; }		
 	#search label { display: none; }
 /* Breadcrumbs */
-#breadcrumbs { float: left; }
+#breadcrumbs { float: none; }
 
 /* Content */
 #layout { }
diff --git a/templates/DocumentationViewer.ss b/templates/DocumentationViewer.ss
index e311fc5..0a7fc90 100755
--- a/templates/DocumentationViewer.ss
+++ b/templates/DocumentationViewer.ss
@@ -19,35 +19,33 @@
 			
 			<div id="layout">
 				<div id="search-bar">					
-					<div id="breadcrumbs">
-						<% include DocBreadcrumbs %>
-					</div>
 
 					<div id="search">
 						$DocumentationSearchForm
 					</div>
-
+					<div id="top-nav">
 					<% if Entities %>
-					<div id="entities-nav" class="documentation-nav">
-						<h2>Modules:</h2>
-							<ul>
-							<% control Entities %>
-								<li><a href="$Link" class="$LinkingMode">$Title</a></li>
-							<% end_control %>
-						</ul>
-					</div>
+						<div id="entities-nav" class="documentation-nav">
+							<h2>Modules:</h2>
+								<ul>
+								<% control Entities %>
+									<li><a href="$Link" class="$LinkingMode">$Title</a></li>
+								<% end_control %>
+							</ul>
+						</div>
+						<% end_if %>
+
+						<% if Versions %>
+						<div id="versions-nav" class="documentation-nav">
+							<h2>Versions:</h2>
+								<ul>
+								<% control Versions %>
+									<li><a href="$Link" class="$LinkingMode">$Title</a></li>
+								<% end_control %>
+							</ul>
+						</div>
 					<% end_if %>
-										
-					<% if Versions %>
-					<div id="versions-nav" class="documentation-nav">
-						<h2>Versions:</h2>
-							<ul>
-							<% control Versions %>
-								<li><a href="$Link" class="$LinkingMode">$Title</a></li>
-							<% end_control %>
-						</ul>
 					</div>
-					<% end_if %>
 				</div>
 				
 				<div id="content" class="typography">
diff --git a/templates/Includes/DocBreadcrumbs.ss b/templates/Includes/DocBreadcrumbs.ss
index 563fed7..cba4131 100755
--- a/templates/Includes/DocBreadcrumbs.ss
+++ b/templates/Includes/DocBreadcrumbs.ss
@@ -1,5 +1,7 @@
+<div id="breadcrumbs">
 <p>
 	<% control Breadcrumbs %>
 		<a href="$Link">$Title</a> <% if Last %><% else %>&rsaquo;<% end_if %>
 	<% end_control %>
-</p>
\ No newline at end of file
+</p>
+</div>
\ No newline at end of file
diff --git a/templates/Layout/DocumentationViewer.ss b/templates/Layout/DocumentationViewer.ss
index d6ff78f..08e5096 100755
--- a/templates/Layout/DocumentationViewer.ss
+++ b/templates/Layout/DocumentationViewer.ss
@@ -4,6 +4,9 @@
 
 <div id="documentation-page">
 	<div id="content-column">
+		<% if Breadcrumbs %>
+			<% include DocBreadcrumbs %>
+		<% end_if %>
 		$Content
 
 		<% if EditLink %>
diff --git a/templates/Layout/DocumentationViewer_folder.ss b/templates/Layout/DocumentationViewer_folder.ss
index 6aeb9b8..c41474e 100755
--- a/templates/Layout/DocumentationViewer_folder.ss
+++ b/templates/Layout/DocumentationViewer_folder.ss
@@ -5,6 +5,9 @@
 <div id="module-home">
 	<div id="content-column">
 		<% if Content %>
+			<% if Breadcrumbs %>
+				<% include DocBreadcrumbs %>
+			<% end_if %>
 			$Content
 
 			<% if EditLink %>