Cadoles
/
ninegate
20
0
Fork 0
Code Issues 29 Pull Requests Projects 1 Releases Wiki Activity

Merge branch 'master' into dist/envole/6/master

This commit is contained in:
Arnaud Fornerot 2021-03-09 10:12:12 +01:00
parent ee4c59a859 6a5a50a2f8
commit 3389eecb74
3 changed files with 63 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ninegate-1.0/src/Cadoles/CASBundle/Controller/SecurityController.php
View File

@ -30,7 +30,7 @@ class SecurityController extends Controller
// Init Client CAS // Init Client CAS
\phpCAS::setDebug("/var/log/phpcas/phpCAS-ninegate.log"); \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(); \phpCAS::setNoCasServerValidation();
@ -194,7 +194,7 @@ class SecurityController extends Controller
public function logoutAction() { public function logoutAction() {
// Init Client CAS // Init Client CAS
\phpCAS::setDebug(false); \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(); \phpCAS::setNoCasServerValidation();
@ -208,7 +208,7 @@ class SecurityController extends Controller
// Init Client CAS // Init Client CAS
\phpCAS::setDebug("/var/log/phpcas/phpCAS-ninegate.log"); \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(); \phpCAS::setNoCasServerValidation();

59
src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/metice/style.css
View File

@ -280,3 +280,62 @@ div.header > a.title > span {
color: var(--fontcolorhover, white) !important; color: var(--fontcolorhover, white) !important;
background: var(--fontcolorhoverdark, black) !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; }

1
src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ItemType.php
View File

@ -137,6 +137,7 @@ class ItemType extends AbstractType
if($options["ssosynchroitem"]) { if($options["ssosynchroitem"]) {
$builder->add("ssoitem", TextType::class, [ $builder->add("ssoitem", TextType::class, [
"label" => "Visible si attribut SSO ".$options["user_attr_cas_item"]." égale à", "label" => "Visible si attribut SSO ".$options["user_attr_cas_item"]." égale à",
"required" => false,
"disabled" => ($options["mode"]=="delete"?true:false), "disabled" => ($options["mode"]=="delete"?true:false),
]); ]);
} }