Clean up location and formatting of table filtering on flow table view.

Change-Id: I4eda382b53b4f2dd4285f2540de593744f63add5

@@ -77,9 +77,14 @@ div.summary-list .table-body td {
     cursor: pointer;
     cursor: pointer;
 }
 }
 
 
-/* Tabular view upper right control buttons */
+/* Tabular view controls */
 
 
-div.ctrl-btns {
+div.tabular-header .search {
+    margin: 0 0 10px 10px;
+}
+
+
+div.tabular-header div.ctrl-btns {
     display: inline-block;
     display: inline-block;
     float: right;
     float: right;
     height: 44px;
     height: 44px;
@@ -87,12 +92,12 @@ div.ctrl-btns {
     margin-right: 20px;
     margin-right: 20px;
 }
 }
 
 
-div.ctrl-btns div {
+div.tabular-header div.ctrl-btns div {
     display: inline-block;
     display: inline-block;
     cursor: pointer;
     cursor: pointer;
 }
 }
 
 
-div.ctrl-btns div.separator  {
+div.tabular-header div.ctrl-btns div.separator  {
     width: 0;
     width: 0;
     height: 40px;
     height: 40px;
     padding: 0;
     padding: 0;

@@ -6,22 +6,6 @@
             ({{tableData.length}} total)
             ({{tableData.length}} total)
         </h2>
         </h2>
 
 
-        <div class="search">
-            <input type="text" ng-model="query" placeholder="Search"/>
-            <select ng-model="queryBy">
-                <option value="" disabled>Search By</option>
-                <option value="$">All</option>
-                <option value="id">Flow ID</option>
-                <option value="appId">App ID</option>
-                <option value="groupId">Group ID</option>
-                <option value="tableId">Table ID</option>
-                <option value="priority">Priority</option>
-                <option value="timeout">Timeout</option>
-                <option value="permanent">Permanent</option>
-                <option value="state">State</option>
-            </select>
-        </div>
-
         <div class="ctrl-btns">
         <div class="ctrl-btns">
             <div class="refresh" ng-class="{active: autoRefresh}"
             <div class="refresh" ng-class="{active: autoRefresh}"
                  icon icon-size="42" icon-id="refresh"
                  icon icon-size="42" icon-id="refresh"
@@ -70,6 +54,21 @@
                  ng-click="nav('meter')"></div>
                  ng-click="nav('meter')"></div>
 
 
         </div>
         </div>
+
+        <div class="search">
+            <input type="text" ng-model="queryTxt" placeholder="Search Text"/>
+            <select ng-model="queryBy">
+                <option value="" disabled>Search By</option>
+                <option value="$">All Fields</option>
+                <option value="id">Flow ID</option>
+                <option value="appId">App ID</option>
+                <option value="groupId">Group ID</option>
+                <option value="tableId">Table ID</option>
+                <option value="priority">Priority</option>
+                <option value="timeout">Timeout</option>
+            </select>
+        </div>
+
     </div>
     </div>
 
 
     <div class="summary-list" onos-table-resize>
     <div class="summary-list" onos-table-resize>

@@ -67,13 +67,12 @@
 
 
             Object.defineProperty($scope, "queryFilter", {
             Object.defineProperty($scope, "queryFilter", {
                get: function() {
                get: function() {
-               var out = {};
-               out[$scope.queryBy || "$"] = $scope.query;
-               return out;
+                   var out = {};
+                   out[$scope.queryBy || "$"] = $scope.queryTxt;
+                   return out;
                }
                }
             });
             });
 
 
-
             $log.log('OvFlowCtrl has been created');
             $log.log('OvFlowCtrl has been created');
         }]);
         }]);
 }());
 }());