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 ab8f9148..d192424d 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php @@ -1085,55 +1085,32 @@ class PagewidgetController extends Controller } public function viewbookmarkAction(Request $request,$id,$access="config") { - $look=$request->query->get('look'); - $selwidget=$request->query->get('selwidget'); + // Récupération de la requete + $this->setRequest($request,$id,$access); - $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 + // Valeur par défaut $modedesktop=0; - foreach($entity->getParameter()["fields"] as $parameter) { - switch($parameter["id"]) { - case "modedesktop": - $modedesktop=$parameter["value"]; - break; + $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; + } } + + // Bookmark du widget + $bookmarks=$this->em->getRepository("CadolesPortalBundle:Bookmark")->findBy(["pagewidget"=>$this->entity]); } - - // Préference utilisateur - $this->getPreference($entity); - // Profilage - $user=$this->getUser(); - - // Bookmark du widget - $bookmarks=$em->getRepository("CadolesPortalBundle:Bookmark")->findBy(["pagewidget"=>$entity]); - // Render - return $this->render($this->labelentity.':viewbookmark.html.twig', [ - 'entity' => $entity, - 'canadd' => $canupdate, - 'canupdate' => $canupdate, + return $this->getRender('viewbookmark.html.twig', [ 'modedesktop' => $modedesktop, 'bookmarks' => $bookmarks, - 'access' => $access, - 'look' => $look, - 'mini' => ($look=="list"&&$entity->getId()!=$selwidget), ]); } 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 2c1f9006..5078108e 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 @@ -6,6 +6,12 @@ #R1C1:first-child { margin-top: 30px; } + + .widget-mini .logo { + background-color: #{{color["main"]}}; + padding: 3px; + border-radius: 100%; + } {% endif %} {% endblock %} {% block pagewrapper %} 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 e606f026..3dbf0fe2 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 @@ -51,9 +51,6 @@ {% if canupdate %} - {% endif %} - - {% if canadd %} {% endif %} @@ -113,7 +110,7 @@ {% endfor %} - {% if canadd %} + {% if canupdate %}
{% else %}
- {% if canupdate %}
+ {% if canupdate %} + {% endif %} + {% if look=="list" %} + + {% else %} + + {% endif %}
- {% endif %} + {% if onheader %} 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 18d20d62..0bbbef99 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 @@ -53,7 +53,7 @@
{% if icon %} - + {% else %} {% endif %}