app/views/trestle/application/_header.html.erb in trestle-0.8.9 vs app/views/trestle/application/_header.html.erb in trestle-0.8.10

@@ -1,27 +1,29 @@
 <header class="content-header">
-  <% if content_for?(:primary_toolbar) %>
+  <div class="content-header-title">
+    <h1>
+      <%= content_for(:title) %>
+    </h1>
+
+    <% unless local_assigns.fetch(:hide_breadcrumbs, false) %>
+    <ol class="breadcrumb">
+      <% breadcrumbs.each do |breadcrumb| %>
+        <li class="breadcrumb-item<% if breadcrumb == breadcrumbs.last %> active<% end %>">
+          <%= link_to breadcrumb.label, breadcrumb.path %>
+        </li>
+      <% end %>
+    </ol>
+    <% end %>
+  </div>
+
+  <div class="content-header-toolbars">
     <div class="btn-toolbar primary-toolbar">
-      <%= content_for(:primary_toolbar) %>
+      <%= render_toolbar(toolbar(:primary)) %>
+      <%= deprecated_toolbar(:primary) %>
     </div>
-  <% end %>
 
-  <% if content_for?(:secondary_toolbar) %>
     <div class="btn-toolbar secondary-toolbar">
-      <%= content_for(:secondary_toolbar) %>
+      <%= render_toolbar(toolbar(:secondary)) %>
+      <%= deprecated_toolbar(:secondary) %>
     </div>
-  <% end %>
-
-  <h1>
-    <%= content_for(:title) %>
-  </h1>
-
-  <% unless local_assigns.fetch(:hide_breadcrumbs, false) %>
-  <ol class="breadcrumb">
-    <% breadcrumbs.each do |breadcrumb| %>
-      <li class="breadcrumb-item<% if breadcrumb == breadcrumbs.last %> active<% end %>">
-        <%= link_to breadcrumb.label, breadcrumb.path %>
-      </li>
-    <% end %>
-  </ol>
-  <% end %>
+  </div>
 </header>