Compare commits
No commits in common. "63c710c4fd1f3392cbaef115b10863368c91d8a5" and "f36111076698b5960af11e93b027a9f4b3affe0c" have entirely different histories.
63c710c4fd
...
f361110766
|
@ -49,12 +49,6 @@
|
|||
|
||||
.header.reduit .avatar {height: 25px; }
|
||||
|
||||
.header.reduit #navbar-nameuser
|
||||
{
|
||||
top: 14px;
|
||||
right: 210px;
|
||||
}
|
||||
|
||||
/* ===================== FIN MODE REDUIT ==========================*/
|
||||
|
||||
/* fix defaut d'affichage sur toogle switch */
|
||||
|
@ -63,11 +57,7 @@ body {
|
|||
background: linear-gradient(180deg, var(--main), white,50%);
|
||||
}
|
||||
|
||||
#navbar-nameuser a {
|
||||
color: var(--main, #004d9a) !important;
|
||||
}
|
||||
|
||||
body.eleves, body.grp-National_1, body.grp-eleves {
|
||||
body.eleves, body.grp-National_1 {
|
||||
--colorbody: #ffffff;
|
||||
--main: #169b62;
|
||||
--mainR: 22;
|
||||
|
@ -87,7 +77,7 @@ body.eleves, body.grp-National_1, body.grp-eleves {
|
|||
/* responsables #MAUVE #7D4E5B
|
||||
*/
|
||||
|
||||
body.responsables, body.grp-National_2,body.grp-responsables {
|
||||
body.responsables, body.grp-National_2 {
|
||||
--colorbody: #ffffff;
|
||||
--main: #7d4e5b;
|
||||
--mainR: 125;
|
||||
|
@ -106,7 +96,7 @@ body.responsables, body.grp-National_2,body.grp-responsables {
|
|||
|
||||
|
||||
/* professeurs, enseignants1d #BLEU1 #5770BE */
|
||||
body.professeurs, body.enseignants1d, body.grp-National_3, body.grp-professeurs {
|
||||
body.professeurs, body.enseignants1d, body.grp-National_3 {
|
||||
--colorbody: #ffffff;
|
||||
--main: #5770be;
|
||||
--mainR: 87;
|
||||
|
@ -124,7 +114,7 @@ body.professeurs, body.enseignants1d, body.grp-National_3, body.grp-professeurs
|
|||
}
|
||||
|
||||
/* administratifs, admin #ORANGE #FF6F4C */
|
||||
body.administratifs, body.admin, body.grp-National_4 , body.grp-National_5, body.grp-National_6 , body.grp-administratifs, {
|
||||
body.administratifs, body.admin, body.grp-National_4 , body.grp-National_5, body.grp-National_6 {
|
||||
--colorbody: #ffffff;
|
||||
--main: #ff6f4c;
|
||||
--mainR: 255;
|
||||
|
@ -288,9 +278,7 @@ div.header > a.title > span {
|
|||
}
|
||||
.nav.navbar-top-links.navbar-right > li a:hover {
|
||||
color: var(--fontcolorhover, white) !important;
|
||||
background: var(--light, black) !important;
|
||||
border-radius: 5px;
|
||||
padding-top: 1px;
|
||||
background: var(--fontcolorhoverdark, black) !important;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -200,8 +200,7 @@ class ApiController extends Controller
|
|||
$bookmarks=null;
|
||||
$items=null;
|
||||
$itemcategorys=null;
|
||||
# fixe #31884 "https://" => "//"
|
||||
$weburl="//".$this->getParameter("weburl")."/".$this->getParameter("alias")."/";
|
||||
$weburl="https://".$this->getParameter("weburl")."/".$this->getParameter("alias")."/";
|
||||
|
||||
$em->getRepository("CadolesPortalBundle:Item")->getUserItems($user,$bookmarks,$items,$itemcategorys,null,$ssoitems,3);
|
||||
|
||||
|
|
|
@ -361,7 +361,7 @@ class BlogController extends Controller
|
|||
if($groups[0]) {
|
||||
if($groups[0]->getFgcanshare()) {
|
||||
$pages=$groups[0]->getPages();
|
||||
if($pages[0]) {
|
||||
if($pages) {
|
||||
$idpage=$pages[0]->getId();
|
||||
$groups=$pages[0]->getGroups();
|
||||
$idgroup=$groups[0]->getId();
|
||||
|
|
|
@ -182,7 +182,7 @@ class BlogarticleController extends Controller
|
|||
if($groups[0]) {
|
||||
if($groups[0]->getFgcanshare()) {
|
||||
$pages=$groups[0]->getPages();
|
||||
if($pages[0]) {
|
||||
if($pages) {
|
||||
$idpage=$pages[0]->getId();
|
||||
$groups=$pages[0]->getGroups();
|
||||
$idgroup=$groups[0]->getId();
|
||||
|
|
|
@ -341,7 +341,7 @@ class CalendarController extends Controller
|
|||
if($groups[0]) {
|
||||
if($groups[0]->getFgcanshare()) {
|
||||
$pages=$groups[0]->getPages();
|
||||
if($pages[0]) {
|
||||
if($pages) {
|
||||
$idpage=$pages[0]->getId();
|
||||
$groups=$pages[0]->getGroups();
|
||||
$idgroup=$groups[0]->getId();
|
||||
|
|
|
@ -362,7 +362,7 @@ class ProjectController extends Controller
|
|||
if($groups[0]) {
|
||||
if($groups[0]->getFgcanshare()) {
|
||||
$pages=$groups[0]->getPages();
|
||||
if($pages[0]) {
|
||||
if($pages) {
|
||||
$idpage=$pages[0]->getId();
|
||||
$groups=$pages[0]->getGroups();
|
||||
$idgroup=$groups[0]->getId();
|
||||
|
|
|
@ -207,7 +207,7 @@ class ProjecttaskController extends Controller
|
|||
if($groups[0]) {
|
||||
if($groups[0]->getFgcanshare()) {
|
||||
$pages=$groups[0]->getPages();
|
||||
if($pages[0]) {
|
||||
if($pages) {
|
||||
$idpage=$pages[0]->getId();
|
||||
$groups=$pages[0]->getGroups();
|
||||
$idgroup=$groups[0]->getId();
|
||||
|
|
Loading…
Reference in New Issue