Work in progress

RaphaelGauthier · Mar 9, 2021 · e29330f · e29330f
1 parent f143c60
commit e29330f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/build-app.sh b/webapp/sources/rudder/rudder-web/src/main/elm/build-app.sh
@@ -3,7 +3,7 @@
 # we want that all elm-stuff stay in src/main/elm
 # whatever the path from which this script is called
 ELM_DIR="$( cd "$( dirname "$0" )" && pwd )"
-PROJECTS=("notifications" "healthcheck")
+PROJECTS=("notifications" "healthcheck" "rules")
 for PROJECT in ${PROJECTS[*]}; do
   cd ${ELM_DIR}/${PROJECT}
   elm make --optimize sources/rudder-${PROJECT}.elm --output=generated/rudder-${PROJECT}.js

diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/Boot.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/Boot.scala
@@ -395,7 +395,12 @@ class Boot extends Loggable {
             >> LocGroup(name+"Group")
             >> TestAccess( () => userIsAllowed("/secure/index",AuthorizationType.Rule.Read ) )
 
-        , Menu(name+"DirectiveManagement", <span>Directives</span>) /
+        , Menu(name+"RuleManagementElm", <span>Rules v2</span>) /
+          "secure" / (name+"Manager") / "ruleManagementElm"
+          >> LocGroup(name+"Group")
+          >> TestAccess( () => userIsAllowed("/secure/index",AuthorizationType.Rule.Read ) )
+
+        ,Menu(name+"DirectiveManagement", <span>Directives</span>) /
             "secure" / (name+"Manager") / "directiveManagement"
             >> LocGroup(name+"Group")
             >> TestAccess( () => userIsAllowed("/secure/index",AuthorizationType.Directive.Read ) )

diff --git a/webapp/sources/rudder/rudder-web/src/main/webapp/style/rudder/rudder-rules.css b/webapp/sources/rudder/rudder-web/src/main/webapp/style/rudder/rudder-rules.css
@@ -34,6 +34,14 @@
 *
 *************************************************************************************
 */
+
+/* === TEMPLATE === */
+.rudder-template .template-sidebar .sidebar-header .header-filter > .input-group {
+  width: 100%;
+}
+/* ================ */
+
+
 #viewAllRulesZone {
   padding: 15px;
 }