From ccd109dfee1e3724c6c6ce860085bea640a7c17b Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Mon, 2 Nov 2015 15:43:00 -0500
Subject: [PATCH] refactor(toolbar): added the ability to add a search bar or
 segment in toolbar

Removed ion-segments dependency on being in the ion-title as this
should be for text only. References #356
---
 ionic/components/segment/segment.scss         |  1 +
 ionic/components/segment/test/basic/main.html | 60 +++++++++----------
 ionic/components/toolbar/toolbar.ts           |  2 +-
 3 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/ionic/components/segment/segment.scss b/ionic/components/segment/segment.scss
index 454970a783..a3ef84d259 100644
--- a/ionic/components/segment/segment.scss
+++ b/ionic/components/segment/segment.scss
@@ -7,6 +7,7 @@ $segment-button-padding:    0 16px !default;
 
 ion-segment {
   display: block;
+  width: 100%;
 }
 
 .ion-segment {
diff --git a/ionic/components/segment/test/basic/main.html b/ionic/components/segment/test/basic/main.html
index 3b4d5cc857..f692f8f488 100644
--- a/ionic/components/segment/test/basic/main.html
+++ b/ionic/components/segment/test/basic/main.html
@@ -1,14 +1,12 @@
 <ion-toolbar>
-  <ion-title>
-    <ion-segment [(ng-model)]="relationship">
-      <ion-segment-button value="friends" class="e2eSegmentFriends">
-        Friends
-      </ion-segment-button>
-      <ion-segment-button value="enemies">
-        Enemies
-      </ion-segment-button>
-    </ion-segment>
-  </ion-title>
+  <ion-segment [(ng-model)]="relationship">
+    <ion-segment-button value="friends" class="e2eSegmentFriends">
+      Friends
+    </ion-segment-button>
+    <ion-segment-button value="enemies">
+      Enemies
+    </ion-segment-button>
+  </ion-segment>
 </ion-toolbar>
 
 <ion-toolbar>
@@ -17,16 +15,14 @@
       <icon search></icon>
     </button>
   </ion-nav-items>
-  <ion-title>
-    <ion-segment secondary>
-      <ion-segment-button>
-        Something
-      </ion-segment-button>
-      <ion-segment-button>
-        Else
-      </ion-segment-button>
-    </ion-segment>
-  </ion-title>
+  <ion-segment secondary>
+    <ion-segment-button>
+      Something
+    </ion-segment-button>
+    <ion-segment-button>
+      Else
+    </ion-segment-button>
+  </ion-segment>
 </ion-toolbar>
 
 <ion-content padding>
@@ -87,17 +83,15 @@
 </ion-content>
 
 <ion-toolbar position="bottom">
-  <ion-title>
-    <ion-segment [(ng-model)]="appType" primary>
-      <ion-segment-button value="paid">
-        Paid
-      </ion-segment-button>
-      <ion-segment-button value="free">
-        Free
-      </ion-segment-button>
-      <ion-segment-button value="top" class="e2eSegmentTopGrossing">
-        Top Grossing
-      </ion-segment-button>
-    </ion-segment>
-  </ion-title>
+  <ion-segment [(ng-model)]="appType" primary>
+    <ion-segment-button value="paid">
+      Paid
+    </ion-segment-button>
+    <ion-segment-button value="free">
+      Free
+    </ion-segment-button>
+    <ion-segment-button value="top" class="e2eSegmentTopGrossing">
+      Top Grossing
+    </ion-segment-button>
+  </ion-segment>
 </ion-toolbar>
diff --git a/ionic/components/toolbar/toolbar.ts b/ionic/components/toolbar/toolbar.ts
index 8d7b5bdacb..78fdccde4f 100644
--- a/ionic/components/toolbar/toolbar.ts
+++ b/ionic/components/toolbar/toolbar.ts
@@ -60,7 +60,7 @@ export class ToolbarBase extends Ion  {
   template:
     '<div class="toolbar-inner">' +
       '<ng-content select="[menu-toggle]"></ng-content>' +
-      '<ng-content select="ion-title"></ng-content>' +
+      '<ng-content select="ion-title,ion-search-bar,ion-segment"></ng-content>' +
       '<ng-content select="ion-nav-items[primary]"></ng-content>' +
       '<ng-content select="ion-nav-items[secondary]"></ng-content>' +
     '</div>' +