Work in progress

RaphaelGauthier · Nov 23, 2023 · 73bcef7 · 73bcef7
1 parent bc9475e
commit 73bcef7
Show file tree

Hide file tree

Showing 7 changed files with 788 additions and 1,012 deletions.
diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/sources/QuickSearch/View.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/QuickSearch/View.elm
@@ -86,70 +86,64 @@ filterButton model filter =
 view : Model -> Html Msg
 view model =
   let
-    open = if (model.state == Closed) then "" else "open"
+    open = if (model.state == Closed) then "" else "show"
     filteredResult =
       if (List.isEmpty model.selectedFilter) then model.results
       else model.results |> List.filter (\r -> List.member r.header.type_ model.selectedFilter  )
   in
-  div [ class "sidebar-form topbar-search-form" ] [
-    div [ class "input-group ng-scope", id "quicksearch" ] [
-      div [ id "angucomplete-ie8-quicksearch"] [
-        div [ class "angucomplete-holder angucomplete-dropdown-visible" ] [
-          div [ class ("input-group group-search "++open) ] [
-            label [ class "input-group-addon",  for "searchInput" ] [
-              span [ class "glyphicon glyphicon-search" ] []
-              ]
-          , input [ type_ "text", value model.search, placeholder "Search anything", onClick Open, onInput UpdateSearch , id "searchInput" , class "form-control input", autocomplete False] []          , label [ class ("input-group-addon " ++ if (String.isEmpty model.search) then "noRemove" else ""),  id "clear-search", for "searchInput" ] [
-              span [ class "glyphicon glyphicon-remove", onClick (UpdateSearch "") ] []
-            ]
-          , a [ class "input-group-addon",  id "help-search",  href "/rudder-doc/reference/current/usage/node_management.html#search-nodes",  target "_blank" ] [
-              span [ class "glyphicon glyphicon-question-sign" ] []
-             ]
-          , div [ id "background-fade-quicksearch", onClick Close  ] []
-          , ul [ class "dropdown-menu dropdown-search dropdown-menu-right" ] [
-              li [ class "dropdown-header" ] [
-                div [ class "row no-margin" ] [
-                  div [ class "row",  id "search-tab" ] [
-                    div [ class "filter-search col-xs-12" ] [
-                      div [ class "panel panel-default panel-help" ] [
-                        div [ class "panel-heading heading-search" ] [
-                          div [ class "btn-toolbar", role "toolbar" ] [
-                            div [ class "btn-group group-all", attribute "data-bs-toggle" "buttons" ] [
-                              filterButton model All
-                            ]
-                          , div  [ class "btn-group group-filters", attribute "data-bs-toggle" "buttons" ]
-                              (List.map (filterButton model) allFilters)
-                          ]
+  div [ class "quicksearch-form ms-2" ]
+  [ div [ class "input-group"]
+    [ label [ class "input-group-text", for "searchInput" ]
+      [ span [ class "fa fa-search" ] []
+      ]
+    , input [ type_ "text", value model.search, placeholder "Search anything", onClick Open, onInput UpdateSearch , id "searchInput" , class "form-control input", autocomplete False] []
+    , label [ class ("input-group-text " ++ if (String.isEmpty model.search) then "noRemove" else ""),  id "clear-search", for "searchInput", onClick (UpdateSearch "") ]
+      [ span [ class "fa fa-times" ] []
+      ]
+    , a [ class "input-group-text", id "help-search", href "/rudder-doc/reference/current/usage/node_management.html#search-nodes",  target "_blank" ]
+      [ span [ class "fa fa-question-circle" ] []
+      ]
+    ]
+  , div [ id "background-fade-quicksearch", class open, onClick Close  ][]
+
+  , ul [ class ("dropdown-menu dropdown-search " ++ open) ]
+    [ li []
+      [ div [ id "search-tab" ]
+        [ div [ class "filter-search" ] [
+                  div [ class "main-panel" ] [
+                    div [ class "panel-heading heading-search" ] [
+                      div [ class "btn-toolbar", role "toolbar" ] [
+                        div [ class "btn-group group-all", attribute "data-bs-toggle" "buttons" ] [
+                          filterButton model All
                         ]
-                        , div [ class "panel-body results-content" ] [
-                            div [ class "info-messages" ] [
-                              div [ class "angucomplete-searching", hidden ((String.length model.search ) >= 3 )] [
-                                span [ class "glyphicon glyphicon-exclamation-sign" ] []
-                              , text "The field size must be greater than 2 characters"
-                              ]
-                            , div [ hidden ((String.length model.search ) < 3 )] [
-                                div [ class "angucomplete-searching", hidden (model.state /= Searching) ] [
-                                  text "Searching..."
-                                ]
-                              , div [ class "angucomplete-searching text-danger", hidden ((model.state /= Opened) || (List.length model.results > 0))  ] [
-                                  span [ class "glyphicon glyphicon-exclamation-sign text-danger" ] []
-                                , text "No results found"
-                                ]
-                              ]
-                            , div [ class "panel-group", hidden (model.state == Searching || (List.isEmpty model.results )  ) ] [
-                                div [ class "angucomplete-dropdown dropdown-search ", role "tablist" ]
-                                  (List.map viewResult filteredResult)
-                              ]
-                            ]
+                      , div  [ class "btn-group group-filters", attribute "data-bs-toggle" "buttons" ]
+                          (List.map (filterButton model) allFilters)
+                      ]
+                  ]
+                  , div [ class "panel-body results-content" ] [
+                       div [ class "info-messages" ] [
+                        div [ class "angucomplete-searching", hidden ((String.length model.search ) >= 3 )] [
+                          span [ class "glyphicon glyphicon-exclamation-sign" ] []
+                        , text "The field size must be greater than 2 characters"
+                        ]
+                      , div [ hidden ((String.length model.search ) < 3 )] [
+                          div [ class "angucomplete-searching", hidden (model.state /= Searching) ] [
+                             text "Searching..."
                           ]
+                        , div [ class "angucomplete-searching text-danger", hidden ((model.state /= Opened) || (List.length model.results > 0))  ] [
+                            span [ class "glyphicon glyphicon-exclamation-sign text-danger" ] []
+                          , text "No results found"
+                         ]
+                         ]
+                      , div [ class "panel-group", hidden (model.state == Searching || (List.isEmpty model.results )  ) ] [
+                          div [ class "angucomplete-dropdown dropdown-search ", role "tablist" ]
+                            (List.map viewResult filteredResult)
                         ]
                       ]
                     ]
                   ]
                 ]
               ]
-            ]
           ]
-        ]
-      ]
-    ]
+    ]
+  ]
diff --git a/...ces/rudder/rudder-web/src/main/scala/com/normation/rudder/web/comet/AsyncDeployment.scala b/...ces/rudder/rudder-web/src/main/scala/com/normation/rudder/web/comet/AsyncDeployment.scala
@@ -96,7 +96,7 @@ class AsyncDeployment extends CometActor with CometListener with Loggable {
           case NoStatus =>
             "bg-neutral"
           case _: SuccessStatus =>
-            "bg-success"
+            "bg-ok"
           case _: ErrorStatus   =>
             "bg-error"
         }
@@ -114,20 +114,17 @@ class AsyncDeployment extends CometActor with CometListener with Loggable {
         iconClass:    String,
         statusClass:  String
     ) = {
-      <li>
-        <ul class="menu">
-          <li><a href="#" class={statusClass + " no-click"}><span class={iconClass}></span>{headText}</a></li>
-          <li><a href="#" class="no-click"><span class={statusClass + " fa fa-hourglass-start"}></span>{
+        <li><a href="#" class={statusClass + " no-click"}><span class={iconClass}></span>{headText}</a></li>
+        <li><a href="#" class="no-click"><span class={statusClass + " fa fa-hourglass-start"}></span>{
         displayTime("Started at ", start)
-      }</a></li>
-          <li><a href="#" class="no-click"><span class={statusClass + " fa fa-hourglass-end"}></span><span id="deployment-end">{
+      }</a>
+        </li>
+        <li><a href="#" class="no-click"><span class={statusClass + " fa fa-hourglass-end"}></span><span id="deployment-end">{
         displayTime("Ended at ", end)
       }</span></a></li>
           <li><a href="#" class="no-click"><span class={statusClass + " fa fa-clock-o"}></span>{durationText} {
         DateFormaterService.getFormatedPeriod(start, end)
       }</a></li>
-        </ul>
-      </li>
     }
     def loadingStatement(start: DateTime) = {
       <li class="dropdown-header">Policies building...</li>
@@ -222,14 +219,14 @@ class AsyncDeployment extends CometActor with CometListener with Loggable {
   }
   private[this] def layout = {
     <lift:authz role="deployment_read">
-      <li class={"dropdown notifications-menu " ++ statusBackground}>
-        <a href="#" class="dropdown-toggle"  data-bs-toggle="dropdown">
+
+      <li class={"nav-item dropdown notifications-menu " ++ statusBackground}>
+        <a href="#" class="nav-link dropdown-toggle" role="button" data-bs-toggle="dropdown" aria-expanded="false">
           Status
           <i class="fa fa-heartbeat"></i>
           <span id="generation-status" class="label"><span></span></span>
-          <i class="fa fa-angle-down" style="margin-left:15px;"></i>
         </a>
-        <ul class="dropdown-menu" role="menu">
+        <ul class="dropdown-menu">
           {lastStatus}
           <li class="footer">
             {showGeneratePoliciesPopup}

diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-bootstrap.css b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-bootstrap.css
@@ -284,11 +284,6 @@ body{
   }
 }
 
-#generation-status{
-  padding-top:2px;
-  padding-bottom:2px;
-}
-
 .bs-callout {
   -moz-border-bottom-colors: none;
   -moz-border-left-colors: none;