Merge pull request #437 from RaphaelGauthier/bug_20594/update_the_bra…

…nding_plugin_following_changes_to_the_login_page Fixes #20594: Update the Branding plugin following changes to the Login page
Normation · Jan 19, 2022 · 5d66edf · 5d66edf
2 parents ab8ac2b + b211cc3
commit 5d66edf
Show file tree

Hide file tree

Showing 5 changed files with 106 additions and 115 deletions.
diff --git a/branding/src/main/elm/sources/View.elm b/branding/src/main/elm/sources/View.elm
diff --git a/branding/src/main/resources/toserve/branding/media.css b/branding/src/main/resources/toserve/branding/media.css
diff --git a/branding/src/main/scala/com/normation/plugins/branding/BrandingConf.scala b/branding/src/main/scala/com/normation/plugins/branding/BrandingConf.scala
@@ -101,8 +101,8 @@ final case class Logo
   , data   : Option[String]
   ){
   def loginLogo = (enable, data) match{
-    case (true , Some(d)) => (<div class="custom-branding-logo" style={"background-image: url("++ d ++");"}></div><div class="rudder-branding-logo"></div>)
-    case (_    , _      ) =>  <img src="/images/logo-rudder-white.svg" data-lift="with-cached-resource" alt="Rudder"/>
+    case (true , Some(d)) => (<div class="custom-branding-logo" style={"background-image: url("++ d ++");"}></div>)
+    case (_    , _      ) =>  <img src="/images/logo-rudder.svg" data-lift="with-cached-resource" alt="Rudder"/>
   }
 
   def commonWideLogo = (enable, data) match{

diff --git a/branding/src/main/scala/com/normation/plugins/branding/snippet/CommonBranding.scala b/branding/src/main/scala/com/normation/plugins/branding/snippet/CommonBranding.scala
@@ -72,6 +72,7 @@ class CommonBranding(val status: PluginStatus)(implicit val ttag: ClassTag[Commo
           .content-wrapper, .main-sidebar {{padding-top:80px}}
           #headerBar {{height: 30px; position: fixed; z-index:1050; background-color: #fff; width:100%;}}
           #headerBar > .background {{background-color: {d.barColor.toRgba}; color: {d.labelColor.toRgba }; font-size:20px; font-weight: 700; text-align:center; position: absolute;top: 0;bottom: 0;left: 0;right: 0;}}
+          .skin-yellow #headerBar + .wrapper aside.main-sidebar.fixed {{height: calc(100% - 80px); min-height: calc(100% - 80px); margin-top: 80px;}}
         </style>
       </div>
       case _ => NodeSeq.Empty
@@ -82,8 +83,8 @@ class CommonBranding(val status: PluginStatus)(implicit val ttag: ClassTag[Commo
         , d.smallLogo.commonSmallLogo
         , {if((d.wideLogo.enable  && d.wideLogo.data.isDefined) || (d.smallLogo.enable && d.smallLogo.data.isDefined)) {
             <a target="_blank" href="https://www.rudder.io/" class="rudder-branding-footer">
-              {if (d.wideLogo.enable && d.wideLogo.data.isDefined) <img alt="Rudder" data-lift="with-cached-resource" src="/images/logo-rudder-nologo.svg" class="rudder-branding-logo-lg"/> else NodeSeq.Empty}
-              {if (d.smallLogo.enable && d.smallLogo.data.isDefined) <img alt="Rudder" data-lift="with-cached-resource" src="/images/logo-rudder-sm.svg" class="rudder-branding-logo-sm"/> else NodeSeq.Empty}
+              {if (d.wideLogo.enable && d.wideLogo.data.isDefined)   <img alt="Rudder" data-lift="with-cached-resource" src="/images/logo-rudder-white.svg" class="rudder-branding-logo-lg"/> else NodeSeq.Empty}
+              {if (d.smallLogo.enable && d.smallLogo.data.isDefined) <img alt="Rudder" data-lift="with-cached-resource" src="/images/logo-rudder-sm.svg"    class="rudder-branding-logo-sm"/> else NodeSeq.Empty}
             </a>
           }else{
             NodeSeq.Empty
@@ -125,7 +126,11 @@ class CommonBranding(val status: PluginStatus)(implicit val ttag: ClassTag[Commo
         a.rudder-branding-footer .rudder-branding-logo-sm{{
         display: none;
         }}
-        a.rudder-branding-footer .rudder-branding-logo-lg,
+        a.rudder-branding-footer .rudder-branding-logo-lg{{
+          display: block;
+          width: 80%;
+          margin: auto;
+        }}
         .sidebar-collapse a.rudder-branding-footer .rudder-branding-logo-sm{{
         display: block;
         width: 100%;

diff --git a/branding/src/main/scala/com/normation/plugins/branding/snippet/LoginBranding.scala b/branding/src/main/scala/com/normation/plugins/branding/snippet/LoginBranding.scala
@@ -73,10 +73,10 @@ class LoginBranding(val status: PluginStatus, version: PluginVersion)(implicit v
       case Full(d) =>
         ( d.wideLogo.loginLogo
         , <style>
-          #login-page form p.legend {{margin-bottom: 0px; }}
-          #headerBar {{background-color: #fff; float: left;height: 30px;width:100%;position: relative;}}
+          #headerBar {{background-color:#fff; float:left; height:30px; width:100%; position:relative; border-top-left-radius:20px; border-top-right-radius: 20px; overflow: hidden;}}
           #headerBar > .background {{background-color: {d.barColor.toRgba}; color: {d.labelColor.toRgba}; font-size:20px; text-align:center; font-weight: 700; position: absolute; ;top: 0;bottom: 0;left: 0;right: 0;}}
-          #login-page form > fieldset > .legend:first-child{{padding-bottom: 30px;}}
+          #headerBar + form > .motd:not(.enabled) + .form-group{{margin-top: 30px;}}
+          .motd.enabled{{margin-top: 15px;}}
           .rudder-branding-logo {{
           background-image: url(data:image/svg+xml;base64,<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   id="svg928"
   version="1.1"
   viewBox="0 0 107.15625 19.84375"
   height="75"
   width="405">
  <defs
     id="defs922" />
  <metadata
     id="metadata925">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <g
     transform="translate(0,-277.15624)"
     id="layer1">
    <g
       style="fill:#ffffff"
       transform="matrix(1.4300025,0,0,1.4300025,-45.875118,-124.9307)"
       id="g1513">
      <path
         id="path14"
         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.00537458"
         d="m 54.575965,288.09475 c 0.497672,0 0.893783,-0.11847 1.188025,-0.35661 0.294246,-0.23793 0.441668,-0.56105 0.441668,-0.96851 v -0.0228 c 0,-0.43087 -0.143941,-0.7574 -0.430165,-0.98042 -0.286674,-0.22258 -0.690506,-0.33379 -1.21088,-0.33379 h -2.02535 v 2.66212 z m -3.413325,-3.91437 h 3.519883 c 0.496005,0 0.936007,0.0698 1.319861,0.20846 0.383695,0.13945 0.703063,0.3328 0.958863,0.58082 0.210393,0.21837 0.372044,0.47043 0.484958,0.75619 0.112919,0.28598 0.169527,0.60181 0.169527,0.94752 v 0.0226 c 0,0.32371 -0.04723,0.61453 -0.141069,0.87446 -0.09445,0.25913 -0.224315,0.48859 -0.3896,0.68778 -0.165438,0.1998 -0.36281,0.36891 -0.591821,0.50796 -0.229461,0.13906 -0.483442,0.24601 -0.761643,0.3213 l 2.131908,2.98966 h -1.635446 l -1.946494,-2.75295 h -1.742304 v 2.75294 H 51.16264 v -7.89676" />
      <path
         id="path16"
         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.00537458"
         d="m 63.90989,292.20104 c -0.510991,0 -0.973849,-0.073 -1.387366,-0.21977 -0.413668,-0.14691 -0.767248,-0.36669 -1.060277,-0.65993 -0.29349,-0.29343 -0.518866,-0.6563 -0.676885,-1.08878 -0.15787,-0.43229 -0.236576,-0.9342 -0.236576,-1.50593 v -4.54625 h 1.375861 v 4.48954 c 0,0.73723 0.1777,1.29745 0.533395,1.68111 0.355091,0.38344 0.847011,0.57536 1.474855,0.57536 0.620123,0 1.107656,-0.18425 1.463349,-0.55276 0.355544,-0.36831 0.533394,-0.91766 0.533394,-1.647 v -4.54625 h 1.376318 v 4.47844 c 0,0.58667 -0.08113,1.1019 -0.242784,1.54569 -0.161801,0.44379 -0.389297,0.81391 -0.682331,1.11077 -0.293486,0.29727 -0.648577,0.51908 -1.066179,0.66599 -0.417604,0.14673 -0.885305,0.21977 -1.404774,0.21977" />
      <path
         id="path18"
         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.00537458"
         d="m 73.499009,290.82468 c 0.413363,0 0.789951,-0.0658 1.127938,-0.19818 0.338589,-0.13198 0.626478,-0.31705 0.863357,-0.55499 0.236878,-0.23794 0.420933,-0.52128 0.552619,-0.84963 0.13153,-0.32856 0.197522,-0.68516 0.197522,-1.07042 v -0.023 c 0,-0.38466 -0.06599,-0.74389 -0.197522,-1.07587 -0.131686,-0.33238 -0.315741,-0.61715 -0.552619,-0.85509 -0.236879,-0.23854 -0.524768,-0.42522 -0.863357,-0.56083 -0.337987,-0.13623 -0.714575,-0.20404 -1.127938,-0.20404 H 71.94227 v 5.39206 z m -2.932905,-6.6443 h 2.944257 c 0.616642,0 1.182577,0.0995 1.697961,0.29868 0.514926,0.19979 0.958713,0.47607 1.330758,0.82904 0.372648,0.35358 0.659929,0.76912 0.863205,1.24721 0.202974,0.47749 0.304537,0.99454 0.304537,1.55074 v 0.0224 c 0,0.55679 -0.101563,1.07566 -0.304537,1.55719 -0.203276,0.48092 -0.490557,0.89867 -0.863205,1.25184 -0.372045,0.35379 -0.815832,0.63208 -1.330758,0.8349 -0.515384,0.20304 -1.081319,0.30475 -1.697961,0.30475 h -2.944257 v -7.89676" />
      <path
         id="path20"
         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.00537458"
         d="m 83.674648,290.82468 c 0.413516,0 0.78965,-0.0658 1.128088,-0.19818 0.338438,-0.13198 0.626477,-0.31705 0.863049,-0.55499 0.236732,-0.23794 0.42094,-0.52128 0.552773,-0.84963 0.131536,-0.32856 0.197528,-0.68516 0.197528,-1.07042 v -0.023 c 0,-0.38466 -0.06599,-0.74389 -0.197528,-1.07587 -0.131833,-0.33238 -0.316041,-0.61715 -0.552773,-0.85509 -0.236572,-0.23854 -0.524611,-0.42522 -0.863049,-0.56083 -0.338438,-0.13623 -0.714572,-0.20404 -1.128088,-0.20404 h -1.556586 v 5.39206 z m -2.933204,-6.6443 h 2.944253 c 0.616947,0 1.18288,0.0995 1.698115,0.29868 0.514771,0.19979 0.959017,0.47607 1.331359,0.82904 0.371895,0.35358 0.65947,0.76912 0.862599,1.24721 0.202984,0.47749 0.304542,0.99454 0.304542,1.55074 v 0.0224 c 0,0.55679 -0.101558,1.07566 -0.304542,1.55719 -0.203129,0.48092 -0.490704,0.89867 -0.862599,1.25184 -0.372342,0.35379 -0.816588,0.63208 -1.331359,0.8349 -0.515235,0.20304 -1.081168,0.30475 -1.698115,0.30475 h -2.944253 v -7.89676" />
      <path
         id="path22"
         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.00537458"
         d="m 103.24234,288.09475 c 0.49782,0 0.89393,-0.11847 1.18802,-0.35661 0.29439,-0.23793 0.44152,-0.56105 0.44152,-0.96851 v -0.0228 c 0,-0.43087 -0.14364,-0.7574 -0.43017,-0.98042 -0.28667,-0.22258 -0.6902,-0.33379 -1.21073,-0.33379 h -2.02565 v 2.66212 z m -3.41348,-3.91437 h 3.52018 c 0.49601,0 0.93601,0.0698 1.31987,0.20846 0.38324,0.13945 0.70277,0.3328 0.95856,0.58082 0.21054,0.21837 0.37205,0.47043 0.48526,0.75619 0.11276,0.28598 0.16907,0.60181 0.16907,0.94752 v 0.0226 c 0,0.32371 -0.0471,0.61453 -0.14092,0.87446 -0.0941,0.25913 -0.22401,0.48859 -0.3896,0.68778 -0.16514,0.1998 -0.36266,0.36891 -0.59197,0.50796 -0.22946,0.13906 -0.48329,0.24601 -0.76119,0.3213 l 2.13191,2.98966 h -1.63575 l -1.94664,-2.75294 h -1.74231 v 2.75294 h -1.37647 v -7.89676" />
      <path
         id="path24"
         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.00537458"
         d="m 92.293242,285.43262 h 4.467399 v -1.25224 h -5.843562 v 1.25224 h 1.376163" />
      <path
         id="path26"
         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.00537458"
         d="m 92.293552,290.82468 v -2.10916 h 3.959586 v -1.25245 h -5.336059 v 4.61407 h 5.899864 v -1.25246 h -4.523391" />
      <path
         id="path28"
         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.00537458"
         d="m 39.917491,291.81518 c 0.336321,-0.0892 0.654178,-0.22341 0.947666,-0.39434 -0.14576,-0.38426 -0.06478,-0.8341 0.244597,-1.14328 0.309229,-0.30917 0.759072,-0.38991 1.142921,-0.2446 0.171491,-0.29343 0.305748,-0.61109 0.394292,-0.94752 -0.374919,-0.16831 -0.636771,-0.54448 -0.636771,-0.98202 0,-0.43834 0.261852,-0.81391 0.636771,-0.98242 -0.08854,-0.33623 -0.222801,-0.65387 -0.394292,-0.94732 -0.107466,0.0408 -0.219775,0.0618 -0.333446,0.0668 l -1.094788,1.25832 c 0.06085,0.1911 0.0946,0.39393 0.0946,0.60462 0,1.09383 -0.889846,1.98364 -1.983576,1.98364 -1.093878,0 -1.983877,-0.88981 -1.983877,-1.98364 0,-1.09442 0.889999,-1.98403 1.983877,-1.98403 0.201158,0 0.395353,0.0305 0.578802,0.087 l 1.283836,-1.11805 c 0.0076,-0.10252 0.02967,-0.20484 0.06705,-0.30251 -0.293488,-0.17155 -0.611345,-0.30555 -0.947666,-0.39436 -0.16816,0.37538 -0.544594,0.63673 -0.982026,0.63673 -0.438036,0 -0.814014,-0.26135 -0.981872,-0.63673 -0.336473,0.0888 -0.65433,0.22281 -0.947665,0.39436 0.145456,0.38364 0.06448,0.83408 -0.245054,1.14327 -0.308774,0.30918 -0.758768,0.3901 -1.14292,0.24459 -0.171491,0.29345 -0.304687,0.61109 -0.394444,0.94752 0.375071,0.16831 0.636923,0.54388 0.636923,0.98222 0,0.43814 -0.261852,0.81371 -0.636923,0.98202 0.08976,0.33643 0.223105,0.65409 0.394444,0.94752 0.384152,-0.14531 0.834298,-0.0646 1.14292,0.2446 0.309532,0.30918 0.390663,0.75902 0.245054,1.14328 0.293335,0.17093 0.611192,0.30514 0.947665,0.39434 0.167858,-0.37537 0.543836,-0.63693 0.981872,-0.63693 0.437432,0 0.813866,0.26156 0.982026,0.63693" />
      <path
         id="path30"
         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.00537458"
         d="m 38.590062,287.58174 c -0.234911,0.23491 -0.234911,0.61573 0,0.85065 0.117304,0.11724 0.271239,0.17597 0.425322,0.17597 0.153783,0 0.308169,-0.0587 0.42502,-0.17597 l 4.293784,-4.90811 c 0.06509,-0.0652 0.06509,-0.17094 0,-0.23613 -0.06539,-0.0652 -0.170734,-0.0652 -0.236123,0 v 0 l -4.908003,4.29359" />
      <path
         id="path32"
         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.00537458"
         d="m 33.258553,287.16499 0.669012,0.69182 c 0.137434,-2.64679 2.326708,-4.75049 5.007599,-4.75049 1.13611,0 2.183521,0.378 3.024175,1.01472 l 1.052559,-0.90312 c -1.105384,-0.91986 -2.526201,-1.47364 -4.076734,-1.47364 -3.441627,0 -6.244515,2.7271 -6.369993,6.13796 l 0.693382,-0.71725" />
      <path
         id="path34"
         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.00537458"
         d="m 37.979626,293.79698 0.691566,-0.66901 c -2.408746,-0.12472 -4.367043,-1.95012 -4.699582,-4.29842 l -0.713057,-0.73703 -0.665379,0.68819 c 0.322093,3.13357 2.913833,5.59265 6.103899,5.71011 l -0.717447,-0.69384" />
      <path
         id="path36"
         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.00537458"
         d="m 43.942611,288.38435 c -0.124872,2.40904 -1.949972,4.36745 -4.298476,4.69983 l -0.736973,0.7128 0.688384,0.66579 c 3.133611,-0.32229 5.592305,-2.91379 5.709759,-6.10385 l -1.362694,0.0254" />
    </g>
  </g>
</svg>
);
           background-size: contain;
@@ -87,30 +87,31 @@ class LoginBranding(val status: PluginStatus, version: PluginVersion)(implicit v
           bottom: 2px;
           left: 5px;
           }}
-          .custom-branding-logo {{
-            background-size: contain;
-            background-repeat: no-repeat;
-            background-position: center;
-            height: 110px;
-          }}
           </style>
         )
       case _       => (<img src="/images/logo-rudder-white.svg" data-lift="with-cached-resource" alt="Rudder"/>, NodeSeq.Empty)
     }
-    val legend =
+    val logoContainer =
       <div>
         {customLogo}
-        <span>{version.rudderAbi.toVersionString}</span>
+        <style>
+          .custom-branding-logo {{
+            background-size: contain;
+            background-repeat: no-repeat;
+            background-position: center;
+            height: 120px;
+          }}
+        </style>
       </div>
     val motd = data match {
       case Full(data) if (data.displayMotd) =>
-       data.motd
-      case _ => "Welcome, please sign in:"
+       <div class="motd enabled" style="margin-bottom: 20px; text-align: center;">{data.motd}</div>
+      case _ => <div class="motd"></div>
     }
-    ( ".legend"       #> legend &
-    ".plugin-info"    #> bar &
-    ".plugin-info *+" #> brandingCss &
-    ".welcome *"      #> motd
+    ( ".logo-container" #> logoContainer &
+    ".plugin-info"      #> bar &
+    ".plugin-info *+"   #> brandingCss &
+    ".motd"             #> motd
     ) (xml)
   }
 }