diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql index 8abb1bc2..8132b7b9 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql @@ -8,9 +8,8 @@ INSERT IGNORE INTO `niveau01` (`id`, `label`, `siren`) VALUES (-100, 'Interne', 'SIREN'); INSERT IGNORE INTO `user` (`id`, `niveau01_id`, `username`, `firstname`, `lastname`, `password`, `email`, `avatar`, `role`,`siren`,`authlevel`) VALUES -(-100, -100, 'admin', 'Administrateur', 'Cadoles', '{SSHA}mjxx1N7FQauOJjM/wcrdc9MuhhBffobd -', 'admin@eole27.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', 'SIREN', 'simple'); - +(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}YAgr/O4uRUcWbNTTnUPNUYGt9TyvjbjJ +', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple'); TRUNCATE TABLE sidebar; diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/CoreController.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/CoreController.php index 6609b157..16bda3f4 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/CoreController.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/CoreController.php @@ -57,6 +57,8 @@ class CoreController extends Controller if($user) { $notices=$em->getRepository("CadolesPortalBundle:Notice")->getNoticeToRead($user); if(! $notices->isEmpty()) { + $notices=$em->getRepository("CadolesPortalBundle:Notice")->getNoticeUser($user,false); + return $this->render('CadolesPortalBundle:Notice:mustread.html.twig',[ 'useheader' => true, 'usemenu' => false, diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php index 4a60d0b9..8693d5d7 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php @@ -565,7 +565,7 @@ class GroupController extends Controller // Notification mail auprès des managers if($group->getFgcanshare()) { - $text=$user->getUsername()." a été désinscrit dugroupe de travail : ".$group->getLabel(); + $text=$user->getUsername()." a été désinscrit du groupe de travail : ".$group->getLabel(); $template="template"; $mail_params=array( "subject" => $this->get('session')->get('appname')." : ".$user->getUsername()." = Désinscription au groupe de travail ".$group->getLabel()."\n\n".$group->getDescription(), @@ -608,7 +608,7 @@ class GroupController extends Controller // Notification mail auprès des managers if($group->getFgcanshare()) { - $text=$user->getUsername()." a été désinscrit dugroupe de travail : ".$group->getLabel(); + $text=$user->getUsername()." a été désinscrit du groupe de travail : ".$group->getLabel(); $template="template"; $mail_params=array( "subject" => $this->get('session')->get('appname')." : ".$user->getUsername()." = Désinscription au groupe de travail ".$group->getLabel()."\n\n".$group->getDescription(), @@ -662,7 +662,7 @@ class GroupController extends Controller // Permission $permgroup=$this->get('session')->get('permgroup'); - if($access="user") { + if($access=="user") { if($permgroup=="NO_BODY") throw $this->createNotFoundException('Permission denied'); if($permgroup=="ROLE_ANIM" && $this->isGranted('ROLE_USER')) throw $this->createNotFoundException('Permission denied'); } diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php index c76d3647..61e9ee82 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php @@ -564,7 +564,7 @@ class UserController extends Controller // Notification mail auprès des managers if($group->getFgcanshare()) { - $text=$data->getUsername()." a été désinscrit dugroupe de travail : ".$group->getLabel(); + $text=$data->getUsername()." a été désinscrit du groupe de travail : ".$group->getLabel(); $template="template"; $mail_params=array( "subject" => $this->get('session')->get('appname')." : ".$data->getUsername()." = Désinscription au groupe de travail ".$group->getLabel()."\n\n".$group->getDescription(), diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css index a2a103ae..335c07cc 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css @@ -204,9 +204,9 @@ span.item-drag { .grid { list-style-type: none; - margin: 0px; + margin: 0 auto; padding: 0; - width: 100%; + /*width: 100%;*/ min-height: 30px; background: transparent; } @@ -232,6 +232,10 @@ span.item-drag { display: block; } +.grid-item .grid-item-content { + height: 100%; +} + .grid-item .grid-item-content:hover { opacity: 0.8; } diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php index 1a6f9aef..fa2b8b91 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php @@ -1980,11 +1980,12 @@ class PagewidgetController extends Controller $title=$groupshared->getLabel(); $idpage=$groupshared->pagesshared[0]->getId(); + $color=$groupshared->getColor(); $icon=null; if($groupshared->getIcon()) $icon="/".$groupshared->getIcon()->getLabel(); - array_push($mygroups,["title"=>$title,"icon"=>$icon,"id"=>$idpage]); + array_push($mygroups,["title"=>$title,"icon"=>$icon,"id"=>$idpage,"color"=>$color]); } } @@ -2038,6 +2039,11 @@ class PagewidgetController extends Controller $this->getDoctrine()->getRepository("CadolesPortalBundle:Page")->getPagesUser($user,null,$default,$pagesuser,$pagesadmin,$groupsshared); if(is_array($groupsshared)) { foreach($groupsshared as $groupshared) { + // On récupère les info du groupe + $title=$groupshared->getLabel(); + $idpage=$groupshared->pagesshared[0]->getId(); + $color=$groupshared->getColor(); + // On récupère l'ensemble des messages du groupes $messages=$this->getDoctrine()->getRepository("CadolesWebsocketBundle:Message")->findBy(["group"=>$groupshared]); foreach($messages as $key => $message) { @@ -2051,7 +2057,7 @@ class PagewidgetController extends Controller } foreach($messages as $key => $message) { - $tmp=["id" => $message->getId(), "user" => $message->getUser(), "date"=>$message->getSubmitdate(), "topic"=>$message->getTopic()]; + $tmp=["id" => $message->getId(), "user" => $message->getUser(), "date"=>$message->getSubmitdate(), "topic"=>$message->getTopic(), "pageid" => $idpage, "pagetitle" => $title, "color" => $color]; array_push($mymsg,$tmp); } } diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewwidget.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewwidget.html.twig index 6762524d..15866960 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewwidget.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewwidget.html.twig @@ -80,6 +80,8 @@ {% endblock %} {% block localjavascript %} + var optiongrid={columnWidth: '.grid-sizer',itemSelector: '.grid-item', gutter: '.grid-gutter-sizer'}; + $('document').ready(function(){ // Ajustement des frames $(window).resize(function() { @@ -192,7 +194,6 @@ $(".colcontainer .col").css("padding-bottom",""); // Création des grilles d'items - var optiongrid={columnWidth: '.grid-sizer',itemSelector: '.grid-item'}; var grid = $('.grid').masonry(optiongrid); }, update: updateLocalisation @@ -201,7 +202,6 @@ // Création des grilles d'items - var optiongrid={columnWidth: '.grid-sizer', itemSelector: '.grid-item', gutter: '.grid-gutter-sizer'}; $('body').imagesLoaded(function() { var grid = $('.grid').masonry(optiongrid); }); @@ -285,7 +285,6 @@ widget.children(".widgetbody" ).toggle(); // On recalcule les grilles - var optiongrid={columnWidth: '.grid-sizer',itemSelector: '.grid-item'}; var grid = $('.grid').masonry(optiongrid); } @@ -460,7 +459,6 @@ $(".widget[data-id="+idwidget+"]").find(".flux-"+id).show(); } - var optiongrid={columnWidth: '.grid-sizer',itemSelector: '.grid-item'}; var grid = $('.grid').masonry(optiongrid); } @@ -496,7 +494,6 @@ } - var optiongrid={columnWidth: '.grid-sizer',itemSelector: '.grid-item'}; var grid = $('.grid').masonry(optiongrid); } @@ -528,7 +525,6 @@ } - var optiongrid={columnWidth: '.grid-sizer',itemSelector: '.grid-item'}; var grid = $('.grid').masonry(optiongrid); } @@ -546,7 +542,6 @@ ele.show(); ele.removeClass("msg-hidden"); - var optiongrid={columnWidth: '.grid-sizer',itemSelector: '.grid-item'}; var grid = $('.grid').masonry(optiongrid); } diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgroup.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgroup.html.twig index 9cecdf02..b42ca8cf 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgroup.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgroup.html.twig @@ -5,6 +5,7 @@ {% import "@CadolesPortal/Pagewidget/constants.twig" as constants %} +{% set colormain = constants.mycolormain() %} {% set stylewidget = constants.mystylewidget(entity) %} {% set stylewidgetmenu = constants.mystylewidgetmenu(entity) %} {% set stylewidgetheader = constants.mystylewidgetheader(entity) %} @@ -52,7 +53,7 @@ {% for group in groups %}
-
+