Move route selector to button panel to get rid of mostly empty row.

hawtio · Dec 10, 2013 · c3f745c · c3f745c
1 parent efae462
commit c3f745c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/hawtio-web/src/main/webapp/app/wiki/html/camelCanvas.html b/hawtio-web/src/main/webapp/app/wiki/html/camelCanvas.html
@@ -87,10 +87,15 @@
             <a href='' title="Add new pattern node connecting to this pattern" ng-click="addDialog.open()"
                data-placement="bottom">
               <i class="icon-plus"></i> Add</a></li>
+
           <li class="pull-right">
             <a href='' title="Automatically layout the diagram " ng-click="doLayout()"
                data-placement="bottom">
               <i class="icon-magic"></i> Layout</a></li>
+
+          <li class="pull-right" style="margin-top: 0; margin-bottom: 0;">
+            </li>
+
           <!--
           <li class="pull-right">
             <a href='' title="Edit the properties for the selected node" ng-disabled="!selectedFolder"
@@ -168,10 +173,6 @@
     </div>
 
     <div class="row-fluid">
-      <form class="form-inline pull-right">
-        <label>Route: </label>
-        <select ng-model="selectedRouteId" ng-options="routeId for routeId in routeIds"></select>
-      </form>
     </div>
 
     <div class="panes gridStyle">
@@ -184,6 +185,10 @@
         <div class="camel-props">
           <div class="button-bar">
             <div class="centered">
+              <form class="form-inline">
+                <label>Route: </label>
+                <select ng-model="selectedRouteId" ng-options="routeId for routeId in routeIds"></select>
+              </form>
               <div class="btn-group">
                 <button class="btn"
                         title="{{getDeleteTitle()}}"

diff --git a/hawtio-web/src/main/webapp/css/site-base.css b/hawtio-web/src/main/webapp/css/site-base.css
@@ -3172,12 +3172,16 @@ tabset > .tabbable > .tab-content > .nav.nav-tabs > li.disabled {
   position: absolute;
 }
 
+.button-bar > .centered > form {
+  margin-bottom: 10px;
+}
+
 .camel-props > .prop-viewport {
   overflow-y: auto;
   overflow-x: visible;
   position: absolute;
   bottom: 0;
-  top: 40px;
+  top: 80px;
   width: 100%;
 }