Fixes #10923: Broken display on directive screen on 3.1.20

Normation · Jun 16, 2017 · 52d308e · 52d308e
1 parent 86bec68
commit 52d308e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayDirectiveTree.scala b/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayDirectiveTree.scala
@@ -298,16 +298,7 @@ object DisplayDirectiveTree extends Loggable {
       }
     }
 
-    displayCategory(directiveLib, "jstn_0").toXml ++ Script(OnLoad(JsRaw("""
-      $('.treeActions').hide();
-      $(window).on('resize',function(){
-        adjustHeight('.rudder_col > .col','#footer');
-      });
-      adjustHeight('.rudder_col > .col','#footer');
-      $('.col.col-sm').on('scroll',function(){$$('.ui-tooltip').hide();});
-    """)))
-
-
+    displayCategory(directiveLib, "jstn_0").toXml ++ Script(OnLoad(JsRaw("$('.treeActions').hide();")))
   }
 
 }
diff --git a/...b/src/main/scala/com/normation/rudder/web/snippet/configuration/DirectiveManagement.scala b/...b/src/main/scala/com/normation/rudder/web/snippet/configuration/DirectiveManagement.scala
@@ -218,6 +218,11 @@ class DirectiveManagement extends DispatchSnippet with Loggable {
         }
 
         buildDirectiveTree('#${htmlId_activeTechniquesTree}', [ directiveId ], '${S.contextPath}', 1);
+        $$(window).on('resize',function(){
+          adjustHeight('.rudder_col > .col','#footer');
+        });
+        adjustHeight('.rudder_col > .col','#footer');
+        $$('.col.col-sm').on('scroll',function(){$$('.ui-tooltip').hide();});
         createTooltip();
     """)
   }

diff --git a/rudder-web/src/main/webapp/style/rudder-bootstrap.css b/rudder-web/src/main/webapp/style/rudder-bootstrap.css
@@ -476,13 +476,12 @@
   text-align: center;
   background-color: white;
   position: fixed;
-  bottom: 50px;
+  bottom: 55px;
   padding-top: 10px;
   border-left-width: 0px;
   margin-left: 0px;
   padding-bottom: 10px;
   border-top:5px #DDDDDD solid;
-  border-right:5px #DDDDDD solid;
   margin-left:-15px;
   padding-left:15px;
   padding-right:15px;
@@ -491,7 +490,7 @@
 }
 
 .directive-footer{
-  width:65.8%
+  width:68%
 }
 
 .rule-footer{