diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php index 601e1c5f..6252e03c 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php @@ -1259,7 +1259,7 @@ class UserController extends Controller $key=$request->request->get('key'); $id=$request->request->get('id'); $value=$request->request->get('value'); - + // Récupérer les préférences de l'utilisateur $preference=$this->getUser()->getPreference(); @@ -1294,7 +1294,7 @@ class UserController extends Controller $toupdate=true; $preference[$key][$id]=$value; } - if($value&&$preference[$key][$id]!=$value) { + if($preference[$key][$id]!=$value) { $toupdate=true; $preference[$key][$id]=$value; } 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 b9f38400..b2f81b4f 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 @@ -343,8 +343,8 @@ span.item-drag { .grid-item .item-link img { display: block; - max-width: 100%; - //max-height: 110px; + max-width: 80%; + margin: 10px; height: auto; } 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 070709a0..81564839 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php @@ -447,6 +447,26 @@ class PagewidgetController extends Controller } } + protected function getKeyPreference(&$entity,$key,$value) { + $user=$this->getUser(); + if(!$user) + return $value; + + $preference=$user->getPreference(); + $id=$entity->getId(); + + if(!is_array($preference)) + return $value; + + if(!array_key_exists($key,$preference)) + return $value; + + if(!array_key_exists($id,$preference[$key])) + return $value; + + return $preference[$key][$id]; + } + protected function getRender($view,$params) { // Paramétres toujours présent dans un rendu de widget $allways = [ @@ -602,6 +622,9 @@ class PagewidgetController extends Controller } } + // Préference utilisateur + $modedesktop = $this->getKeyPreference($this->entity,"modedesktop",$modedesktop); + // Profilage $itemsordered = $this->em->getRepository("CadolesPortalBundle:Item")->getUserItems($this->user,$bookmarks,$items,$itemcategorys,$iditemcategory,$this->get('session')->get('ssoitems'),$withbookmark,false); } @@ -639,10 +662,14 @@ class PagewidgetController extends Controller break; } } - + + // Préference utilisateur + $modedesktop = $this->getKeyPreference($this->entity,"modedesktop",$modedesktop); + // Profilage $itemsordered = $this->em->getRepository("CadolesPortalBundle:Item")->getUserItems($this->user,$bookmarks,$items,$itemcategorys,null,$this->get('session')->get('ssoitems'),0,true); } + // Render return $this->getRender('viewitemessential.html.twig', [ 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 b80e731f..4ae99fe1 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 @@ -403,6 +403,31 @@ } } + // Changer widget + function changeWidget(idwidget,key,value) { + {% if app.user %} + if(key=="modedesktop") { + value=value+1; + console.log(value); + if(value==4) value=0; + console.log(value); + } + + $.ajax({ + method: "POST", + url: "{{ path('cadoles_core_user_preference') }}", + data: { + id:idwidget, + key:key, + value:value + }, + success: function() { + location.reload(); + } + }); + {% endif %} + } + // 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'})}}"; 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 716fba30..c62aa909 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 @@ -48,6 +48,10 @@ {% else %}
+ {% if canadd %} + + {% endif %} + {% if canupdate %} 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 2e8b42d9..7b17c24c 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 @@ -48,6 +48,10 @@ {% else %}
+ {% if canadd %} + + {% endif %} + {% if canupdate %}