diff --git a/src/ninegate-1.0/src/Cadoles/CASBundle/Controller/SecurityController.php b/src/ninegate-1.0/src/Cadoles/CASBundle/Controller/SecurityController.php index 3cfb2a89..b0667cb5 100644 --- a/src/ninegate-1.0/src/Cadoles/CASBundle/Controller/SecurityController.php +++ b/src/ninegate-1.0/src/Cadoles/CASBundle/Controller/SecurityController.php @@ -30,7 +30,7 @@ class SecurityController extends Controller // Init Client CAS \phpCAS::setDebug("/var/log/phpcas/phpCAS-ninegate.log"); - \phpCAS::client(CAS_VERSION_2_0, $this->getParameter('cas_host'), $this->getParameter('cas_port'), is_null($this->getParameter('cas_path')) ? '' : $this->getParameter('cas_path'), false); + @\phpCAS::client(CAS_VERSION_2_0, $this->getParameter('cas_host'), $this->getParameter('cas_port'), is_null($this->getParameter('cas_path')) ? '' : $this->getParameter('cas_path'), false); \phpCAS::setNoCasServerValidation(); @@ -194,7 +194,7 @@ class SecurityController extends Controller public function logoutAction() { // Init Client CAS \phpCAS::setDebug(false); - \phpCAS::client(CAS_VERSION_2_0, $this->getParameter('cas_host'), $this->getParameter('cas_port'), is_null($this->getParameter('cas_path')) ? '' : $this->getParameter('cas_path'), true); + @\phpCAS::client(CAS_VERSION_2_0, $this->getParameter('cas_host'), $this->getParameter('cas_port'), is_null($this->getParameter('cas_path')) ? '' : $this->getParameter('cas_path'), true); \phpCAS::setNoCasServerValidation(); @@ -208,7 +208,7 @@ class SecurityController extends Controller // Init Client CAS \phpCAS::setDebug("/var/log/phpcas/phpCAS-ninegate.log"); - \phpCAS::client(CAS_VERSION_2_0, $this->getParameter('cas_host'), $this->getParameter('cas_port'), is_null($this->getParameter('cas_path')) ? '' : $this->getParameter('cas_path'), false); + @\phpCAS::client(CAS_VERSION_2_0, $this->getParameter('cas_host'), $this->getParameter('cas_port'), is_null($this->getParameter('cas_path')) ? '' : $this->getParameter('cas_path'), false); \phpCAS::setNoCasServerValidation(); diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/style.css b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/style.css index 2b010aae..cba9de23 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/style.css +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/style.css @@ -280,3 +280,62 @@ div.header > a.title > span { color: var(--fontcolorhover, white) !important; background: var(--fontcolorhoverdark, black) !important; } + +/* + * mise à jour du thème pour le bandeau escamotable #31431 + */ + + nav.navbarsmall { + background: white !important; + } + + .navbarsmall .navbar-brand { + color: black !important; + font-family: var(--fontfacetitle); + } + + .navbarsmall #logo { + float: left !important; + top: 0px !important; + left: 0px !important; + position: relative !important; + } + .navbarsmall { + height: 50px !important; + overflow-y: hidden; + } + .navbarsmall .nav.navbar-top-links.navbar-right > li a {font-size: 1.5em; } + + .navbarsmall .title img { margin-left:-300px !important;} + .navbarsmall small { + top: 18px !important; + font-size: 0.5em; + } + + .navbarsmall .nav.navbar-top-links.navbar-left li { + display: block; + } + + .navbarsmall a.navbar-brand { + line-height: 27px !important; + transition:line-height 0.5s ease; + font-size: 1.3em; + margin-left: -90px; + margin-top: -3px; + } + + .navbarsmall #logo { + /* remplacer l'image en définissant une image de background */ + /* et en positionnant un padding de la largeur de l'image */ + display: block; + -moz-box-sizing: border-box; + box-sizing: border-box; + background: var(--logo) no-repeat; + width: 62px; /* Width of new image */ + height: 23px !important; /* Height of new image */ + padding-left: 62px; /* Equal to width of new image */ + margin-top: -1px; + margin-left: 86px; + margin-right: 14px; + } + .navbarsmall .avatar {height: 25px; } diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ItemType.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ItemType.php index 06e61041..016c9b39 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ItemType.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ItemType.php @@ -137,6 +137,7 @@ class ItemType extends AbstractType if($options["ssosynchroitem"]) { $builder->add("ssoitem", TextType::class, [ "label" => "Visible si attribut SSO ".$options["user_attr_cas_item"]." égale à", + "required" => false, "disabled" => ($options["mode"]=="delete"?true:false), ]); }