diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/RegistrationType.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/RegistrationType.php index b29f2699..1528adc2 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/RegistrationType.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/RegistrationType.php @@ -78,6 +78,9 @@ class RegistrationType extends AbstractType "label" => $session->get('labelniveau01'), 'placeholder' => '== Choisir '.$session->get('labelniveau01').' ==', "choice_label" => "label", + "query_builder"=> function (EntityRepository $er) { + return $er->createQueryBuilder('niveau01')->orderBy('niveau01.label','ASC'); + }, "disabled" => ($options["mode"]=="delete"?true:false), "attr" => array("class" => "form-control", "style" => "margin-bottom:15px","readonly" => ($options["mode"]=="delete"?true:false)))); diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/UserType.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/UserType.php index 53f840c6..0f7e42f1 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/UserType.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/UserType.php @@ -89,16 +89,16 @@ class UserType extends AbstractType "query_builder"=> function (EntityRepository $er) use($access,$perm,$userid) { if($access=="config") { if($perm) - return $er->createQueryBuilder('niveau01'); + return $er->createQueryBuilder('niveau01')->orderBy('niveau01.label','ASC'); else { - $result=$er->createQueryBuilder("table")->innerJoin("CadolesCoreBundle:UserModo", "usermodo", Join::WITH, "table.id = usermodo.niveau01"); + $result=$er->createQueryBuilder("table")->innerJoin("CadolesCoreBundle:UserModo", "usermodo", Join::WITH, "table.id = usermodo.niveau01")->orderBy('table.label','ASC'); $result->andWhere("usermodo.user = :userid"); $result->setParameter('userid', $userid); return $result; } } else { - return $er->createQueryBuilder('niveau01'); + return $er->createQueryBuilder('niveau01')->orderBy('niveau01.label','ASC'); } }, "disabled" => ($options["mode"]=="delete"||$options["masteridentity"]!="SQL"?true:false), 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 3c1583bd..76925c6d 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 @@ -671,6 +671,13 @@ a.item-heart { margin-top:30px; } +.widget-mini { + display: inline-block; + height:50px; + width:50px; + margin-top:0px; +} + .widgetmenu { right: 20px; position: absolute; diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PageController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PageController.php index 181b47b8..e434de97 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PageController.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PageController.php @@ -455,6 +455,8 @@ class PageController extends Controller // usage soit portal / user / group $usage=$request->query->get('usage'); $groupid=$request->query->get('group'); + $look=$request->query->get('look'); + $selwidget=$request->query->get('selwidget'); $em = $this->getDoctrine()->getManager(); $entity = $em->getRepository($this->labelentity)->find($id); @@ -481,45 +483,7 @@ class PageController extends Controller ]); } } - - // On marque tt les messages comme lu par l'utilisateur - /* Se fait à présent sur le controleur message au moment meme où l'on affiche l'ensemble des messages - if($usage=="group") { - // On calcule le nombre de message non lu pour le groupe - $group=$em->getRepository("CadolesCoreBundle:Group")->find($groupid); - $qb = $em ->createQueryBuilder(); - $tm = $qb ->select($qb->expr()->count('m.id')) - ->from('CadolesWebsocketBundle:Message', 'm') - ->where('m.group = :group') - ->andWhere('m.user != :user') - ->setParameter('group', $group) - ->setParameter('user', $this->getUser()) - ->getQuery()->getSingleScalarResult(); - - $qb = $em ->createQueryBuilder(); - $tr = $qb ->select($qb->expr()->count('m.id')) - ->from('CadolesWebsocketBundle:Message', 'm') - ->where('m.group = :group') - ->andWhere('m.user != :user') - ->andWhere(':user MEMBER OF m.readers') - ->setParameter('group', $group) - ->setParameter('user', $this->getUser()) - ->getQuery()->getSingleScalarResult(); - - if($tm-$tr>0) { - $messages=$em->getRepository("CadolesWebsocketBundle:Message")->findBy(["group"=>$group]); - foreach($messages as $message) { - $readers=$message->getReaders(); - if ( !$readers->contains($this->getUser()) ) { - $message->addReader($this->getUser()); - } - $em->persist($message); - $em->flush(); - } - } - } - */ - + // Compteur de visite if($this->getUser()) { if($groupid) { @@ -587,6 +551,19 @@ class PageController extends Controller // Type Widgets if($entity->getPageCategory()->getId()==2) { + $user=$this->getUser(); + if($user) { + // Sauvegarder les préférences + if($look) $this->setPreference($user,"pagelook",$id,$look); + if($selwidget) $this->setPreference($user,"pageselwidget",$id,$selwidget); + + // Récupérer les préférences + $look=$this->getPreference($user,"pagelook",$id,"view"); + $selwidget=$this->getPreference($user,"pageselwidget",$id,null); + } + + if($look=="list") $entity->setMaxwidth(0); + return $this->render($this->labelentity.':viewwidget.html.twig', [ 'useheader' => ($access=="config"), 'usemenu' => false, @@ -595,6 +572,8 @@ class PageController extends Controller 'access' => $access, 'canupdate' => $canupdate, 'mode' => "view", + 'look' => $look, + 'selwidget' => $selwidget, 'widgets' => $this->getDoctrine()->getRepository("CadolesPortalBundle:Widget")->getWidgetAccess($access,'config'), 'usage' => $usage, 'group' => $groupid @@ -643,7 +622,9 @@ class PageController extends Controller 'mode' => "view", 'widgets' => $this->getDoctrine()->getRepository("CadolesPortalBundle:Widget")->getWidgetAccess($access,'config'), 'usage' => $usage, - 'group' => $group + 'group' => $group, + 'look' => 'view', + 'selwidget' => null, ]); } @@ -720,4 +701,42 @@ class PageController extends Controller } } } + + protected function getPreference($user,$key,$id,$default) { + $preference=$user->getPreference(); + $return=$default; + + if(is_array($preference)) { + if(array_key_exists($key,$preference)) { + if(array_key_exists($id,$preference[$key])) + $return=$preference[$key][$id]; + } + } + + return $return; + } + protected function setPreference($user,$key,$id,$value) { + $preference=$user->getPreference(); + $toupdate=false; + if(!array_key_exists($key,$preference)) { + $toupdate=true; + $preference[$key]=[]; + } + if((!array_key_exists($id,$preference[$key]))) { + $toupdate=true; + $preference[$key][$id]=$value; + } + if($value&&$preference[$key][$id]!=$value) { + $toupdate=true; + $preference[$key][$id]=$value; + } + + // Mise à jour des préferences + if($toupdate) { + $em = $this->getDoctrine()->getManager(); + $user->setPreference($preference); + $em->persist($this->getUser()); + $em->flush(); + } + } } diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagetemplateController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagetemplateController.php index ebf979e5..727948f2 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagetemplateController.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagetemplateController.php @@ -297,7 +297,9 @@ class PagetemplateController extends Controller 'mode' => "viewtemplate", 'widgets' => $this->getDoctrine()->getRepository("CadolesPortalBundle:Widget")->getWidgetAccess($access), 'usage' => "config", - 'group' => "" + 'group' => "", + 'look' => "view", + 'selwidget' => null, ]); } 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 5eed0032..ab8f9148 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php @@ -24,6 +24,18 @@ class PagewidgetController extends Controller private $labelentity="CadolesPortalBundle:Pagewidget"; private $routeprimary="cadoles_portal_config_pagewidget"; + private $entity; + private $page; + private $id; + private $access; + private $look; + private $mini; + private $selwidget; + + private $cansee; + private $canudate; + private $canadd; + private function searchArray($array, $key, $value) { $results = array(); @@ -386,6 +398,36 @@ class PagewidgetController extends Controller } } + protected function setRequest($request,$id,$access) { + $this->em = $this->getDoctrine()->getManager(); + $this->user = $this->getUser(); + $this->id = $id; + $this->access = $access; + $this->look = $request->query->get('look'); + $this->selwidget = $request->query->get('selwidget'); + + // Le widget existe-t-il ? + $this->entity = $this->em->getRepository($this->labelentity)->find($this->id); + if (!$this->entity) throw $this->createNotFoundException('Unable to find entity.'); + + // Permissions + if($this->access=="config") { + $this->canupdate = true; + } + else { + // On s'assure que l'utilisateur à la permission de voir + $this->page=$this->entity->getPage(); + $this->em->getRepository("CadolesPortalBundle:Page")->getPermission($this->user,$this->page,$this->cansee,$this->canupdate); + if(!$this->cansee) throw $this->createNotFoundException('Permission denied'); + } + + // Affichage miniature ? + $this->mini = ($this->look=="list"&&$this->entity->getId()!=$this->selwidget); + + // Préference utilisateur + if(!$this->mini) $this->getPreference($this->entity); + } + protected function getPreference(&$entity) { $user=$this->getUser(); if($user) { @@ -393,466 +435,508 @@ class PagewidgetController extends Controller $id=$entity->getId(); // Preference widgetshowhide - if(is_array($preference)) { - if(array_key_exists("widgetshowhide",$preference)) { - if(array_key_exists($id,$preference["widgetshowhide"])) - $entity->setOpened(($preference["widgetshowhide"][$id]=="true")); + if($this->look=="list") { + $entity->setOpened(true); + $entity->setBorder(false); + } + else { + if(is_array($preference)) { + if(array_key_exists("widgetshowhide",$preference)) { + if(array_key_exists($id,$preference["widgetshowhide"])) + $entity->setOpened(($preference["widgetshowhide"][$id]=="true")); + } } } } } - public function viewurlAction($id,$access="config") { - $em = $this->getDoctrine()->getManager(); - $entity = $em->getRepository($this->labelentity)->find($id); - if (!$entity) throw $this->createNotFoundException('Unable to find entity.'); + protected function getRender($view,$params) { + // Paramétres toujours présent dans un rendu de widget + $allways = [ + 'entity' => $this->entity, + 'canupdate' => $this->canupdate, + 'access' => $this->access, + 'look' => $this->look, + 'mini' => $this->mini, + ]; - // Permissions - if($access=="config") { - $canupdate = true; - } - else { - // On s'assure que l'utilisateur à la permission de voir - $page=$entity->getPage(); - $em->getRepository("CadolesPortalBundle:Page")->getPermission($this->getUser(),$page,$cansee,$canupdate); - if(!$cansee) throw $this->createNotFoundException('Permission denied'); - } + // Parametres spéficiques + $params=array_merge($allways,$params); - // Récupération des paramétres du widget + // Rendu + return $this->render($this->labelentity.':'.$view, $params); + } + + public function viewurlAction(Request $request,$id,$access="config") { + // Récupération de la requete + $this->setRequest($request,$id,$access); + + // Valeur par défaut $url=""; - foreach($entity->getParameter()["fields"] as $parameter) { - if($parameter["id"]=="url") - $url=$parameter["value"]; - } - - // Préference utilisateur - $this->getPreference($entity); - - - // Gestion des url youtuve - $url=str_replace("http://www.youtube.com","https://www.youtube.com",$url); - $url=str_replace("https://www.youtube.com/watch?v=","https://www.youtube.com/embed/",$url); - - // Detecter le type de lien $imagemedia=false; - $pathinfo = pathinfo($url); - // Type image - if(array_key_exists("extension",$pathinfo)) { - if($pathinfo['extension']=="jpg"||$pathinfo['extension']=="gif"||$pathinfo['extension']=="png") { - $imagemedia=true; + // Datas associées au widget + if(!$this->mini) { + // Récupération des paramétres du widget + foreach($this->entity->getParameter()["fields"] as $parameter) { + if($parameter["id"]=="url") + $url=$parameter["value"]; } - } - // Spécifique Deviant Art - if(strpos($url, "images-wixmp") !== false) $imagemedia=true; - - - return $this->render($this->labelentity.':viewurl.html.twig', [ - 'entity' => $entity, - 'canupdate' => $canupdate, + // Gestion des url youtuve + $url=str_replace("http://www.youtube.com","https://www.youtube.com",$url); + $url=str_replace("https://www.youtube.com/watch?v=","https://www.youtube.com/embed/",$url); + + // Detecter le type de lien + $pathinfo = pathinfo($url); + + // Type image + if(array_key_exists("extension",$pathinfo)) { + if($pathinfo['extension']=="jpg"||$pathinfo['extension']=="gif"||$pathinfo['extension']=="png") { + $imagemedia=true; + } + } + + // Spécifique Deviant Art + if(strpos($url, "images-wixmp") !== false) $imagemedia=true; + } + + return $this->getRender('viewurl.html.twig', [ 'url' => $url, 'imagemedia' => $imagemedia, - 'access' => $access ]); } - public function viewurlfixeAction($id,$access="config") { - $em = $this->getDoctrine()->getManager(); - $entity = $em->getRepository($this->labelentity)->find($id); - if (!$entity) throw $this->createNotFoundException('Unable to find entity.'); + public function viewurlfixeAction(Request $request,$id,$access="config") { + // Récupération de la requete + $this->setRequest($request,$id,$access); - // Permissions - if($access=="config") { - $canupdate = true; - } - else { - // On s'assure que l'utilisateur à la permission de voir - $page=$entity->getPage(); - $em->getRepository("CadolesPortalBundle:Page")->getPermission($this->getUser(),$page,$cansee,$canupdate); - if(!$cansee) throw $this->createNotFoundException('Permission denied'); - } - - // Récupération des paramétres du widget + // Valeur par défaut $url=""; - $widgettype= $entity->getWidget(); - $jsons=$widgettype->getParameter(); - $param=array(); - $param["fields"]=array(); - foreach($jsons->fields as $field) { - if($field->id=="url") - $url=$field->value; - } - - // Préference utilisateur - $this->getPreference($entity); - - // Gestion des url youtuve - $url=str_replace("http://www.youtube.com","https://www.youtube.com",$url); - $url=str_replace("https://www.youtube.com/watch?v=","https://www.youtube.com/embed/",$url); - - // Detecter le type de lien $imagemedia=false; - $pathinfo = pathinfo($url); - // Type image - if(array_key_exists("extension",$pathinfo)) { - if($pathinfo['extension']=="jpg"||$pathinfo['extension']=="gif"||$pathinfo['extension']=="png") { - $imagemedia=true; + // Datas associées au widget + if(!$this->mini) { + // Récupération des paramétres du widget + $widgettype= $this->entity->getWidget(); + $jsons=$widgettype->getParameter(); + $param=array(); + $param["fields"]=array(); + foreach($jsons->fields as $field) { + if($field->id=="url") + $url=$field->value; } + + // Gestion des url youtuve + $url=str_replace("http://www.youtube.com","https://www.youtube.com",$url); + $url=str_replace("https://www.youtube.com/watch?v=","https://www.youtube.com/embed/",$url); + + // Detecter le type de lien + $pathinfo = pathinfo($url); + + // Type image + if(array_key_exists("extension",$pathinfo)) { + if($pathinfo['extension']=="jpg"||$pathinfo['extension']=="gif"||$pathinfo['extension']=="png") { + $imagemedia=true; + } + } + + // Spécifique Deviant Art + if(strpos($url, "images-wixmp") !== false) $imagemedia=true; } - // Spécifique Deviant Art - if(strpos($url, "images-wixmp") !== false) $imagemedia=true; - - - return $this->render($this->labelentity.':viewurl.html.twig', [ - 'entity' => $entity, - 'canupdate' => $canupdate, + return $this->getRender('viewurl.html.twig', [ 'url' => $url, - 'imagemedia' => $imagemedia, - 'access' => $access + 'imagemedia' => $imagemedia, ]); } - public function viewitemAction($id,$access="config") { - $em = $this->getDoctrine()->getManager(); - $entity = $em->getRepository($this->labelentity)->find($id); - if (!$entity) throw $this->createNotFoundException('Unable to find entity.'); + public function viewitemAction(Request $request,$id,$access="config") { + // Récupération de la requete + $this->setRequest($request,$id,$access); - // Permissions - if($access=="config") { - $canupdate = true; - } - else { - // On s'assure que l'utilisateur à la permission de voir - $page=$entity->getPage(); - $em->getRepository("CadolesPortalBundle:Page")->getPermission($this->getUser(),$page,$cansee,$canupdate); - if(!$cansee) throw $this->createNotFoundException('Permission denied'); - } - - // Récupération des paramétres du widget + // Valeur par défaut $modedesktop=0; - $iditemcategory=null; - $withbookmark=true; - $search=false; $menu=false; $menuall=true; - foreach($entity->getParameter()["fields"] as $parameter) { - switch($parameter["id"]) { - case "modedesktop": - $modedesktop=$parameter["value"]; - break; + $search=false; + $withbookmark=true; + $bookmarks=null; + $itemsordered=null; + $itemcategorys=null; - case "withbookmark": - $withbookmark=$parameter["value"]; - break; + // Datas associées au widget + if(!$this->mini) { + // Récupération des paramétres du widget + $iditemcategory=null; + foreach($this->entity->getParameter()["fields"] as $parameter) { + switch($parameter["id"]) { + case "modedesktop": + $modedesktop=$parameter["value"]; + break; - case "itemcategory": - $iditemcategory=$parameter["value"]; - if($iditemcategory) $itemcategoryfilter=$em->getRepository("CadolesPortalBundle:Itemcategory")->findBy(["id"=>$iditemcategory]); - break; + case "withbookmark": + $withbookmark=$parameter["value"]; + break; - case "search": - $search=($parameter["value"]==1); - break; + case "itemcategory": + $iditemcategory=$parameter["value"]; + if($iditemcategory) $itemcategoryfilter=$this->em->getRepository("CadolesPortalBundle:Itemcategory")->findBy(["id"=>$iditemcategory]); + break; - case "menu": - $menu=($parameter["value"]==1); - break; + case "search": + $search=($parameter["value"]==1); + break; - case "menuall": - $menuall=($parameter["value"]==1); - break; + case "menu": + $menu=($parameter["value"]==1); + break; + case "menuall": + $menuall=($parameter["value"]==1); + break; + + } } + + // Profilage + $itemsordered = $this->em->getRepository("CadolesPortalBundle:Item")->getUserItems($this->user,$bookmarks,$items,$itemcategorys,$iditemcategory,$withbookmark,false); } - - // Préference utilisateur - $this->getPreference($entity); - - // Profilage - $user=$this->getUser(); - $itemsordered = $em->getRepository("CadolesPortalBundle:Item")->getUserItems($user,$bookmarks,$items,$itemcategorys,$iditemcategory,$withbookmark); // Render - return $this->render($this->labelentity.':viewitem.html.twig', [ - 'entity' => $entity, - 'canadd' => ($user), - 'canupdate' => $canupdate, + return $this->getRender('viewitem.html.twig', [ + 'canadd' => ($this->user), 'modedesktop' => $modedesktop, - 'items' => $itemsordered, - 'itemcategorys' => $itemcategorys, - 'bookmarks' => $bookmarks, - 'access' => $access, 'search' => $search, 'menu' => $menu, 'menuall' => $menuall, 'withbookmark' => $withbookmark, + 'bookmarks' => $bookmarks, + 'items' => $itemsordered, + 'itemcategorys' => $itemcategorys, ]); } - public function viewitemessentialAction($id,$access="config") { - $em = $this->getDoctrine()->getManager(); - $entity = $em->getRepository($this->labelentity)->find($id); - if (!$entity) throw $this->createNotFoundException('Unable to find entity.'); + public function viewitemessentialAction(Request $request,$id,$access="config") { + // Récupération de la requete + $this->setRequest($request,$id,$access); - // Permissions - if($access=="config") { - $canupdate = true; - } - else { - // On s'assure que l'utilisateur à la permission de voir - $page=$entity->getPage(); - $em->getRepository("CadolesPortalBundle:Page")->getPermission($this->getUser(),$page,$cansee,$canupdate); - if(!$cansee) throw $this->createNotFoundException('Permission denied'); - } - - // Récupération des paramétres du widget + // Valeur par défaut $modedesktop=0; - foreach($entity->getParameter()["fields"] as $parameter) { - switch($parameter["id"]) { - case "modedesktop": - $modedesktop=$parameter["value"]; - break; + $itemsordered=null; + $bookmarks=null; + + // Datas associées au widget + if(!$this->mini) { + // Récupération des paramétres du widget + foreach($this->entity->getParameter()["fields"] as $parameter) { + switch($parameter["id"]) { + case "modedesktop": + $modedesktop=$parameter["value"]; + break; + } } - } - // Préference utilisateur - $this->getPreference($entity); - - // Profilage - $user=$this->getUser(); - $roles=($user?$user->getRoles():["ROLE_ANONYME"]); - $groups=($user?$user->getGroups():[]); - $niveau01=($user?$user->getNiveau01():[]); - - // Bookmark de l'utilisateur - $bookmarks = array(); - if($user) - $bookmarks=$em->getRepository("CadolesPortalBundle:Bookmark")->findBy(["user"=>$user]); - - // Bookmark lié à un item - $bookmarksitems=new ArrayCollection(); - foreach($bookmarks as $bookmark) { - if($bookmark->getItem()) $bookmarksitems->add($bookmark->getItem()); + // Profilage + $itemsordered = $this->em->getRepository("CadolesPortalBundle:Item")->getUserItems($this->user,$bookmarks,$items,$itemcategorys,null,true,true); } - // Initialisation du calcul des items - $items=new ArrayCollection(); - - // Récupération des items par rôles - foreach($roles as $role) { - $qb = $em->createQueryBuilder(); - $qb->select('item') - ->from("CadolesPortalBundle:Item", 'item') - ->where($qb->expr()->like('item.roles', $qb->expr()->literal("%$role%"))) - ->andWhere("item.essential=:flag") - ->setParameter("flag",true); - - $itemsroles=$qb->getQuery()->getResult(); - foreach($itemsroles as $itemrole) { - if(!$bookmarksitems->contains($itemrole) && !$items->contains($itemrole)) $items->add($itemrole); - } - } - - // Récupération des items par group - foreach($groups as $group) { - $qb = $em->createQueryBuilder(); - $qb->select('item') - ->from("CadolesPortalBundle:Item", 'item') - ->where(":group MEMBER OF item.groups") - ->andWhere("item.essential=:flag") - ->setParameter("flag",true) - ->setParameter("group",$group->getGroup()); - - $itemsgroups=$qb->getQuery()->getResult(); - foreach($itemsgroups as $itemgroup) { - if(!$bookmarksitems->contains($itemgroup) && !$items->contains($itemgroup)) $items->add($itemgroup); - } - } - - // Récupération des items par niveau01 - if($niveau01) { - $qb = $em->createQueryBuilder(); - $qb->select('item') - ->from("CadolesPortalBundle:Item", 'item') - ->where(":niveau01 MEMBER OF item.niveau01s") - ->andWhere("item.essential=:flag") - ->setParameter("flag",true) - ->setParameter("niveau01",$niveau01); - - $itemsniveau01s=$qb->getQuery()->getResult(); - foreach($itemsniveau01s as $itemniveau01) { - if(!$bookmarksitems->contains($itemniveau01) && !$items->contains($itemniveau01)) $items->add($itemniveau01); - } - } - - // Trie des items - $itemsordered = $items->getIterator(); - $itemsordered->uasort(function ($first, $second) { - if((int) $first->getRowOrder() > (int) $second->getRowOrder()) - $return=1; - elseif((int) $first->getRowOrder() == (int) $second->getRowOrder()) { - if($first->getTitle() > $second->getTitle()) - $return=1; - else - $return=-1; - } - else - $return=-1; - - return $return; - }); - // Render - return $this->render($this->labelentity.':viewitemessential.html.twig', [ - 'entity' => $entity, - 'canadd' => ($user), - 'canupdate' => $canupdate, + return $this->getRender('viewitemessential.html.twig', [ + 'canadd' => ($this->user), 'modedesktop' => $modedesktop, 'items' => $itemsordered, - 'bookmarks' => $bookmarks, - 'access' => $access, + 'bookmarks' => $bookmarks, ]); } - public function viewalertAction($id,$access="config") { - $em = $this->getDoctrine()->getManager(); - $entity = $em->getRepository($this->labelentity)->find($id); - if (!$entity) throw $this->createNotFoundException('Unable to find entity.'); + public function viewalertAction(Request $request,$id,$access="config") { + // Récupération de la requete + $this->setRequest($request,$id,$access); - // Permissions - if($access=="config") { - $canupdate = true; - } - else { - // On s'assure que l'utilisateur à la permission de voir - $page=$entity->getPage(); - $em->getRepository("CadolesPortalBundle:Page")->getPermission($this->getUser(),$page,$cansee,$canupdate); - if(!$cansee) throw $this->createNotFoundException('Permission denied'); - } + // Valeur par défaut + $alertsordered=null; - // Récupération des paramétres du widget - $idalertcategory=null; - $alertcategoryfilter=null; - foreach($entity->getParameter()["fields"] as $parameter) { - switch($parameter["id"]) { - case "alertcategory": - $idalertcategory=$parameter["value"]; - if($idalertcategory) $alertcategoryfilter=$em->getRepository("CadolesPortalBundle:Alertcategory")->find($idalertcategory); - break; + // Datas associées au widget + if(!$this->mini) { + // Récupération des paramétres du widget + $idalertcategory=null; + $alertcategoryfilter=null; + foreach($this->entity->getParameter()["fields"] as $parameter) { + switch($parameter["id"]) { + case "alertcategory": + $idalertcategory=$parameter["value"]; + if($idalertcategory) $alertcategoryfilter=$this->em->getRepository("CadolesPortalBundle:Alertcategory")->find($idalertcategory); + break; + } } - } - // Préference utilisateur - $this->getPreference($entity); - - // Profilage - $user=$this->getUser(); - $alertsordered=$em->getRepository("CadolesPortalBundle:Alert")->getUserAlerts($user,$idalertcategory,$alertcategoryfilter); + // Profilage + $alertsordered=$this->em->getRepository("CadolesPortalBundle:Alert")->getUserAlerts($this->user,$idalertcategory,$alertcategoryfilter); + } // Render - return $this->render($this->labelentity.':viewalert.html.twig', [ - 'entity' => $entity, - 'canupdate' => $canupdate, + return $this->getRender('viewalert.html.twig', [ 'alerts' => $alertsordered, - 'access' => $access ]); } - public function viewfluxAction($id,$access="config") { - $em = $this->getDoctrine()->getManager(); - $entity = $em->getRepository($this->labelentity)->find($id); - if (!$entity) throw $this->createNotFoundException('Unable to find entity.'); + public function viewfluxAction(Request $request,$id,$access="config") { + // Récupération de la requete + $this->setRequest($request,$id,$access); - // Permissions - if($access=="config") { - $canupdate = true; - } - else { - // On s'assure que l'utilisateur à la permission de voir - $page=$entity->getPage(); - $em->getRepository("CadolesPortalBundle:Page")->getPermission($this->getUser(),$page,$cansee,$canupdate); - if(!$cansee) throw $this->createNotFoundException('Permission denied'); - } - - // Récupération des paramétres du widget + // Valeur par défaut $modelist=0; - foreach($entity->getParameter()["fields"] as $parameter) { - switch($parameter["id"]) { - case "modelist": - $modelist=$parameter["value"]; - break; - } - } + $fluxsordered=null; + $feeds=null; - // Préference utilisateur - $this->getPreference($entity); - - // Profilage - $user=$this->getUser(); - $roles=($user?$user->getRoles():["ROLE_ANONYME"]); - $groups=($user?$user->getGroups():[]); - - // Initialisation du calcul des fluxs - $fluxs=new ArrayCollection(); - - // Récupération des fluxs par rôles - foreach($roles as $role) { - $qb = $em->createQueryBuilder(); - $qb->select('flux') - ->from("CadolesPortalBundle:Flux", 'flux') - ->where($qb->expr()->like('flux.roles', $qb->expr()->literal("%$role%"))); - - $fluxsroles=$qb->getQuery()->getResult(); - foreach($fluxsroles as $fluxrole) { - if(!$fluxs->contains($fluxrole)) $fluxs->add($fluxrole); - } - } - - // Récupération des fluxs par group - foreach($groups as $group) { - $qb = $em->createQueryBuilder(); - $qb->select('flux') - ->from("CadolesPortalBundle:Flux", 'flux') - ->where(":group MEMBER OF flux.groups") - ->setParameter("group",$group->getGroup()); - - $fluxsgroups=$qb->getQuery()->getResult(); - foreach($fluxsgroups as $fluxgroup) { - if(!$fluxs->contains($fluxgroup)) $fluxs->add($fluxgroup); - } - } - - - - $feeds=array(); - $filesystem = new Filesystem(); - - foreach($fluxs as $keyflux => $flux) { - // On regarde si le flux a été lu il y a peu - $toregen=true; - $url=$flux->getUrl(); - - // Feed lié à un user interne - $filecache='uploads/flux/flux-'.$flux->getId().'.txt'; - if(stripos($url,"##userid##")!==false) { - if($user) { - $url=str_replace("##userid##",$user->getId(),$url); - $filecache=$filecache='uploads/flux/flux-'.$user->getId()."-".$flux->getId().'.txt'; + // Datas associées au widget + if(!$this->mini) { + // Récupération des paramétres du widget + foreach($this->entity->getParameter()["fields"] as $parameter) { + switch($parameter["id"]) { + case "modelist": + $modelist=$parameter["value"]; + break; } } - // Si le fichie cache existe + // Profilage + $fluxs=$this->em->getRepository("CadolesPortalBundle:Flux")->getUserFluxs($this->user); + + $feeds=array(); + $filesystem = new Filesystem(); + + // Généraltion du cache associés aux flux + foreach($fluxs as $keyflux => $flux) { + // On regarde si le flux a été lu il y a peu + $toregen=true; + $url=$flux->getUrl(); + + // Feed lié à un user interne + $filecache='uploads/flux/flux-'.$flux->getId().'.txt'; + if(stripos($url,"##userid##")!==false) { + if($user) { + $url=str_replace("##userid##",$user->getId(),$url); + $filecache=$filecache='uploads/flux/flux-'.$user->getId()."-".$flux->getId().'.txt'; + } + } + + // Si le fichie cache existe + if($filesystem->exists($filecache)) { + // On récupère la date de modification du fichier + $timestampfile = filemtime($filecache); + $datetimeFormat = 'Y-m-d H:i:s'; + $datefile = new \DateTime(); + $datefile->setTimestamp($timestampfile); + + // On ajoute 30mn + $datefile->add(new \DateInterval('PT30M')); + + // Si la date est inférieur à maintenant on regénère le flux + $now = new \DateTime(); + if($datefile>=$now) { + $toregen=false; + $backup = unserialize(file_get_contents($filecache)); + $feeds=array_merge($feeds,$backup); + if(empty($backup)) unset($fluxs[$keyflux]); + } + } + + // Si le fichier est trop ancien on relit le flus + if($toregen) { + $PROXYactivate = $this->em->getRepository("CadolesCoreBundle:Config")->find("PROXYactivate")->getValue(); + $weburl=$this->getParameter('weburl'); + + if(stripos($url,"/")==0) { + $url="https://".$weburl.$url; + $PROXYactivate=false; + } + if(stripos($url,"https://".$weburl)===0) $PROXYactivate=false; + if(stripos($url,"http://".$weburl)===0) $PROXYactivate=false; + + if($PROXYactivate) { + $PROXYserver = $this->em->getRepository("CadolesCoreBundle:Config")->find("PROXYserver")->getValue(); + $PROXYport = $this->em->getRepository("CadolesCoreBundle:Config")->find("PROXYport")->getValue(); + $clientguzzle = new \GuzzleHttp\Client(array('timeout' => 3,'verify'=>false,'proxy' => ['http' => 'http://'.$PROXYserver.':'.$PROXYport,'https' => 'http://'.$PROXYserver.':'.$PROXYport])); + } + else + $clientguzzle = new \GuzzleHttp\Client(['timeout' => 3,'verify'=>false]); + + try { + $clientguzzle->request('GET', $url); + } catch (RequestException $e) { + if ($e->hasResponse()) { + continue; + } + } + + // On lit le flux rss + $client = new \FeedIo\Adapter\Guzzle\Client($clientguzzle); + $logger = new \Psr\Log\NullLogger(); + $feedIo = new \FeedIo\FeedIo($client, $logger); + + try { + $result = $feedIo->read($url); + } + catch (\Exception $e) { + $result=null; + } + + if($result) { + $feedtitle = $result->getFeed()->getTitle(); + + + $backup=[]; + + // Pour chaque articles + $nbflux=0; + foreach ($result->getFeed() as $item) { + $title = $item->getTitle(); + $link = $item->getLink(); + $description = substr(strip_tags($item->getDescription()),0,250); + $description = str_replace("¶","",$description); + $date = $item->getLastModified(); + $dateformat = ($date?$item->getLastModified()->format('d/m/Y H:i:s'):""); + $content = $item->getDescription(); + $media = $item->getMedias(); + $mediaurl = ""; + + foreach ($item->getMedias() as $itemMedia) { + if($itemMedia->getType()=="image/jpeg") + $mediaurl=$itemMedia->getUrl(); + } + + foreach ($item->getAllElements() as $element) { + + if($element->getName()=="content:encoded") + $content = $element->getValue(); + } + + if($mediaurl!="") { + $imgurl=$mediaurl; + } + else { + // Récupérer la première image du contenu + $imgcontent=""; + $imgurl=""; + $imgstart = stripos($content,"",$imgstart); + $imgcontent=substr($content,$imgstart,$imgend-$imgstart+1); + + $imgstart = stripos($imgcontent,"src="); + $imgurl=substr($imgcontent,$imgstart+5); + $imgend = stripos($imgurl,'"'); + + if($imgend===false) $imgend = stripos($imgurl,"'"); + $imgurl=substr($imgurl,0,$imgend); + } + } + + // Garder le flux + $tmp=array( + "feedtitle" => $feedtitle, + "title" => $title, + "link" => $link, + "description" => $description, + "date" => $date, + "dateformat" => $dateformat, + "content" => $content, + "image" => $imgurl, + "color" => $flux->getColor(), + "fluxid" => $flux->getId(), + "fluxtitle" => $flux->getTitle(), + ); + + array_push($feeds,$tmp); + array_push($backup,$tmp); + + $nbflux++; + if($nbflux>=$flux->getMaxread()&&$flux->getMaxread()>0) break; + } + + + if($nbflux==0) unset($fluxs[$keyflux]); + + // On sauvegarde le résultat en fichier on rechargera son contenu que s'il n'a pas été lu depuis 30mn + $filesystem->dumpFile($filecache, serialize($backup)); + } + } + } + + // Trie des fluxs + $fluxsordered = $fluxs->getIterator(); + $fluxsordered->uasort(function ($first, $second) { + return (int) $first->getRowOrder() > (int) $second->getRowOrder() ? 1 : -1; + }); + + // Trie des feeds + $libelle=array(); + foreach ($feeds as $key => $valeur) { + $libelle[$key] = $valeur["date"]; + } + array_multisort($libelle, SORT_DESC, $feeds); + } + + // Render + return $this->getRender('viewflux.html.twig', [ + 'modelist' => $modelist, + 'fluxs' => $fluxsordered, + 'feeds' => $feeds, + ]); + } + + + public function viewrssAction(Request $request,$id,$access="config") { + // Récupération de la requete + $this->setRequest($request,$id,$access); + + // Valeur par défaut + $modelist=0; + $fluxs=["id"=>0]; + $feeds=null; + + // Datas associées au widget + if(!$this->mini) { + // Récupération des paramétres du widget + $url=""; + $nbarticle="_blank"; + $modelist=0; + foreach($this->entity->getParameter()["fields"] as $parameter) { + switch($parameter["id"]) { + case "url": + $url=$parameter["value"]; + break; + case "nbarticle": + $nbarticle=$parameter["value"]; + break; + case "modelist": + $modelist=$parameter["value"]; + break; + } + } + + // On regarde si le flux a été lu il y a peu + $toregen=true; + $filecache=$filecache='uploads/flux/widget-'.$id.'.txt'; + $user=$this->getUser(); + if(stripos($url,"##userid##")!==false) { + if($user) { + $url=str_replace("##userid##",$user->getId(),$url); + $filecache=$filecache='uploads/flux/widget-'.$user->getId()."-".$id.'.txt'; + } + } + + $filesystem = new Filesystem(); if($filesystem->exists($filecache)) { // On récupère la date de modification du fichier $timestampfile = filemtime($filecache); $datetimeFormat = 'Y-m-d H:i:s'; $datefile = new \DateTime(); $datefile->setTimestamp($timestampfile); - + // On ajoute 30mn $datefile->add(new \DateInterval('PT30M')); @@ -860,58 +944,62 @@ class PagewidgetController extends Controller $now = new \DateTime(); if($datefile>=$now) { $toregen=false; - $backup = unserialize(file_get_contents($filecache)); - $feeds=array_merge($feeds,$backup); - if(empty($backup)) unset($fluxs[$keyflux]); + $feeds = unserialize(file_get_contents($filecache)); } } // Si le fichier est trop ancien on relit le flus if($toregen) { - $PROXYactivate = $em->getRepository("CadolesCoreBundle:Config")->find("PROXYactivate")->getValue(); + // Connexion au client + $PROXYactivate = $this->em->getRepository("CadolesCoreBundle:Config")->find("PROXYactivate")->getValue(); $weburl=$this->getParameter('weburl'); - if(stripos($url,"/")==0) { $url="https://".$weburl.$url; $PROXYactivate=false; } if(stripos($url,"https://".$weburl)===0) $PROXYactivate=false; - if(stripos($url,"http://".$weburl)===0) $PROXYactivate=false; - + if(stripos($url,"http://".$weburl)===0) $PROXYactivate=false; + if($PROXYactivate) { - $PROXYserver = $em->getRepository("CadolesCoreBundle:Config")->find("PROXYserver")->getValue(); - $PROXYport = $em->getRepository("CadolesCoreBundle:Config")->find("PROXYport")->getValue(); + $PROXYserver = $this->em->getRepository("CadolesCoreBundle:Config")->find("PROXYserver")->getValue(); + $PROXYport = $this->em->getRepository("CadolesCoreBundle:Config")->find("PROXYport")->getValue(); $clientguzzle = new \GuzzleHttp\Client(array('timeout' => 3,'verify'=>false,'proxy' => ['http' => 'http://'.$PROXYserver.':'.$PROXYport,'https' => 'http://'.$PROXYserver.':'.$PROXYport])); } else - $clientguzzle = new \GuzzleHttp\Client(['timeout' => 3,'verify'=>false]); - + $clientguzzle = new \GuzzleHttp\Client(array('timeout' => 3,'verify'=>false)); + try { $clientguzzle->request('GET', $url); } catch (RequestException $e) { if ($e->hasResponse()) { - continue; + // Render + $feeds=[]; + return $this->getRender('viewflux.html.twig', [ + 'fluxs' => $fluxs, + 'feeds' => $feeds, + 'modelist' => $modelist, + ]); } } - - // On lit le flux rss + $client = new \FeedIo\Adapter\Guzzle\Client($clientguzzle); $logger = new \Psr\Log\NullLogger(); $feedIo = new \FeedIo\FeedIo($client, $logger); + $feeds=array(); + + // On lit le flux rss try { $result = $feedIo->read($url); } catch (\Exception $e) { $result=null; } - + if($result) { $feedtitle = $result->getFeed()->getTitle(); - $backup=[]; - // Pour chaque articles $nbflux=0; foreach ($result->getFeed() as $item) { @@ -931,7 +1019,6 @@ class PagewidgetController extends Controller } foreach ($item->getAllElements() as $element) { - if($element->getName()=="content:encoded") $content = $element->getValue(); } @@ -947,7 +1034,7 @@ class PagewidgetController extends Controller if($imgstart!== false) { $imgend = stripos($content,">",$imgstart); $imgcontent=substr($content,$imgstart,$imgend-$imgstart+1); - + $imgstart = stripos($imgcontent,"src="); $imgurl=substr($imgcontent,$imgstart+5); $imgend = stripos($imgurl,'"'); @@ -956,10 +1043,9 @@ class PagewidgetController extends Controller $imgurl=substr($imgurl,0,$imgend); } } - - // Garder le flux - $tmp=array( + // Garder le flux + array_push($feeds,array( "feedtitle" => $feedtitle, "title" => $title, "link" => $link, @@ -968,260 +1054,40 @@ class PagewidgetController extends Controller "dateformat" => $dateformat, "content" => $content, "image" => $imgurl, - "color" => $flux->getColor(), - "fluxid" => $flux->getId(), - "fluxtitle" => $flux->getTitle(), - ); - - array_push($feeds,$tmp); - array_push($backup,$tmp); + // "color" => $flux->getColor(), + "fluxid" => 0, + "fluxtitle" => $this->entity->getName(), + )); $nbflux++; - if($nbflux>=$flux->getMaxread()&&$flux->getMaxread()>0) break; + if($nbflux>=$nbarticle&&$nbarticle>0) break; } - if($nbflux==0) unset($fluxs[$keyflux]); - + $libelle=array(); + foreach ($feeds as $key => $valeur) { + $libelle[$key] = $valeur["date"]; + } + array_multisort($libelle, SORT_DESC, $feeds); + // On sauvegarde le résultat en fichier on rechargera son contenu que s'il n'a pas été lu depuis 30mn - $filesystem->dumpFile($filecache, serialize($backup)); + $filesystem->dumpFile($filecache, serialize($feeds)); } } - } - - // Trie des fluxs - $fluxsordered = $fluxs->getIterator(); - $fluxsordered->uasort(function ($first, $second) { - return (int) $first->getRowOrder() > (int) $second->getRowOrder() ? 1 : -1; - }); - - // Trie des feeds - $libelle=array(); - foreach ($feeds as $key => $valeur) { - $libelle[$key] = $valeur["date"]; - } - array_multisort($libelle, SORT_DESC, $feeds); - - // Render - return $this->render($this->labelentity.':viewflux.html.twig', [ - 'entity' => $entity, - 'canupdate' => $canupdate, - 'modelist' => $modelist, - 'fluxs' => $fluxsordered, - 'access' => $access, - 'feeds' => $feeds, - - ]); - } - - - public function viewrssAction($id,$access="config") { - $em = $this->getDoctrine()->getManager(); - $entity = $em->getRepository($this->labelentity)->find($id); - if (!$entity) throw $this->createNotFoundException('Unable to find entity.'); - - // Permissions - if($access=="config") { - $canupdate = true; - } - else { - // On s'assure que l'utilisateur à la permission de voir - $page=$entity->getPage(); - $em->getRepository("CadolesPortalBundle:Page")->getPermission($this->getUser(),$page,$cansee,$canupdate); - if(!$cansee) throw $this->createNotFoundException('Permission denied'); - } - - // Récupération des paramétres du widget - $url=""; - $nbarticle="_blank"; - $modelist=0; - foreach($entity->getParameter()["fields"] as $parameter) { - switch($parameter["id"]) { - case "url": - $url=$parameter["value"]; - break; - case "nbarticle": - $nbarticle=$parameter["value"]; - break; - case "modelist": - $modelist=$parameter["value"]; - break; - } - } - - // Préference utilisateur - $this->getPreference($entity); - - // On regarde si le flux a été lu il y a peu - $toregen=true; - $filecache=$filecache='uploads/flux/widget-'.$id.'.txt'; - $user=$this->getUser(); - if(stripos($url,"##userid##")!==false) { - if($user) { - $url=str_replace("##userid##",$user->getId(),$url); - $filecache=$filecache='uploads/flux/widget-'.$user->getId()."-".$id.'.txt'; - } - } - - $filesystem = new Filesystem(); - if($filesystem->exists($filecache)) { - // On récupère la date de modification du fichier - $timestampfile = filemtime($filecache); - $datetimeFormat = 'Y-m-d H:i:s'; - $datefile = new \DateTime(); - $datefile->setTimestamp($timestampfile); - - // On ajoute 30mn - $datefile->add(new \DateInterval('PT30M')); - - // Si la date est inférieur à maintenant on regénère le flux - $now = new \DateTime(); - if($datefile>=$now) { - $toregen=false; - $feeds = unserialize(file_get_contents($filecache)); - } - } - - // Si le fichier est trop ancien on relit le flus - if($toregen) { - // Connexion au client - $PROXYactivate = $em->getRepository("CadolesCoreBundle:Config")->find("PROXYactivate")->getValue(); - $weburl=$this->getParameter('weburl'); - if(stripos($url,"/")==0) { - $url="https://".$weburl.$url; - $PROXYactivate=false; - } - if(stripos($url,"https://".$weburl)===0) $PROXYactivate=false; - if(stripos($url,"http://".$weburl)===0) $PROXYactivate=false; - - if($PROXYactivate) { - $PROXYserver = $em->getRepository("CadolesCoreBundle:Config")->find("PROXYserver")->getValue(); - $PROXYport = $em->getRepository("CadolesCoreBundle:Config")->find("PROXYport")->getValue(); - $clientguzzle = new \GuzzleHttp\Client(array('timeout' => 3,'verify'=>false,'proxy' => ['http' => 'http://'.$PROXYserver.':'.$PROXYport,'https' => 'http://'.$PROXYserver.':'.$PROXYport])); - } - else - $clientguzzle = new \GuzzleHttp\Client(array('timeout' => 3,'verify'=>false)); - - try { - $clientguzzle->request('GET', $url); - } catch (RequestException $e) { - if ($e->hasResponse()) { - // Render - $feeds=[]; - return $this->render($this->labelentity.':viewflux.html.twig', [ - 'entity' => $entity, - 'canupdate' => $canupdate, - 'access' => $access, - 'feeds' => $feeds, - ]); - } - } - - $client = new \FeedIo\Adapter\Guzzle\Client($clientguzzle); - $logger = new \Psr\Log\NullLogger(); - $feedIo = new \FeedIo\FeedIo($client, $logger); - - $feeds=array(); - - // On lit le flux rss - try { - $result = $feedIo->read($url); - } - catch (\Exception $e) { - $result=null; - } - - if($result) { - $feedtitle = $result->getFeed()->getTitle(); - - - // Pour chaque articles - $nbflux=0; - foreach ($result->getFeed() as $item) { - $title = $item->getTitle(); - $link = $item->getLink(); - $description = substr(strip_tags($item->getDescription()),0,250); - $description = str_replace("¶","",$description); - $date = $item->getLastModified(); - $dateformat = ($date?$item->getLastModified()->format('d/m/Y H:i:s'):""); - $content = $item->getDescription(); - $media = $item->getMedias(); - $mediaurl = ""; - - foreach ($item->getMedias() as $itemMedia) { - if($itemMedia->getType()=="image/jpeg") - $mediaurl=$itemMedia->getUrl(); - } - - foreach ($item->getAllElements() as $element) { - if($element->getName()=="content:encoded") - $content = $element->getValue(); - } - - if($mediaurl!="") { - $imgurl=$mediaurl; - } - else { - // Récupérer la première image du contenu - $imgcontent=""; - $imgurl=""; - $imgstart = stripos($content,"",$imgstart); - $imgcontent=substr($content,$imgstart,$imgend-$imgstart+1); - - $imgstart = stripos($imgcontent,"src="); - $imgurl=substr($imgcontent,$imgstart+5); - $imgend = stripos($imgurl,'"'); - - if($imgend===false) $imgend = stripos($imgurl,"'"); - $imgurl=substr($imgurl,0,$imgend); - } - } - - // Garder le flux - array_push($feeds,array( - "feedtitle" => $feedtitle, - "title" => $title, - "link" => $link, - "description" => $description, - "date" => $date, - "dateformat" => $dateformat, - "content" => $content, - "image" => $imgurl, - // "color" => $flux->getColor(), - "fluxid" => 0, - "fluxtitle" => $entity->getName(), - )); - - $nbflux++; - if($nbflux>=$nbarticle&&$nbarticle>0) break; - } - - - $libelle=array(); - foreach ($feeds as $key => $valeur) { - $libelle[$key] = $valeur["date"]; - } - array_multisort($libelle, SORT_DESC, $feeds); - - // On sauvegarde le résultat en fichier on rechargera son contenu que s'il n'a pas été lu depuis 30mn - $filesystem->dumpFile($filecache, serialize($feeds)); - } } // Render - return $this->render($this->labelentity.':viewflux.html.twig', [ - 'entity' => $entity, - 'canupdate' => $canupdate, - 'fluxs' => ["id"=>0], - 'access' => $access, + return $this->getRender('viewflux.html.twig', [ + 'fluxs' => $fluxs, 'feeds' => $feeds, 'modelist' => $modelist, ]); } - public function viewbookmarkAction($id,$access="config") { + public function viewbookmarkAction(Request $request,$id,$access="config") { + $look=$request->query->get('look'); + $selwidget=$request->query->get('selwidget'); + $em = $this->getDoctrine()->getManager(); $entity = $em->getRepository($this->labelentity)->find($id); if (!$entity) throw $this->createNotFoundException('Unable to find entity.'); @@ -1266,10 +1132,15 @@ class PagewidgetController extends Controller 'modedesktop' => $modedesktop, 'bookmarks' => $bookmarks, 'access' => $access, + 'look' => $look, + 'mini' => ($look=="list"&&$entity->getId()!=$selwidget), ]); } - public function viewlinkAction($id,$access="config") { + public function viewlinkAction(Request $request,$id,$access="config") { + $look=$request->query->get('look'); + $selwidget=$request->query->get('selwidget'); + $em = $this->getDoctrine()->getManager(); $entity = $em->getRepository($this->labelentity)->find($id); if (!$entity) throw $this->createNotFoundException('Unable to find entity.'); @@ -1310,10 +1181,15 @@ class PagewidgetController extends Controller 'url' => $url, 'target' => $target, 'access' => $access, + 'look' => $look, + 'mini' => ($look=="list"&&$entity->getId()!=$selwidget), ]); } - public function vieweditorAction($id,$access="config") { + public function vieweditorAction(Request $request,$id,$access="config") { + $look=$request->query->get('look'); + $selwidget=$request->query->get('selwidget'); + $em = $this->getDoctrine()->getManager(); $entity = $em->getRepository($this->labelentity)->find($id); if (!$entity) throw $this->createNotFoundException('Unable to find entity.'); @@ -1350,10 +1226,15 @@ class PagewidgetController extends Controller 'canupdate' => $canupdate, 'html' => $html, 'access' => $access, + 'look' => $look, + 'mini' => ($look=="list"&&$entity->getId()!=$selwidget), ]); } - public function viewslideAction($id,$access="config") { + public function viewslideAction(Request $request,$id,$access="config") { + $look=$request->query->get('look'); + $selwidget=$request->query->get('selwidget'); + $em = $this->getDoctrine()->getManager(); $entity = $em->getRepository($this->labelentity)->find($id); if (!$entity) throw $this->createNotFoundException('Unable to find entity.'); @@ -1393,10 +1274,15 @@ class PagewidgetController extends Controller 'slides' => $slides, 'interval' => $interval, 'access' => $access, + 'look' => $look, + 'mini' => ($look=="list"&&$entity->getId()!=$selwidget), ]); } - public function viewfileAction($id,$access="config") { + public function viewfileAction(Request $request,$id,$access="config") { + $look=$request->query->get('look'); + $selwidget=$request->query->get('selwidget'); + $em = $this->getDoctrine()->getManager(); $entity = $em->getRepository($this->labelentity)->find($id); if (!$entity) throw $this->createNotFoundException('Unable to find entity.'); @@ -1432,13 +1318,18 @@ class PagewidgetController extends Controller 'access' => $access, 'directory' => "widget-".$id, 'view' => $view, + 'look' => $look, + 'mini' => ($look=="list"&&$entity->getId()!=$selwidget), ]); } - public function viewgaleryAction($id,$access="config") { + public function viewgaleryAction(Request $request,$id,$access="config") { + $look=$request->query->get('look'); + $selwidget=$request->query->get('selwidget'); + $em = $this->getDoctrine()->getManager(); $entity = $em->getRepository($this->labelentity)->find($id); if (!$entity) throw $this->createNotFoundException('Unable to find entity.'); @@ -1491,12 +1382,16 @@ class PagewidgetController extends Controller 'canupdate' => $canupdate, 'files' => $files, 'access' => $access, + 'look' => $look, + 'mini' => ($look=="list"&&$entity->getId()!=$selwidget), ]); } public function viewcalendarAction(Request $request,$id,$access="config") { $usage=$request->query->get('usage'); $group=$request->query->get('group'); + $look=$request->query->get('look'); + $selwidget=$request->query->get('selwidget'); $em = $this->getDoctrine()->getManager(); $entity = $em->getRepository($this->labelentity)->find($id); @@ -1541,13 +1436,17 @@ class PagewidgetController extends Controller 'nbday' => $nbday, 'access' => $access, 'firstcalendar' => $firstcalendar, - 'usage' => $usage + 'usage' => $usage, + 'look' => $look, + 'mini' => ($look=="list"&&$entity->getId()!=$selwidget), ]); } public function viewblogAction(Request $request,$id,$access="config") { $usage=$request->query->get('usage'); $group=$request->query->get('group'); + $look=$request->query->get('look'); + $selwidget=$request->query->get('selwidget'); $em = $this->getDoctrine()->getManager(); $entity = $em->getRepository($this->labelentity)->find($id); @@ -1602,13 +1501,17 @@ class PagewidgetController extends Controller 'nbarticle' => $nbarticle, 'access' => $access, 'firstblog' => $firstblog, - 'usage' => $usage + 'usage' => $usage, + 'look' => $look, + 'mini' => ($look=="list"&&$entity->getId()!=$selwidget), ]); } public function viewprojectAction(Request $request,$id,$access="config") { $usage=$request->query->get('usage'); $group=$request->query->get('group'); + $look=$request->query->get('look'); + $selwidget=$request->query->get('selwidget'); $em = $this->getDoctrine()->getManager(); $entity = $em->getRepository($this->labelentity)->find($id); @@ -1676,11 +1579,16 @@ class PagewidgetController extends Controller 'nbarticle' => $nbarticle, 'access' => $access, 'firstproject' => $firstproject, - 'usage' => $usage + 'usage' => $usage, + 'look' => $look, + 'mini' => ($look=="list"&&$entity->getId()!=$selwidget), ]); } - public function viewseparatorAction($id,$access="config") { + public function viewseparatorAction(Request $request,$id,$access="config") { + $look=$request->query->get('look'); + $selwidget=$request->query->get('selwidget'); + $em = $this->getDoctrine()->getManager(); $entity = $em->getRepository($this->labelentity)->find($id); if (!$entity) throw $this->createNotFoundException('Unable to find entity.'); @@ -1721,10 +1629,15 @@ class PagewidgetController extends Controller 'seetitle' => $seetitle, 'seeicon' => $seeicon, 'access' => $access, + 'look' => $look, + 'mini' => ($look=="list"&&$entity->getId()!=$selwidget), ]); } - public function viewclockAction($id,$access="config") { + public function viewclockAction(Request $request,$id,$access="config") { + $look=$request->query->get('look'); + $selwidget=$request->query->get('selwidget'); + $em = $this->getDoctrine()->getManager(); $entity = $em->getRepository($this->labelentity)->find($id); if (!$entity) throw $this->createNotFoundException('Unable to find entity.'); @@ -1754,17 +1667,22 @@ class PagewidgetController extends Controller $this->getPreference($entity); // Render - return $this->render($this->labelentity.':viewurl.html.twig', [ + return $this->render($this->labelentity.':viewframe.html.twig', [ 'entity' => $entity, 'canadd' => $canupdate, 'canupdate' => $canupdate, 'onheader' => true, 'tool' => ($clock==0?"cadoles_portal_user_tool_clockanalogique":"cadoles_portal_user_tool_clocknumerique"), 'access' => $access, + 'look' => $look, + 'mini' => ($look=="list"&&$entity->getId()!=$selwidget), ]); } - public function viewcalculatorAction($id,$access="config") { + public function viewcalculatorAction(Request $request,$id,$access="config") { + $look=$request->query->get('look'); + $selwidget=$request->query->get('selwidget'); + $em = $this->getDoctrine()->getManager(); $entity = $em->getRepository($this->labelentity)->find($id); if (!$entity) throw $this->createNotFoundException('Unable to find entity.'); @@ -1791,10 +1709,15 @@ class PagewidgetController extends Controller 'onheader' => true, 'tool' => "cadoles_portal_user_tool_calculator", 'access' => $access, + 'look' => $look, + 'mini' => ($look=="list"&&$entity->getId()!=$selwidget), ]); } - public function viewappexternalAction($id,$access="config") { + public function viewappexternalAction(Request $request,$id,$access="config") { + $look=$request->query->get('look'); + $selwidget=$request->query->get('selwidget'); + $em = $this->getDoctrine()->getManager(); $entity = $em->getRepository($this->labelentity)->find($id); if (!$entity) throw $this->createNotFoundException('Unable to find entity.'); @@ -1892,12 +1815,16 @@ class PagewidgetController extends Controller 'items' => $items, 'itemcategorys' => $itemcategorys, 'access' => $access, + 'look' => $look, + 'mini' => ($look=="list"&&$entity->getId()!=$selwidget), ]); } public function viewinfoAction(Request $request,$id,$access="config") { $usage=$request->query->get('usage'); - $group=$request->query->get('group'); + $group=$request->query->get('group'); + $look=$request->query->get('look'); + $selwidget=$request->query->get('selwidget'); $user=$this->getUser(); $em = $this->getDoctrine()->getManager(); @@ -1960,12 +1887,16 @@ class PagewidgetController extends Controller 'members' => $members, 'id' => $id, 'idpage' => $page->getId(), + 'look' => $look, + 'mini' => ($look=="list"&&$entity->getId()!=$selwidget), ]); } public function viewchatAction(Request $request,$id,$access="config") { $usage=$request->query->get('usage'); $group=$request->query->get('group'); + $look=$request->query->get('look'); + $selwidget=$request->query->get('selwidget'); $em = $this->getDoctrine()->getManager(); $entity = $em->getRepository($this->labelentity)->find($id); @@ -1999,6 +1930,8 @@ class PagewidgetController extends Controller 'access' => $access, 'usage' => $usage, 'group' => $group, + 'look' => $look, + 'mini' => ($look=="list"&&$entity->getId()!=$selwidget), ]); } @@ -2006,6 +1939,9 @@ class PagewidgetController extends Controller public function viewgroupAction(Request $request,$id,$access="config") { $usage=$request->query->get('usage'); $group=$request->query->get('group'); + $look=$request->query->get('look'); + $selwidget=$request->query->get('selwidget'); + $user=$this->getUser(); $em = $this->getDoctrine()->getManager(); @@ -2049,13 +1985,17 @@ class PagewidgetController extends Controller 'canupdate' => $canupdate, 'usage' => $usage, 'groups' => $mygroups, - + 'look' => $look, + 'mini' => ($look=="list"&&$entity->getId()!=$selwidget), ]); } public function viewgroupmessageAction(Request $request,$id,$access="config") { $usage=$request->query->get('usage'); $group=$request->query->get('group'); + $look=$request->query->get('look'); + $selwidget=$request->query->get('selwidget'); + $user=$this->getUser(); $em = $this->getDoctrine()->getManager(); @@ -2135,13 +2075,17 @@ class PagewidgetController extends Controller 'modelist' => $modelist, 'messages' => $mymsg, 'nbarticle' => $nbarticle, - + 'look' => $look, + 'mini' => ($look=="list"&&$entity->getId()!=$selwidget), ]); } public function viewOnlydocAction(Request $request,$id,$access="config") { $usage=$request->query->get('usage'); $group=$request->query->get('group'); + $look=$request->query->get('look'); + $selwidget=$request->query->get('selwidget'); + $user=$this->getUser(); $em = $this->getDoctrine()->getManager(); @@ -2185,6 +2129,8 @@ class PagewidgetController extends Controller 'access' => $access, 'directory' => $id, 'view' => $view, + 'look' => $look, + 'mini' => ($look=="list"&&$entity->getId()!=$selwidget), ]); } } diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/SlideController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/SlideController.php index 7b51e373..55066a3f 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/SlideController.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/SlideController.php @@ -32,7 +32,7 @@ class SlideController extends Controller // Vérifier que l'on générer un slide if($access=="user") { if($usage=="user") { - $user=$data->getPagewidget()->getPage()->getUser(); + $user=$pagewidget->getPage()->getUser(); if($user!=$this->getUser()) throw $this->createNotFoundException('Permission denied'); } else { @@ -76,7 +76,7 @@ class SlideController extends Controller // Vérifier que l'on générer un slide if($access=="user") { if($usage=="user") { - $user=$data->getPagewidget()->getPage()->getUser(); + $user=$pagewidget->getPage()->getUser(); if($user!=$this->getUser()) throw $this->createNotFoundException('Permission denied'); } else { diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Flux.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Flux.php index 199e1cf9..efd8f436 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Flux.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Flux.php @@ -11,7 +11,8 @@ use Symfony\Component\Validator\Constraints as Assert; /** * @ORM\Entity * @ORM\Table(name="flux") - * @ORM\HasLifecycleCallbacks + * @ORM\HasLifecycleCallbacks. + * @ORM\Entity(repositoryClass="Cadoles\PortalBundle\Repository\FluxRepository") */ class Flux { diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/FluxRepository.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/FluxRepository.php new file mode 100644 index 00000000..7587ee84 --- /dev/null +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/FluxRepository.php @@ -0,0 +1,47 @@ +getRoles():["ROLE_ANONYME"]); + $groups=($user?$user->getGroups():[]); + + // Initialisation du calcul des alerts + $fluxs=new ArrayCollection(); + + // Récupération des fluxs par rôles + foreach($roles as $role) { + $qb = $this->createQueryBuilder('a'); + $qb->select('flux') + ->from("CadolesPortalBundle:Flux", 'flux') + ->where($qb->expr()->like('flux.roles', $qb->expr()->literal("%$role%"))); + + $fluxsroles=$qb->getQuery()->getResult(); + foreach($fluxsroles as $fluxrole) { + if(!$fluxs->contains($fluxrole)) $fluxs->add($fluxrole); + } + } + + // Récupération des fluxs par group + foreach($groups as $group) { + $qb = $this->createQueryBuilder('a'); + $qb->select('flux') + ->from("CadolesPortalBundle:Flux", 'flux') + ->where(":group MEMBER OF flux.groups") + ->setParameter("group",$group->getGroup()); + + $fluxsgroups=$qb->getQuery()->getResult(); + foreach($fluxsgroups as $fluxgroup) { + if(!$fluxs->contains($fluxgroup)) $fluxs->add($fluxgroup); + } + } + + return $fluxs; + } +} diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/ItemRepository.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/ItemRepository.php index 45d08cdf..fc2ec2bb 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/ItemRepository.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/ItemRepository.php @@ -7,7 +7,7 @@ use Doctrine\Common\Collections\ArrayCollection; class ItemRepository extends EntityRepository { - public function getUserItems($user,&$bookmarks,&$itemsordered,&$itemcategorys,$iditemcategory=null,$withbookmark=1) { + public function getUserItems($user,&$bookmarks,&$itemsordered,&$itemcategorys,$iditemcategory=null,$withbookmark=1,$fgessential=false) { // Profilage $roles=($user?$user->getRoles():["ROLE_ANONYME"]); $groups=($user?$user->getGroups():[]); @@ -40,6 +40,12 @@ class ItemRepository extends EntityRepository $qb->andWhere("item.itemcategory=:itemcategory") ->setParameter("itemcategory",$itemcategoryfilter); } + + if($fgessential) { + $qb->andWhere("item.essential=:flag") + ->setParameter("flag",true); + } + $itemsroles=$qb->getQuery()->getResult(); foreach($itemsroles as $itemrole) { if(!$bookmarksitems->contains($itemrole) && !$items->contains($itemrole)) $items->add($itemrole); @@ -58,6 +64,12 @@ class ItemRepository extends EntityRepository $qb->andWhere("item.itemcategory=:itemcategory") ->setParameter("itemcategory",$itemcategoryfilter); } + + if($fgessential) { + $qb->andWhere("item.essential=:flag") + ->setParameter("flag",true); + } + $itemsgroups=$qb->getQuery()->getResult(); foreach($itemsgroups as $itemgroup) { @@ -78,6 +90,12 @@ class ItemRepository extends EntityRepository $qb->andWhere("item.itemcategory=:itemcategory") ->setParameter("itemcategory",$itemcategoryfilter); } + + if($fgessential) { + $qb->andWhere("item.essential=:flag") + ->setParameter("flag",true); + } + $itemsniveau01s=$qb->getQuery()->getResult(); foreach($itemsniveau01s as $itemniveau01) { if(!$bookmarksitems->contains($itemniveau01) && !$items->contains($itemniveau01)) $items->add($itemniveau01); 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 2a037951..2c1f9006 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 @@ -1,6 +1,13 @@ {% extends '@CadolesCore/base.html.twig' %} +{% block localstyle %} + {% if look=="list" %} + #R1C1:first-child { + margin-top: 30px; + } + {% endif %} +{% endblock %} {% block pagewrapper %} {% if access=="config" %}
@@ -25,8 +32,8 @@ @@ -98,7 +105,11 @@ }); // Création de la grille des widgets - var template = '{{ entity.template | raw }}'; + {% if look == "list" %} + var template = '{"rows":[{"id":0,"cols":[{"id":0,"size": 1,"rows":[]},{"id":1,"size": 11,"rows":[]}]}]}'; + {% else %} + var template = '{{ entity.template | raw }}'; + {% endif %} // Template de base if(template=="") { @@ -157,10 +168,19 @@ // On déplace les widgets à leur emplacement $("#tolocalize").children(".widget").each(function( element ) { - if($('#'+$(this).attr("loc")).length) - $(this).appendTo('#'+$(this).attr("loc")); - else - $(this).appendTo('#R1C1'); + {% if look=="list" %} + if($(this).data("id")=="{{selwidget}}") { + $(this).appendTo('#R1C2'); + } + else + $(this).appendTo('#R1C1'); + + {% else %} + if($('#'+$(this).attr("loc")).length) + $(this).appendTo('#'+$(this).attr("loc")); + else + $(this).appendTo('#R1C1'); + {% endif %} }); // On ajoute un widget vide à chaque colonne @@ -168,7 +188,7 @@ $("
 
").appendTo($(this)); }); - {% if canupdate %} + {% if canupdate and look!="list" %} // Mettre une taille mini de colonne sinon on ne pourra pas déplacer le widget dans la colonne $(".colcontainer .col").css("min-height","80px"); @@ -365,6 +385,26 @@ } } + // Aggrandir widget + function bigWidget(idwidget) { + var url="{{ path('cadoles_portal_'~access~'_page_view',{id:entity.id,group:group,usage:usage,by:mode,look:'list',selwidget:'xx'})}}"; + + url=url.replace('xx',idwidget); + url=url.replace(/&/g,"&"); + + $(location).attr('href', url); + } + + // Réduire widget + function smallWidget(idwidget) { + var url="{{ path('cadoles_portal_'~access~'_page_view',{id:entity.id,group:group,usage:usage,by:mode,look:'view',selwidget:'xx'})}}"; + + url=url.replace('xx',idwidget); + url=url.replace(/&/g,"&"); + + $(location).attr('href', url); + } + // Ajout d'un bookmark function addBookmark(idwidget,touser) { var url="{{ path('cadoles_portal_'~access~'_bookmark_submit',{idpage:entity.id,idwidget:'xx',touser:'yy',group:group,usage:usage,by:mode})}}"; diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewalert.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewalert.html.twig index bdeba3b6..5fe50652 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewalert.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewalert.html.twig @@ -12,50 +12,72 @@ {% set stylewidgetbody = constants.mystylewidgetbody(entity) %} {% if canupdate or alerts|length>0 %} -
- {% if canupdate %} -
- - -
- {% endif %} + {%if mini %} +
+
+ + {% if entity.icon %} + + {% else %} + + {% endif %} + +
+
+ {% else %} +
+
+ {% if canupdate %} + + + {% endif %} -
- {% if entity.icon %} - - {% else %} - - {% endif %} - {{ entity.name }} -
- -
- {% for alert in alerts %} -
- + {% if look=="list" %} + + {% else %} + + {% endif %} +
-
- {{ alert.content|raw }} -
+ +
+ {% if entity.icon %} + + {% else %} + + {% endif %} + {{ entity.name }}
- {% endfor %} -
-
+
+ {% for alert in alerts %} +
+ + +
+ {{ alert.content|raw }} +
+ +
+ + {% endfor %} +
+
+ {% endif %} {% endif %} diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewappexternal.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewappexternal.html.twig index 2bef057b..22f20231 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewappexternal.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewappexternal.html.twig @@ -26,69 +26,87 @@ {% set colorbodyfont = "color: #" ~ entity.colorbodyfont %} {% endif %} -
- {% if canupdate or canadd %} -
- {% if canupdate %} - - - {% endif %} -
- {% endif %} - -
- {% if entity.icon %} - - {% else %} - - {% endif %} - {{ entity.name }} -
- -
- {% for itemcategory in itemcategorys %} - {% set haveitem=false %} - - {% for item in items if item.itemcategory==itemcategory %} - - {% if loop.index ==1 %} - {% set haveitem=true %} - - {% if itemcategorys|length > 1 %} -

{{ itemcategory.label }}

- {% endif %} - -
-
-
- {% endif %} - -
-
- - - -
- - -
-

{{ item.title }}

- {{ item.subtitle|nl2br }} -
-
- -
-
- {% endfor %} - {% if haveitem %} -
+{%if mini %} +
+
+ + {% if entity.icon %} + + {% else %} + {% endif %} - {% endfor %} + +
+
+{% else %} +
+
+ {% if canupdate %} + + + {% endif %} + {% if look=="list" %} + + {% else %} + + {% endif %} +
+ + +
+ {% if entity.icon %} + + {% else %} + + {% endif %} + {{ entity.name }} +
+ +
+ {% for itemcategory in itemcategorys %} + {% set haveitem=false %} + + {% for item in items if item.itemcategory==itemcategory %} + + {% if loop.index ==1 %} + {% set haveitem=true %} + + {% if itemcategorys|length > 1 %} +

{{ itemcategory.label }}

+ {% endif %} + +
+
+
+ {% endif %} + +
+
+ + + +
+ + +
+

{{ item.title }}

+ {{ item.subtitle|nl2br }} +
+
+ +
+
+ {% endfor %} + {% if haveitem %} +
+ {% endif %} + {% endfor %} +
-
+{% endif %} diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewblog.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewblog.html.twig index 70159c4b..6ca60d7d 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewblog.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewblog.html.twig @@ -12,73 +12,87 @@ {% set stylewidgetbodyreverse = constants.mystylewidgetbodyreverse(entity) %} {% set color = app.session.get('color') %} - - -
-
- {% if canupdate %} - - - {% endif %} - - {% if access=="config" %} - - {% else %} - {% set idblog = "" %} - {% set url= path('cadoles_portal_user_blogarticle_submit') %} - {% if usage=="group" and firstblog is defined %} - {% set url= path('cadoles_portal_user_blogarticle_submit',{idblog:firstblog,page:entity.page.id}) %} - {% endif %} - - - {% endif %} -
- -
- {% if entity.icon %} - - {% else %} - - {% endif %} - {{ entity.name }} -
- - {% if blogarticles|length >= 1 %} -
-
- {% for blogarticle in blogarticles %} - {% if loop.index==1 %} -
-
- {% endif %} - -
-
- - {% if blogarticle.image is not empty %} - - - {% endif %} -
-
-

{{blogarticle.name }}

- publié par {{ blogarticle.user.username }} le {{ blogarticle.submit|date("d/m/Y à H:i") }}
dans le blog {{blogarticle.blog.name }} -
-
- -
-
- {% endfor %} -
+{%if mini %} +
+
+ + {% if entity.icon %} + + {% else %} + + {% endif %} +
- {% endif %} -
+
+{% else %} +
+
+ {% if canupdate %} + + + {% endif %} + + {% if access=="config" %} + + {% else %} + {% set idblog = "" %} + {% set url= path('cadoles_portal_user_blogarticle_submit') %} + {% if usage=="group" and firstblog is defined %} + {% set url= path('cadoles_portal_user_blogarticle_submit',{idblog:firstblog,page:entity.page.id}) %} + {% endif %} + + + {% endif %} + {% if look=="list" %} + + {% else %} + + {% endif %} +
+ +
+ {% if entity.icon %} + + {% else %} + + {% endif %} + {{ entity.name }} +
+ + {% if blogarticles|length >= 1 %} +
+
+ {% for blogarticle in blogarticles %} + {% if loop.index==1 %} +
+
+ {% endif %} + +
+
+ + {% if blogarticle.image is not empty %} + + + {% endif %} +
+
+

{{blogarticle.name }}

+ publié par {{ blogarticle.user.username }} le {{ blogarticle.submit|date("d/m/Y à H:i") }}
dans le blog {{blogarticle.blog.name }} +
+
+ +
+
+ {% endfor %} +
+
+ {% endif %} +
+{% endif %} + diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewbookmark.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewbookmark.html.twig index 799751ee..e606f026 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewbookmark.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewbookmark.html.twig @@ -33,90 +33,106 @@ {% set username = "" %} {% endif %} +{%if mini %} +
+
+ + {% if entity.icon %} + + {% else %} + + {% endif %} + +
+
+{% else %} +
+
+ {% if canupdate %} + + + {% endif %} -
- {% if canupdate or canadd %} -
- {% if canupdate %} - - - {% endif %} + {% if canadd %} + + {% endif %} - {% if canadd %} - - {% endif %} -
- {% endif %} + {% if look=="list" %} + + {% else %} + + {% endif %} +
+
+ {% if entity.icon %} + + {% else %} + + {% endif %} + {{ entity.name }} +
-
- {% if entity.icon %} - - {% else %} - - {% endif %} - {{ entity.name }} -
+ {% if bookmarks is not empty or canupdate %} +
+
+
+
+
+ {% for bookmark in bookmarks %} +
+
+ {% if canupdate %} + + {% endif %} + + {% if bookmark.target == 'frame' %} + + {% elseif bookmark.target == "_self" %} + + {% else %} + + {% endif %} - {% if bookmarks is not empty or canupdate %} -
-
-
-
-
- {% for bookmark in bookmarks %} -
-
- {% if canupdate %} - - {% endif %} - - {% if bookmark.target == 'frame' %} - - {% elseif bookmark.target == "_self" %} - - {% else %} - - {% endif %} +
+ -
- - -
-

{{ bookmark.title }}

- {{ bookmark.subtitle|nl2br }} -
+ +
+
+ {% endfor %} + + {% if canadd %} +
+
+
+ +
+

Ajouter

+
-
- {% endfor %} - - {% if canadd %} -
-
-
- -
-

Ajouter

-
-
-
+ {% endif %}
- {% endif %}
-
- {% endif %} -
+ {% endif %} +
+{% endif %} diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewcalendar.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewcalendar.html.twig index 48d82788..2eaffe92 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewcalendar.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewcalendar.html.twig @@ -11,81 +11,95 @@ {% set stylewidgetbody = constants.mystylewidgetbody(entity) %} {% set color = app.session.get('color') %} - + {% set firstflux="" %} -
-
- {% if canupdate %} - - - {% endif %} - {% if access=="config" %} - - {% else %} - {% set url= path('cadoles_portal_'~access~'_calendar_view') %} - {% if usage=="group" and firstcalendar is defined %} - {% set url= path('cadoles_portal_'~access~'_calendar_view',{id:firstcalendar}) %} - {% endif %} - - {% endif %} -
- -
- {% if entity.icon %} - - {% else %} - - {% endif %} - {{ entity.name }} -
- - {% set firstflux="" %} - - {% if events|length >= 1 %} -
- {% set monthsel = "" %} - {% for i in 0..(nbday-1) %} - {% set dateeventstart = 'now'|date_modify("+"~i~" day midnight") %} - {% set dateeventend = 'now'|date_modify("+"~(i+1)~" day midnight") %} - - {% set fgaffday=false %} - {% for event in events %} - {% if event.start< dateeventend and event.end>=dateeventstart %} - - {% if monthsel == "" or dateeventstart|date("Y-m")!=monthsel %} - {% set monthsel = dateeventstart|date("Y-m") %} - {% set libmonth = constants.libmonth(dateeventstart|date("m")) %} -

{{ libmonth ~ " " ~ dateeventstart|date("Y") }}

- {% endif %} - - {% if not fgaffday %} - {% set fgaffday=true %} - {% set libday = constants.libday(dateeventstart|date("N")) %} -
{{ libday ~ " " ~ dateeventstart|date("d/m/Y") }}
- {% endif %} - -
- {% if not event.allDay %} - {{ event.start | date("H:i") }} - - {%endif%} - {{ event.title }} -
- {% endif %} + {% if events|length >= 1 %} +
+ {% set monthsel = "" %} + {% for i in 0..(nbday-1) %} + {% set dateeventstart = 'now'|date_modify("+"~i~" day midnight") %} + {% set dateeventend = 'now'|date_modify("+"~(i+1)~" day midnight") %} + {% set fgaffday=false %} + {% for event in events %} + {% if event.start< dateeventend and event.end>=dateeventstart %} + + {% if monthsel == "" or dateeventstart|date("Y-m")!=monthsel %} + {% set monthsel = dateeventstart|date("Y-m") %} + {% set libmonth = constants.libmonth(dateeventstart|date("m")) %} +

{{ libmonth ~ " " ~ dateeventstart|date("Y") }}

+ {% endif %} + + {% if not fgaffday %} + {% set fgaffday=true %} + {% set libday = constants.libday(dateeventstart|date("N")) %} +
{{ libday ~ " " ~ dateeventstart|date("d/m/Y") }}
+ {% endif %} + +
+ {% if not event.allDay %} + {{ event.start | date("H:i") }} - + {%endif%} + {{ event.title }} +
+ {% endif %} + + {% endfor %} + {% endfor %} - {% endfor %} - - {% if url is defined %} - - {% endif %} -
- {% endif %} -
+ {% if url is defined %} + + {% endif %} +
+ {% endif %} +
+{% endif %} diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewchat.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewchat.html.twig index 4fe9ef36..4defda27 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewchat.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewchat.html.twig @@ -28,39 +28,53 @@ {% if app.user %} -
- {% if canupdate %} -
- - -
- {% endif %} - - - {% if onheader %} -
- -
- {% else %} -
+{%if mini %} +
+
+ {% if entity.icon %} - + {% else %} - + {% endif %} - {{ entity.name }} +
+
+{% else %} +
+ {% if canupdate %} +
+ + +
+ {% endif %} -
- {% if group is not null %} - {{ render(url('cadoles_websocket_chat',{'id':group,'framed':true,'border':entity.border,'colorbodybacklight':colorbodyback, 'colorbodyback':colorbodyback,'colorbodyfont':colorbodyfont,'colorbody':colorbody,'colormain':colormain})) }} - {% endif %} - - -
- {% endif %} -
+ + {% if onheader %} +
+ +
+ {% else %} +
+ {% if entity.icon %} + + {% else %} + + {% endif %} + {{ entity.name }} +
+ +
+ {% if group is not null %} + {{ render(url('cadoles_websocket_chat',{'id':group,'framed':true,'border':entity.border,'colorbodybacklight':colorbodyback, 'colorbodyback':colorbodyback,'colorbodyfont':colorbodyfont,'colorbody':colorbody,'colormain':colormain})) }} + {% endif %} + + +
+ {% endif %} +
+{% endif %} {%endif%} \ No newline at end of file diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/vieweditor.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/vieweditor.html.twig index 471549ba..83795385 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/vieweditor.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/vieweditor.html.twig @@ -10,30 +10,47 @@ {% set stylewidgetheader = constants.mystylewidgetheader(entity) %} {% set stylewidgetbody = constants.mystylewidgetbody(entity) %} -
- {% if canupdate %} -
- {% if canupdate %} - - - {% endif %} +{%if mini %} +
+
+ + {% if entity.icon %} + + {% else %} + + {% endif %} + +
+
+{% else %} +
+
+ {% if canupdate %} + + + {% endif %} + + {% if look=="list" %} + + {% else %} + + {% endif %} +
+ + +
+ {% if entity.icon %} + + {% else %} + + {% endif %} + {{ entity.name }} +
+ +
+ {{ html | raw }} +
- {% endif %} - - -
- {% if entity.icon %} - - {% else %} - - {% endif %} - {{ entity.name }} -
- -
- {{ html | raw }} -
-
- +{% endif %} diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewfile.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewfile.html.twig index 6cd7b093..e6310df3 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewfile.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewfile.html.twig @@ -28,31 +28,47 @@ {% set colorbodyfont = color['main'] %} {% endif %} +{%if mini %} +
+
+ + {% if entity.icon %} + + {% else %} + + {% endif %} + +
+
+{% else %} +
+
+ {% if canupdate %} + + + {% endif %} -
- {% if canupdate or canadd %} -
- {% if canupdate %} - - - {% endif %} + {% if look=="list" %} + + {% else %} + + {% endif %} +
+ +
+ {% if entity.icon %} + + {% else %} + + {% endif %} + {{ entity.name }} +
+ +
+ +
- {% endif %} - - -
- {% if entity.icon %} - - {% else %} - - {% endif %} - {{ entity.name }} -
- -
- -
-
+{% endif %} diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewflux.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewflux.html.twig index 0b9c08c4..ae4cefd5 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewflux.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewflux.html.twig @@ -36,88 +36,106 @@ {% set stylegrid="grid-list" %} {% endif %} -
- {% if canupdate %} -
- - -
- {% endif %} +{%if mini %} +
+
+ + {% if entity.icon %} + + {% else %} + + {% endif %} + +
+
+{% else %} +
+
+ {% if canupdate %} + + + {% endif %} + {% if look=="list" %} + + {% else %} + + {% endif %} +
-
- {% if entity.icon %} - - {% else %} - - {% endif %} - {{ entity.name }} -
+
+ {% if entity.icon %} + + {% else %} + + {% endif %} + {{ entity.name }} +
- {% set firstflux="" %} + {% set firstflux="" %} -
- {% if fluxs is defined %} - {% if fluxs|length > 1 %} -
Tout
+
+ {% if fluxs is defined %} + {% if fluxs|length > 1 %} +
Tout
- {% for flux in fluxs %} - {% set stylefeed = "background-color: #" ~ color['main'] ~ ";" %} - {% if flux.color is not null %} - {% set stylefeed = "background-color: #" ~ flux.color ~ ";" %} + {% for flux in fluxs %} + {% set stylefeed = "background-color: #" ~ color['main'] ~ ";" %} + {% if flux.color is not null %} + {% set stylefeed = "background-color: #" ~ flux.color ~ ";" %} + {% endif %} + +
{{ flux.title }}
+ {% endfor %} + {% endif %} + {% endif %} + +
+ {% for feed in feeds %} + {% if loop.index==1 %} +
+
{% endif %} -
{{ flux.title }}
- {% endfor %} - {% endif %} - {% endif %} + + {% set stylecolor = "background-color: #" ~ color['main'] ~ ";" %} + {% if feed.color is defined and feed.color is not null %} + {% set stylecolor = "background-color: #" ~ feed.color ~ ";" %} + {% endif %} + {% set stylefeed = "" %} + {% if feed.image is not null and feed.image != ""%} + {% set stylefeed = stylefeed ~ "background: url(" ~ feed.image ~ ") no-repeat center; background-size: cover;" %} + {% endif %} -
- {% for feed in feeds %} - {% if loop.index==1 %} -
-
- {% endif %} +
+
+ +
+ {% if feed.image is not empty %} + + {% endif %} - - {% set stylecolor = "background-color: #" ~ color['main'] ~ ";" %} - {% if feed.color is defined and feed.color is not null %} - {% set stylecolor = "background-color: #" ~ feed.color ~ ";" %} - {% endif %} - {% set stylefeed = "" %} - {% if feed.image is not null and feed.image != ""%} - {% set stylefeed = stylefeed ~ "background: url(" ~ feed.image ~ ") no-repeat center; background-size: cover;" %} - {% endif %} - -
-
- -
- {% if feed.image is not empty %} - - {% endif %} - -
-
-

{{ feed.title }}

- {% if modelist==0 %} - le {{ feed.date|date("d/m/Y à H:i") }}
- {{ feed.description | nl2br }} - {% endif %} -
-
-
- + +
-
- {% endfor %} + {% endfor %} +
- -
+{% endif %} diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewframe.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewframe.html.twig index 57a15c43..18c86610 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewframe.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewframe.html.twig @@ -23,36 +23,55 @@ {% set colorbodyfont = color['fontcolorhover'] %} {% endif %} -
- {% if canupdate %} -
- - -
- {% endif %} - - - {% if onheader %} -
- -
- {% else %} -
+{%if mini %} +
+
+ {% if entity.icon %} - + {% else %} - + {% endif %} - {{ entity.name }} +
+
+{% else %} +
+ +
+ {% if canupdate %} + + + {% endif %} -
- + {% if look=="list" %} + + {% else %} + + {% endif %}
- {% endif %} -
+ - + {% if onheader %} +
+ +
+ {% else %} +
+ {% if entity.icon %} + + {% else %} + + {% endif %} + {{ entity.name }} +
+ +
+ +
+ {% endif %} +
+{% endif %} + diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgalery.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgalery.html.twig index 5b44a0b0..1e61d676 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgalery.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgalery.html.twig @@ -24,83 +24,100 @@ {% set colorbodyfont = color['fontcolorhover'] %} {% endif %} -
- {% if canupdate or canadd %} -
- {% if canupdate %} - - - {% endif %} +{%if mini %} +
+
+ + {% if entity.icon %} + + {% else %} + + {% endif %} + +
+
+{% else %} +
+
+ {% if canupdate %} + + + {% endif %} - {% if canadd %} - - {% endif %} -
- {% endif %} + {% if canadd %} + + {% endif %} + {% if look=="list" %} + + {% else %} + + {% endif %} +
-
- {% if entity.icon %} - - {% else %} - - {% endif %} - {{ entity.name }} -
+
+ {% if entity.icon %} + + {% else %} + + {% endif %} + {{ entity.name }} +
- {% if files|length>0 or canupdate %} -
-
- {% if canupdate %} -
-
- {% endif %} + {% if files|length>0 or canupdate %} +
+
+ {% if canupdate %} +
+
+ {% endif %} - {% for file in files|sort %} - {% if loop.index==1 and not canupdate %} -
-
- {% endif %} - -
-
- {% if canadd %} - - {% endif %} + {% for file in files|sort %} + {% if loop.index==1 and not canupdate %} +
+
+ {% endif %} + +
+
+ {% if canadd %} + + {% endif %} - + -
- -
- -
-
- {% endfor %} - - {% if canadd %} -
-
-
- -
-

Ajouter des Images

-
+ +
- + +
-
- {% endif %} + {% endfor %} + + {% if canadd %} +
+
+ +
+ + +
+

Ajouter des Images

+
+
+ +
+
+ {% endif %} +
-
- {% endif %} -
+ {% endif %} +
+{% endif %} 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 6f04e4f2..aeeb6d51 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 @@ -18,83 +18,99 @@ {% set canadd = true %} {% endif %} -
- {% if canupdate %} -
- {% if canupdate %} - - - {% endif %} - - {% if canadd %} - - +{% if mini %} +
+
+ + {% if entity.icon %} + + {% else %} + + {% endif %} - {% endif %} -
- {% endif %} - - -
- {% if entity.icon %} - - {% else %} - - {% endif %} - {{ entity.name }} - - -
- -
-
-
-
- {% for group in groups %} -
-
- -
- - - -
-

{{ group.title }}

-
-
- -
-
- {% endfor %} +
+
+{% else %} +
+
+ {% if canupdate %} + + + {% endif %} {% if canadd %} -
-
- -
- - - - -
-

Ajouter un Groupe

-
-
- -
-
+ + + + {% endif %} + + {% if look=="list" %} + + {% else %} + + {% endif %} +
+ +
+ {% if entity.icon %} + + {% else %} + {% endif %} + {{ entity.name }} + + +
+ +
+
+
+
+ {% for group in groups %} +
+
+ +
+ + + +
+

{{ group.title }}

+
+
+ +
+
+ {% endfor %} + + {% if canadd %} +
+
+ +
+ + + + +
+

Ajouter un Groupe

+
+
+ +
+
+ {% endif %} +
-
- +{% endif %} diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgroupmessage.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgroupmessage.html.twig index 47d49230..7b9ccc38 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgroupmessage.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewgroupmessage.html.twig @@ -38,63 +38,84 @@ {% set stylegrid="grid-list" %} {% endif %} -
- {% if canupdate %} -
- - -
- {% endif %} +{%if mini %} +
+
+ + {% if entity.icon %} + + {% else %} + + {% endif %} + +
+
+{% else %} +
+ +
+ {% if canupdate %} + + + {% endif %} + + {% if look=="list" %} + + {% else %} + + {% endif %} +
+ -
- {% if entity.icon %} - - {% else %} - - {% endif %} - {{ entity.name }} -
+
+ {% if entity.icon %} + + {% else %} + + {% endif %} + {{ entity.name }} +
- - {% if messages is not empty %} -
-
-
-
- {% set nbaff=0 %} - {% for message in messages %} - {% set nbaff=nbaff+1 %} - {% set class="" %} - {% set style="" %} - {% if nbaff > nbarticle %} - {% set class="msg-hidden" %} - {% set style="display:none" %} - {% endif %} + + {% if messages is not empty %} +
+
+
+
+ {% set nbaff=0 %} + {% for message in messages %} + {% set nbaff=nbaff+1 %} + {% set class="" %} + {% set style="" %} + {% if nbaff > nbarticle %} + {% set class="msg-hidden" %} + {% set style="display:none" %} + {% endif %} -
-
-
- +
+
+
+ -
-
- {{message.user.lastname}} {{message.user.firstname}}
- {{message.date|date('d/m/Y H:i')}} dans le groupe {{ message.pagetitle }}

- {{ message.topic | raw }} -
+
+
+ {{message.user.lastname}} {{message.user.firstname}}
+ {{message.date|date('d/m/Y H:i')}} dans le groupe {{ message.pagetitle }}

+ {{ message.topic | raw }} +
+
-
- {% endfor %} + {% endfor %} +
+ {% endif %}
- {% endif %} -
- +{% endif %} diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewinfo.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewinfo.html.twig index ea365f6d..18d20d62 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewinfo.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewinfo.html.twig @@ -19,89 +19,103 @@ {% set stylelink = "color:#" ~ color['fontcolorhover'] %} {% endif %} +{%if mini %} +
+
+ + {% if icon %} + {% if icon=="/uploads/avatar/noavatar.png" %} + + {% else %} + + {% endif %} + {% else %} + + {% endif %} + +
+
+{% else %} +
+
+ {% if canupdate %} + + + {% endif %} -
- {% if canupdate %} -
- - -
- {% endif %} - -
- {% if entity.icon %} - - {% else %} - - {% endif %} - {{ entity.name }} -
- -
- - {% set style = "margin: auto; display: inherit;background-color:transparent;" %} - {% if icon %} - - {% else %} - - {% endif %} - -
- {%if usage=="group" %}Groupe
{% endif %} - {{ title }}
- {{ description | raw }} - - {%if usage=="group" %} -
-
-
- - {% if canadd==true %} -
-
- -
- + {% if look=="list" %} + + {% else %} + + {% endif %} +
- -
-

Ajouter un membre

-
-
- -
-
- {% endif %} - {% for member in members %} -
-
-
- +
+ {% if icon %} + + {% else %} + + {% endif %} + {{ title }} +
+ +
+
+ {{ description | raw }} + + {%if usage=="group" %} +
+
+
+ + {% if canadd==true %} +
+
+ +
+ + -
-

- {{ member.user.lastname }} {{ member.user.firstname }} - {% if member.fgmanager %} -
- {% endif %} -

+
+

Ajouter un membre

+
+
+ +
+
+ {% endif %} + + {% for member in members %} +
+
+
+ + +
+

+ {{ member.user.lastname }} {{ member.user.firstname }} + {% if member.fgmanager %} +
+ {% endif %} +

+
-
- {% endfor %} + {% endfor %} -
- {% endif %} +
+ {% endif %} +
-
+{% endif %} diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitem.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitem.html.twig index d8cb4d91..4c361629 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitem.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitem.html.twig @@ -33,266 +33,282 @@ {% set username = "" %} {% endif %} -
- {% if canupdate or canadd %} -
- {% if canupdate %} - - - {% endif %} - - {% if canadd and access!="config"%} - - {% endif %} -
- {% endif %} - - -
- {% if entity.icon %} - - {% else %} - - {% endif %} - {{ entity.name }} -
- -
- {% set mycategs = [] %} - {% for itemcategory in itemcategorys %} - {% set haveitem=false %} - - {% for item in items if item.itemcategory==itemcategory %} - - {% if loop.index ==1 %} - {% set mycategs = mycategs|merge({ (loop.index) : itemcategory}) %} - {% endif %} - {% endfor %} - {% endfor %} - - - {% if menu %} - {% if menuall %} -
Tout
+{%if mini %} +
+
+ + {% if entity.icon %} + + {% else %} + + {% endif %} + +
+
+{% else %} +
+
+ {% if canupdate %} + + {% endif %} - {% if bookmarks is not empty %} -
+ {% if canadd and access!="config"%} + {% endif %} - {% for itemcategory in mycategs %} -
{{itemcategory.label}}
- {% endfor %} - {% endif %} + {% if look=="list" %} + + {% else %} + + {% endif %} +
- {% if search %} -
- - -
- {% endif %} +
+ {% if entity.icon %} + + {% else %} + + {% endif %} + {{ entity.name }} +
- {% if (bookmarks is not empty or (canadd and access!="config")) and (withbookmark==0 or withbookmark==2) %} -
- {% if items is not empty %} -

Favoris

- {% endif %} -
-
-
- {% for bookmark in bookmarks %} - {% if bookmark.item %} -
-
- {% if bookmark.item.content %} - - {% endif %} - {% if canadd %} - - {% endif %} +
+ {% set mycategs = [] %} + {% for itemcategory in itemcategorys %} + {% set haveitem=false %} - {% if bookmark.item.target == 'frame' %} - - {% elseif bookmark.target == "_self" %} - - {% else %} - - {% endif %} + {% for item in items if item.itemcategory==itemcategory %} -
- - -
-

{{ bookmark.item.title }}

- {{ bookmark.item.subtitle|nl2br }} -
-
- - - -
-
- {%else%} -
-
- - - - {% if bookmark.target == 'frame' %} - - {% elseif bookmark.target == "_self" %} - - {% else %} - - {% endif %} - -
- - -
-

{{ bookmark.title }}

- {{ bookmark.subtitle|nl2br }} -
-
- -
-
- {% endif %} - {% endfor %} - - {% if (canadd and access!="config") %} -
-
-
- -
-

Ajouter

- Ajouter un Favori -
-
-
-
+ {% if loop.index ==1 %} + {% set mycategs = mycategs|merge({ (loop.index) : itemcategory}) %} {% endif %} -
-
- {% endif %} + {% endfor %} + {% endfor %} - {% set firstcat=true %} - {% for itemcategory in mycategs %} - {% set haveitem=false %} + {% if menu %} + {% if menuall %} +
Tout
+ {% endif %} - {% for item in items if item.itemcategory==itemcategory %} + {% if bookmarks is not empty %} +
+ {% endif %} - {% if loop.index ==1 %} - {% set haveitem=true %} - - {% if (bookmarks is not empty or (canadd and access!="config")) and (withbookmark==0 or withbookmark==2) %} - {% set toview=true %} - {% if menu and not menuall%} - {% set toview=false %} + {% for itemcategory in mycategs %} +
{{itemcategory.label}}
+ {% endfor %} + {% endif %} + + {% if search %} +
+ + +
+ {% endif %} + + {% if (bookmarks is not empty or (canadd and access!="config")) and (withbookmark==0 or withbookmark==2) %} +
+ {% if items is not empty %} +

Favoris

+ {% endif %} +
+
+
+ {% for bookmark in bookmarks %} + {% if bookmark.item %} +
+
+ {% if bookmark.item.content %} + + {% endif %} + {% if canadd %} + + {% endif %} + + {% if bookmark.item.target == 'frame' %} + + {% elseif bookmark.target == "_self" %} + + {% else %} + + {% endif %} + +
+ + +
+

{{ bookmark.item.title }}

+ {{ bookmark.item.subtitle|nl2br }} +
+
+ + + +
+
+ {%else%} +
+
+ + + + {% if bookmark.target == 'frame' %} + + {% elseif bookmark.target == "_self" %} + + {% else %} + + {% endif %} + +
+ + +
+

{{ bookmark.title }}

+ {{ bookmark.subtitle|nl2br }} +
+
+ +
+
+ {% endif %} + {% endfor %} + + {% if (canadd and access!="config") %} +
+
+
+ +
+

Ajouter

+ Ajouter un Favori +
+
+
+
{% endif %} - {% else %} - {% if menu and not menuall%} - {% if firstcat %} - {% set toview=true %} - {% else %} +
+
+ {% endif %} + + + {% set firstcat=true %} + {% for itemcategory in mycategs %} + {% set haveitem=false %} + + {% for item in items if item.itemcategory==itemcategory %} + + {% if loop.index ==1 %} + {% set haveitem=true %} + + {% if (bookmarks is not empty or (canadd and access!="config")) and (withbookmark==0 or withbookmark==2) %} + {% set toview=true %} + {% if menu and not menuall%} {% set toview=false %} {% endif %} {% else %} - {% set toview=true %} - {% endif %} - {% endif %} - {% set firstcat=false %} - - {% set style="" %} - {% if not toview %} - {% set style="display:none;" %} - {% endif %} - - {% if mycategs|length > 1 or ((bookmarks is not empty or (canadd and access!="config")) and (withbookmark==0 or withbookmark==2)) %} -

{{ itemcategory.label }}

- {% else %} -

- {% endif %} - -
-
-
- {% endif %} - -
-
- {% if item.content %} - - {% endif %} - {% if canadd %} - - {% endif %} - - {% if item.protected and not app.user %} - {% if mode_auth == "SAML" %} - - {% elseif mode_auth == "CAS" %} - - {% elseif mode_auth == "MYSQL" %} - - {% endif %} - - {% else %} - {% if item.target == 'frame' %} - - {% elseif item.target == "_self" %} - + {% if menu and not menuall%} + {% if firstcat %} + {% set toview=true %} {% else %} - + {% set toview=false %} {% endif %} + {% else %} + {% set toview=true %} {% endif %} + {% endif %} + {% set firstcat=false %} -
- - {% endif %} - {% endfor %} +
-
- +{% endif %} diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitemessential.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitemessential.html.twig index 97f8701e..3addd179 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitemessential.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitemessential.html.twig @@ -33,187 +33,203 @@ {% set username = "" %} {% endif %} -
- {% if canupdate or canadd %} -
- {% if canupdate %} - - - {% endif %} - - {% if canadd and access!="config"%} - - +{%if mini %} +
+
+ + {% if entity.icon %} + + {% else %} + + {% endif %} - {% endif %} -
- {% endif %} +
+
+{% else %} +
+
+ {% if canupdate %} + + + {% endif %} + + {% if canadd and access!="config"%} + + + + {% endif %} + + {% if look=="list" %} + + {% else %} + + {% endif %} +
-
- {% if entity.icon %} - - {% else %} - - {% endif %} - {{ entity.name }} -
+
+ {% if entity.icon %} + + {% else %} + + {% endif %} + {{ entity.name }} +
- {% if canadd or bookmarks is not empty or items is not empty %} -
-
-
-
+ {% if canadd or bookmarks is not empty or items is not empty %} +
+
+
+
- {% for bookmark in bookmarks %} - {% if bookmark.item %} -
-
- {% if bookmark.item.content %} + {% for bookmark in bookmarks %} + {% if bookmark.item %} +
+
+ {% if bookmark.item.content %} + + {% endif %} + {% if canadd %} + + {% endif %} + + {% if bookmark.item.target == 'frame' %} + + {% elseif bookmark.target == "_self" %} + + {% else %} + + {% endif %} + +
+ + +
+

{{ bookmark.item.title }}

+ {{ bookmark.item.subtitle|nl2br }} +
+
+ + + +
+
+ {%else%} +
+
+ + + + {% if bookmark.target == 'frame' %} + + {% elseif bookmark.target == "_self" %} + + {% else %} + + {% endif %} + +
+ + +
+

{{ bookmark.title }}

+ {{ bookmark.subtitle|nl2br }} +
+
+ +
+
+ {%endif%} + {% endfor %} + + + {% for item in items %} +
+
+ {% if item.content %} {% endif %} {% if canadd %} - + {% endif %} - - {% if bookmark.item.target == 'frame' %} - - {% elseif bookmark.target == "_self" %} - + + {% if item.protected and not app.user %} + {% if mode_auth == "SAML" %} + + {% elseif mode_auth == "CAS" %} + + {% elseif mode_auth == "MYSQL" %} + + {% endif %} + {% else %} - + {% if item.target == 'frame' %} + + {% elseif item.target == "_self" %} + + {% else %} + + {% endif %} {% endif %}
- - -
-

{{ bookmark.item.title }}

- {{ bookmark.item.subtitle|nl2br }} -
-
- - - -
-
- {%else%} -
-
- - - - {% if bookmark.target == 'frame' %} - - {% elseif bookmark.target == "_self" %} - - {% else %} - - {% endif %} - -
- -
-
- {%endif%} - {% endfor %} - - {% for item in items %} -
-
- {% if item.content %} - - {% endif %} - {% if canadd %} - - {% endif %} - - {% if item.protected and not app.user %} - {% if mode_auth == "SAML" %} - - {% elseif mode_auth == "CAS" %} - - {% elseif mode_auth == "MYSQL" %} - - {% endif %} - - {% else %} - {% if item.target == 'frame' %} - - {% elseif item.target == "_self" %} - - {% else %} - - {% endif %} - {% endif %} - -
- - - -
-
- {% endfor %} + {% endfor %} - {% if canadd %} -
-
- -
- - {% endif %} + +
+
+ {% endif %} +
+ {% endif %}
- {% endif %} - -
- +{% endif %} diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewlink.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewlink.html.twig index f660e72d..8263c7f6 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewlink.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewlink.html.twig @@ -24,36 +24,53 @@ {% set username = "" %} {% endif %} -
- {% if canupdate %} -
- {% if canupdate %} - - - {% endif %} +{%if mini %} +
+
+ {% if target == 'frame' %} + + {% elseif target == "_self" %} + + {% else %} + + {% endif %} + {% if entity.icon %} + + {% else %} + + {% endif %} + +
+
+{% else %} +
+
+ {% if canupdate %} + + + {% endif %} +
+ + +
+ {% if target == 'frame' %} + + {% elseif target == "_self" %} + + {% else %} + + {% endif %} + {% if entity.icon %} + + {% else %} + + {% endif %} + + +
{{ entity.name }}
+ +
- {% endif %} - - -
- {% if target == 'frame' %} - - {% elseif target == "_self" %} - - {% else %} - - {% endif %} - {% if entity.icon %} - - {% else %} - - {% endif %} - - -
{{ entity.name }}
- -
-
- +{% endif %} diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewonlydoc.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewonlydoc.html.twig index ed7b5e9b..47a49939 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewonlydoc.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewonlydoc.html.twig @@ -28,33 +28,49 @@ {% set colorbodyfont = color['main'] %} {% endif %} - -
- {% if canupdate or canadd %} -
- {% if canupdate %} - - - {% endif %} -
- {% endif %} - - -
- {% if entity.icon %} - - {% else %} - - {% endif %} - {{ entity.name }} -
- -
- - - +{%if mini %} +
+
+ + {% if entity.icon %} + + {% else %} + + {% endif %} +
-
+
+{% else %} +
+
+ {% if canupdate %} + + + {% endif %} + {% if look=="list" %} + + {% else %} + + {% endif %} +
+ + +
+ {% if entity.icon %} + + {% else %} + + {% endif %} + {{ entity.name }} +
+ +
+ + + +
+
+{% endif %} diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewproject.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewproject.html.twig index 5782e602..cadcdad3 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewproject.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewproject.html.twig @@ -18,99 +18,119 @@ -
-
- {% if canupdate %} - - - {% endif %} - - {% if access=="config" %} - - {% else %} - {% set idproject = "" %} - {% set url= path('cadoles_portal_user_projecttask_submit') %} - {% if usage=="group" and firstproject is defined %} - {% set url= path('cadoles_portal_user_projecttask_submit',{idproject:firstproject,page:entity.page.id}) %} - {% endif %} - - {% endif %} -
- -
- {% if entity.icon %} - - {% else %} - - {% endif %} - {{ entity.name }} -
- - {% if projecttasks|length >= 1 %} -
-
- {% for projecttask in projecttasks %} - {% if loop.index==1 %} -
-
- {% endif %} - -
- {% set colortask = color['main'] %} - {% if projecttask.projecttasktag %} - {% set colortask = projecttask.projecttasktag.color %} - {% endif %} -
- - -
- -
-

{{projecttask.name}}

- -
Affectée à - {% if projecttask.user is empty %} - {{ projecttask.owner.username }} - {% else %} - {{ projecttask.user.username }} - {% endif %} -
Crée le {{ projecttask.submit|date("d/m/Y à H:i") }} -
Dans le projet {{projecttask.project.name }} -
- -
- Priorité = {{ projecttask.priority }}
- Avant le = {{ projecttask.end|date("d/m/Y") }}
- {% if projecttask.projecttasktag %} - Type = {{ projecttask.projecttasktag.name }}
- {% endif %} - {% if projecttask.projecttaskstatus %} - Statut = {{ projecttask.projecttaskstatus.name }}
- {% endif %} -
-
-
- {{ projecttask.percentage }}% -
-
- -
- -
- -
-
- {% endfor %} -
+{%if mini %} +
+
+ + {% if entity.icon %} + + {% else %} + + {% endif %} +
- {% endif %} -
+
+{% else %} +
+
+ {% if canupdate %} + + + {% endif %} + + {% if access=="config" %} + + {% else %} + {% set idproject = "" %} + {% set url= path('cadoles_portal_user_projecttask_submit') %} + {% if usage=="group" and firstproject is defined %} + {% set url= path('cadoles_portal_user_projecttask_submit',{idproject:firstproject,page:entity.page.id}) %} + {% endif %} + + {% endif %} + + {% if look=="list" %} + + {% else %} + + {% endif %} +
+ +
+ {% if entity.icon %} + + {% else %} + + {% endif %} + {{ entity.name }} +
+ + {% if projecttasks|length >= 1 %} +
+
+ {% for projecttask in projecttasks %} + {% if loop.index==1 %} +
+
+ {% endif %} + +
+ {% set colortask = color['main'] %} + {% if projecttask.projecttasktag %} + {% set colortask = projecttask.projecttasktag.color %} + {% endif %} +
+ + +
+ +
+

{{projecttask.name}}

+ +
Affectée à + {% if projecttask.user is empty %} + {{ projecttask.owner.username }} + {% else %} + {{ projecttask.user.username }} + {% endif %} +
Crée le {{ projecttask.submit|date("d/m/Y à H:i") }} +
Dans le projet {{projecttask.project.name }} +
+ +
+ Priorité = {{ projecttask.priority }}
+ Avant le = {{ projecttask.end|date("d/m/Y") }}
+ {% if projecttask.projecttasktag %} + Type = {{ projecttask.projecttasktag.name }}
+ {% endif %} + {% if projecttask.projecttaskstatus %} + Statut = {{ projecttask.projecttaskstatus.name }}
+ {% endif %} +
+
+
+ {{ projecttask.percentage }}% +
+
+ +
+ +
+ +
+
+ {% endfor %} +
+
+ {% endif %} +
+{% endif %} diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewseparator.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewseparator.html.twig index c10e4364..8f30d556 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewseparator.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewseparator.html.twig @@ -17,6 +17,7 @@ {% set colorbodyfont = color['main'] %} {% endif %} +{%if not mini %}
{% if canupdate %}
@@ -54,6 +55,7 @@ {% endif %}
+{% endif %}