Fixes #9454: The query based search in the node details is inside the…

… hardware table
Normation · Oct 19, 2016 · c39abe5 · c39abe5
1 parent 739dd5d
commit c39abe5
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 21 deletions.
diff --git a/rudder-web/src/main/webapp/secure/nodeManager/searchNodes.html b/rudder-web/src/main/webapp/secure/nodeManager/searchNodes.html
@@ -16,35 +16,35 @@
     <div data-lift="node.SearchNodes.head"></div>
     <div class="inner-portlet">
       <div class="inner-portlet-content">
-        <hr class="spacer"/>
-        <div id="serverDetails" ></div>
+        <div class="node-tab-content">
+          <div id="serverDetails"></div>
+        </div>
       </div>
     </div>
-
     <div class="inner-portlet">
-      <div id="querySearchSection" onclick="$('#query-search-content').toggle(400);$('#querySearchSection').toggleClass('unfoldedSectionQuery');" class="inner-portlet-header">
-          Query based search
-      </div>
-      <div id="query-search-content" style="display:none;">
-        <div class="intro">
-          <div>
-            Find nodes in your Rudder infrastructure that match different criteria.<br />
-            Define <a href="/secure/nodeManager/groups">node groups</a> from your search results.
-          </div>
+      <div class="inner-portlet-content">
+        <div id="querySearchSection" onclick="$('#query-search-content').toggle(400);$('#querySearchSection').toggleClass('unfoldedSectionQuery');" class="inner-portlet-header">
+            Query based search
         </div>
-
-        <div class="inner-portlet-content" style="overflow:auto;">
-          <div id="SearchNodes">
-            <div data-lift="node.SearchNodes.showQuery"></div>
+        <div id="query-search-content" style="display:none;">
+          <div class="intro">
+            <div>
+              Find nodes in your Rudder infrastructure that match different criteria.<br />
+              Define <a href="/secure/nodeManager/groups">node groups</a> from your search results.
+            </div>
           </div>
-          <lift:authz role="group_write">
-          <div class="tw-bs">
-            <div data-lift="node.SearchNodes.createGroup"></div>
+          <div class="inner-portlet-content" style="overflow:auto;">
+            <div id="SearchNodes">
+              <div data-lift="node.SearchNodes.showQuery"></div>
+            </div>
+            <lift:authz role="group_write">
+              <div class="tw-bs">
+                <div data-lift="node.SearchNodes.createGroup"></div>
+              </div>
+            </lift:authz>
           </div>
-          </lift:authz>
         </div>
       </div>
-      <br/>
     </div>
   </div>
 </div>

diff --git a/rudder-web/src/main/webapp/style/rudder/rudder-menu.css b/rudder-web/src/main/webapp/style/rudder/rudder-menu.css
@@ -813,6 +813,17 @@ a.sidebar-toggle{
 #editForm table{
   width:100%;
 }
+/* --- NODE PAGE --- */
+.node-tab-content{
+	float:left;
+	width:100%;
+	margin-bottom:15px;
+}
+#serverDetails > .ui-tabs.ui-widget.ui-widget-content{
+	margin:0;
+	padding:0;
+	border:none;
+}
 /* --- DIRECTIVE PAGE --- */
 #directiveDetails{
   border-left: 15px solid #ECF0F5;

diff --git a/rudder-web/src/main/webapp/style/rudder/rudder.css b/rudder-web/src/main/webapp/style/rudder/rudder.css
@@ -2744,6 +2744,7 @@ label span.text-fit{
 }
 #nodeInventory .ui-tabs-nav{
 	margin-top: 5px;
+  margin-bottom: 15px;
 }
 #node_inventory{
 	padding : 0 !important;