diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/IconController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/IconController.php index 3ef5ba5a..be8974f4 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/IconController.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/IconController.php @@ -32,7 +32,7 @@ class IconController extends Controller return $this->render($this->labelentity.':list.html.twig',[ 'useheader' => !($inframe), 'usemenu' => false, - 'usesidebar' => ($access=="config"), + 'usesidebar' => ($access=="config"&&!$inframe), 'access' => $access, $this->labeldatas => $icons, 'inframe' => $inframe @@ -74,7 +74,7 @@ class IconController extends Controller return $this->render($this->labelentity.':edit.html.twig', [ 'useheader' => !($inframe), 'usemenu' => false, - 'usesidebar' => ($access=="config"), + 'usesidebar' => ($access=="config"&&!$inframe), 'access' => $access, $this->labeldata => $data, 'mode' => 'submit', @@ -119,7 +119,7 @@ class IconController extends Controller return $this->render($this->labelentity.':edit.html.twig', [ 'useheader' => !($inframe), 'usemenu' => false, - 'usesidebar' => ($access=="config"), + 'usesidebar' => ($access=="config"&&!$inframe), 'access' => $access, $this->labeldata => $data, 'mode' => 'update', diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Alertcategory/edit.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Alertcategory/edit.html.twig index 2a2f0045..a5f80c5d 100755 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Alertcategory/edit.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Alertcategory/edit.html.twig @@ -57,49 +57,31 @@
- {{ form_end(form) }} {% endblock %} {% block localjavascript %} - function selIcon(idicon) { + function selIcon(idicon,label) { $("#alertcategory_idicon").val(idicon); $("#diviconsel img").remove(); - $("#icon-"+idicon).clone().appendTo($("#diviconsel")); + url="/{{ alias }}/"+label; + $("#diviconsel").append(""); $("#diviconsel img").attr("height","100px"); - $('#selicon').modal('hide'); + $("#mymodal").modal("hide"); + } + + function selectIcon() { + $("#mymodal").find(".modal-title").html("SELECTIONNER UNE ICONE"); + var url="{{ path('cadoles_portal_config_icon_select') }}"; + $("#mymodal").find("#framemodal").attr("src",url); + $("#mymodal").modal("show"); } function delIcon() { diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Bookmark/edit.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Bookmark/edit.html.twig index be282445..b60f448f 100755 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Bookmark/edit.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Bookmark/edit.html.twig @@ -69,51 +69,11 @@ - - {{ form_end(form) }} {% endblock %} @@ -126,13 +86,21 @@ showhide(); }); - function selIcon(idicon) { + function selIcon(idicon,label) { $("#bookmark_idicon").val(idicon); $("#diviconsel img").remove(); - $("#icon-"+idicon).clone().appendTo($("#diviconsel")); + url="/{{ alias }}/"+label; + $("#diviconsel").append(""); $("#diviconsel img").attr("height","100px"); - $('#selicon').modal('hide'); + $("#mymodal").modal("hide"); + } + + function selectIcon() { + $("#mymodal").find(".modal-title").html("SELECTIONNER UNE ICONE"); + var url="{{ path('cadoles_portal_user_icon_select') }}"; + $("#mymodal").find("#framemodal").attr("src",url); + $("#mymodal").modal("show"); } function delIcon() { diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Icon/select.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Icon/select.html.twig index 3a5bbdcd..c6d02ba0 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Icon/select.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Icon/select.html.twig @@ -6,6 +6,8 @@ Fermer {% if access=="user" %} Gérer mes Icônes + {% else %} + Gérer les Icônes {% endif %} @@ -13,17 +15,13 @@ {% if iconsuser is not empty %}