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

@@ -628,7 +628,7 @@ class DocumentationViewer extends Controller {
 			}
 		}
 		
-		return $output;
+		return ($output->count() > 1)? $output : '';
 	}
 	
 	/**

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 { }

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">

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>
+</p>
+</div>

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 %>

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 %>