nicer formatting of the toolbar

hawtio · Apr 25, 2013 · 0615911 · 0615911
1 parent d41d4b9
commit 0615911
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/hawtio-web/src/main/webapp/app/activemq/html/browseQueue.html b/hawtio-web/src/main/webapp/app/activemq/html/browseQueue.html
@@ -1,22 +1,24 @@
 <div ng-controller="ActiveMQ.BrowseQueueController">
   <div class="row-fluid">
-    <form class="form-inline">
-      <div class="control-group span12">
-        <div class="controls inline-block">
-          <input class="search-query span4" type="text" ng-model="searchText"
-                 placeholder="Filter messages">
-
-          <button class="btn pull-right" ng-disabled="!selectedItems.length" ng-click="move()"
+    <div class="span6">
+      <input class="search-query span12" type="text" ng-model="searchText"
+             placeholder="Filter messages">
+    </div>
+    <div class="span6">
+      <div class="pull-right">
+        <form class="form-inline">
+          <button class="btn" ng-disabled="!selectedItems.length" ng-click="move()"
                   title="Move the selected messages to another destination" data-placement="bottom">
             <i class="icon-move"></i> Move
           </button>
-          <button type="submit" class="btn pull-right" ng-disabled="!selectedItems.length" ng-click="openDeleteDialog()"
+          <button type="submit" class="btn" ng-disabled="!selectedItems.length"
+                  ng-click="openDeleteDialog()"
                   title="Delete the selected messages">
             <i class="icon-remove"></i> Delete
           </button>
-        </div>
+        </form>
       </div>
-    </form>
+    </div>
   </div>
 
   <div class="row-fluid">

diff --git a/hawtio-web/src/main/webapp/app/activemq/js/browse.ts b/hawtio-web/src/main/webapp/app/activemq/js/browse.ts
@@ -25,7 +25,7 @@ module ActiveMQ {
           displayName: 'Message ID',
           cellTemplate: '<div class="ngCellText"><a ng-click="openMessageDialog(row)">{{row.entity.JMSMessageID}}</a></div>',
           // for ng-grid
-          width: "***"
+          width: "****"
           // for hawtio-datatable
           // width: "22em"
         },