Work in progress

RaphaelGauthier · Feb 15, 2019 · 93572c6 · 93572c6
1 parent 749187f
commit 93572c6
Show file tree

Hide file tree

Showing 12 changed files with 318 additions and 1,364 deletions.
diff --git a/...dder/rudder-web/src/main/scala/com/normation/rudder/web/services/EventListDisplayer.scala b/...dder/rudder-web/src/main/scala/com/normation/rudder/web/services/EventListDisplayer.scala
@@ -347,9 +347,9 @@ class EventListDisplayer(
       eventId match {
         case None => NodeSeq.Empty
         case Some(id) =>
-          <h4 id={"showParameters%s".format(id)} class="curspoint showParameters" onclick={"showParameters(%s)".format(id)}>
-            Raw Technical Details
-          </h4>
+          <button id={"showParameters%s".format(id)} class="btn btn-default showParameters" onclick={"showParameters(event, %s)".format(id)}>
+            <b class="action">Show</b> raw technical details
+          </button>
           <pre id={"showParametersInfo%s".format(id)} style="display:none;" class="technical-details">{ event.details.map { n =>xmlPretty.format(n) + "\n"} }</pre>
       }
     }

diff --git a/...in/scala/com/normation/rudder/web/snippet/administration/TechniqueLibraryManagement.scala b/...in/scala/com/normation/rudder/web/snippet/administration/TechniqueLibraryManagement.scala
@@ -349,7 +349,7 @@ class TechniqueLibraryManagement extends DispatchSnippet with Loggable {
         showTechniqueDetails()
       case _ =>
         <div id={htmlId_bottomPanel}>
-          <div  class="centertext">
+          <div  class="text-center">
           Click on a Technique or a category from user library to
           display its details.</div>
         </div>

diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/javascript/rudder/rudder-datatable.js b/webapp/sources/rudder/rudder-web/src/main/webapp/javascript/rudder/rudder-datatable.js
@@ -1382,7 +1382,9 @@ function createEventLogTable(gridId, data, contextPath, refresh, pickEventLogsIn
               var IdTd = tableRow.find("td.eventId");
               if (IdTd.hasClass("listclose")) {
                 myTable.fnClose(this);
+                tableRow.removeClass("opened");
               } else {
+                tableRow.addClass("opened");
                 // Set details
                 var detailsId =  'details-'+fnData.id;
                 // First open the row an d set the id

diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/javascript/rudder/rudder.js b/webapp/sources/rudder/rudder-web/src/main/webapp/javascript/rudder/rudder.js
@@ -358,11 +358,12 @@ if ((version >= 5.5) && (filters))
    }
 }
 
-function showParameters(s){
-  if(document.getElementById("showParametersInfo" + s).style.display == "none")
-    document.getElementById("showParametersInfo" + s).style.display = "block";
-  else
-    document.getElementById("showParametersInfo" + s).style.display = "none";
+function showParameters(e, s){
+  var btn = $(e.target)
+  var txt = btn.find(".action").text();
+  btn.find(".action").text(txt=="Show" ? "Hide" : "Show");
+  $("#showParametersInfo" + s).toggle();
+
 }
 
 function redirectTo(url,event) {

diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/apiManagement.html b/webapp/sources/rudder/rudder-web/src/main/webapp/secure/administration/apiManagement.html
@@ -73,7 +73,7 @@
             </div>
             <button class="btn btn-box-tool btn-blue pull-right space-top space-bottom" ng-click="getAccounts()">Refresh <span class="fa fa-refresh"></span></button>
           </div>
-          <table datatable="ng" dt-options="options" dt-column-defs="columns"  class="table-striped table-hover table-bordered table" id="accountGrid" >
+          <table datatable="ng" dt-options="options" dt-column-defs="columns" id="accountGrid" >
             <thead>
               <tr class="head tablewidth">
                 <th >Account Name</th>

diff --git a/...es/rudder/rudder-web/src/main/webapp/secure/configurationManager/parameterManagement.html b/...es/rudder/rudder-web/src/main/webapp/secure/configurationManager/parameterManagement.html
@@ -5,10 +5,9 @@
     <title>Rudder - Parameters Management</title>
     <style type="text/css">
     .portlet-content{
-      padding:0 15px;
-    }
-    .inner-portlet{
-      padding-top: 2px;
+      float: left;
+      width: 100%;
+      padding:0 15px 15px 15px;
     }
     .btn.space-bottom{
       margin-bottom:15px;
@@ -19,6 +18,9 @@
     #actions_zone {
       margin: 0;
     }
+    #globalParametersGrid_wrapper{
+      margin-bottom: 15px;
+    }
     #globalParametersGrid{
       table-layout:fixed;
     }
@@ -55,7 +57,6 @@
         </div>
       </lift:authz>
     </div>
-    <hr class="spacer" />
     <lift:authz role="directive_write">
       <div id="globalParameterForm"></div>
     </lift:authz>

diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/secure/utilities/eventLogs.html b/webapp/sources/rudder/rudder-web/src/main/webapp/secure/utilities/eventLogs.html
@@ -9,6 +9,10 @@
       #filterLogs{
         margin-bottom:12px;
       }
+      .btn.showParameters{
+        margin-bottom: 10px;
+        min-width: 195px;
+      }
     </style>
   </head>
 

diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/style/rudder/rudder-bootstrap.css b/webapp/sources/rudder/rudder-web/src/main/webapp/style/rudder/rudder-bootstrap.css
@@ -95,10 +95,6 @@ body{
   z-index: 99999;
 }
 
-.content-wrapper .table {
-  margin-bottom:0;
-}
-
 .skin-yellow .modal{
   overflow-x: hidden;
   overflow-y: auto;
@@ -259,7 +255,6 @@ body{
 	float: left;
 }
 
-
 .col-xl {
   width:70%;
 }
@@ -413,9 +408,6 @@ body{
   font-weight: 600;
   cursor: help;
 }
-.dataTable .progress .progress-bar {
-  cursor: help;
-}
 
 #complianceGauge {
   max-width: 100%;
@@ -464,34 +456,7 @@ body{
 .skin-yellow.modal .tooltip {
   opacity: 1;
 }
-.skin-yellow .modal .dataTable tr.head{
-  background-image: none;
-  background-image: none;
-  background-color: #DAD9D9;
-}
-.skin-yellow .modal tr.head th{
-  color: #000 !important;
-  border-bottom: none;
-  width: 20%;
-  font-size: 14px;
-}
-.skin-yellow .modal .dataTables_paginate a {
-  background: rgb(255, 255, 255);
-}
-.skin-yellow .modal #pendingNodeConfirm_wrapper table{
-  box-shadow: none;
-}
-.skin-yellow .modal table{
-  border: none;
-}
-.skin-yellow .modal .dataTables_wrapper_top {
-  background-color: #fff;
-}
 
-.skin-yellow .modal .table-striped > tbody > tr:nth-child(odd) > td.dataTables_empty{
-  background-color: #FFFFFF;
-  border: none;
-}
 .skin-yellow .modal .space-top{
   margin-top: 30px !important;
 }
@@ -571,9 +536,8 @@ body{
   color: #565656;
   background-color: #fff;
 }
-/* PopUp error details */
-
 
+/* PopUp error details */
 .content-wrapper #showhidetechnicalerrors{
   margin-left: 65%;
 }
@@ -853,17 +817,8 @@ input.no-tw-bs, .no-tw-bs input[type="checkbox"], .no-tw-bs input[type="radio"]{
 .content-wrapper .btn-default:active {
   border : 1px solid #adadad !important;
 }
-.content-wrapper .dataTable{
-    font-size:14px;
-}
-.content-wrapper .dataTable a {
-  color: #333;
-  text-decoration: none;
-}
+
 .content-wrapper a:hover {
   color: #337ab7;
-  text-decoration:underline;
-}
-.content-wrapper .dataTable a:hover {
   text-decoration:none;
 }