diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/look.png b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/look.png
index e7872ab3..26c736ac 100644
Binary files a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/look.png and b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/look.png differ
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/transnum-logo.png b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/transnum-logo.png
index e7872ab3..26c736ac 100644
Binary files a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/transnum-logo.png and b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/transnum-logo.png differ
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Config/datauser.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Config/datauser.html.twig
index d2bee48f..41cedf87 100755
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Config/datauser.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Config/datauser.html.twig
@@ -6,7 +6,7 @@
{% if mode=="datauser" %}
Paramétrage de la Fiche Utilisateur
{% else %}
- Paramétrage de la Listes des Utilisateurs
+ Paramétrage de la Liste des Utilisateurs
{% endif %}
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/list.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/list.html.twig
index a462021b..17dff5e9 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/list.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/list.html.twig
@@ -33,7 +33,7 @@ td { font-size: 10px; }
Action |
{% endif %}
Avatar |
- Login |
+ Login |
Nom |
Prénom |
Email |
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 b4857153..e94e3132 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php
@@ -523,7 +523,12 @@ class PagewidgetController extends Controller
}
$itemsroles=$qb->getQuery()->getResult();
foreach($itemsroles as $itemrole) {
- if(!$bookmarksitems->contains($itemrole) && !$items->contains($itemrole)) $items->add($itemrole);
+ if($withbookmark==1) {
+ if(!$items->contains($itemrole)) $items->add($itemrole);
+ }
+ else {
+ if(!$bookmarksitems->contains($itemrole) && !$items->contains($itemrole)) $items->add($itemrole);
+ }
}
}
@@ -541,7 +546,12 @@ class PagewidgetController extends Controller
}
$itemsgroups=$qb->getQuery()->getResult();
foreach($itemsgroups as $itemgroup) {
- if(!$bookmarksitems->contains($itemgroup) && !$items->contains($itemgroup)) $items->add($itemgroup);
+ if($withbookmark==1) {
+ if(!$items->contains($itemgroup)) $items->add($itemgroup);
+ }
+ else {
+ if(!$bookmarksitems->contains($itemgroup) && !$items->contains($itemgroup)) $items->add($itemgroup);
+ }
}
}
@@ -559,7 +569,12 @@ class PagewidgetController extends Controller
}
$itemsniveau01s=$qb->getQuery()->getResult();
foreach($itemsniveau01s as $itemniveau01) {
- if(!$bookmarksitems->contains($itemniveau01) && !$items->contains($itemniveau01)) $items->add($itemniveau01);
+ if($withbookmark==1) {
+ if(!$items->contains($itemniveau01)) $items->add($itemniveau01);
+ }
+ else {
+ if(!$bookmarksitems->contains($itemniveau01) && !$items->contains($itemniveau01)) $items->add($itemniveau01);
+ }
}
}