diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/RegistrationController.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/RegistrationController.php
index 9c872f4f..bdbbf465 100755
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/RegistrationController.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/RegistrationController.php
@@ -286,7 +286,7 @@ class RegistrationController extends Controller
array_push($to,$emailmodo["email"]);
}
- $url = $this->generateUrl('cadoles_core_config_registration', '', UrlGeneratorInterface::ABSOLUTE_URL);
+ $url = $this->generateUrl('cadoles_core_config_registration', [], UrlGeneratorInterface::ABSOLUTE_URL);
$mail_params=array(
"subject" => $appname." : Inscription à valider",
"body_html"=>"Un utilisateur dont le mail n’est pas en liste blanche souhaite s’inscrire au ".$appname.".\nMerci d’approuver son inscription pour finaliser celle-ci.
Veuillez vérifier cette inscription à cette adresse:
$url",
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 7407f8e6..2a373500 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/RegistrationType.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Form/RegistrationType.php
@@ -33,7 +33,7 @@ class RegistrationType extends AbstractType
$builder->add('submit',
SubmitType::class, array(
- "label" => ($options["mode"]=="delete"?"Confirmer la Suppression":"Confirmer"),
+ "label" => ($options["mode"]=="delete"?"Confirmer la Suppression":($options["mode"]=="submit"?"Confirmer":"Sauvegarder et envoyer le mail")),
"attr" => ($options["mode"]=="delete"?array("class" => "btn btn-danger"):array("class" => "btn btn-success"))
)
);
@@ -41,7 +41,7 @@ class RegistrationType extends AbstractType
if($options["mode"]=="send") {
$builder->add('save',
SubmitType::class, array(
- "label" => "Sauvegarder",
+ "label" => "Sauvegarder sans envoyer le mail",
"attr" => array("class" => "btn btn-success")
)
);
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/edit.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/edit.html.twig
index cf297b66..13f492b6 100755
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/edit.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/edit.html.twig
@@ -89,20 +89,6 @@
{% endif %}
-
- {% if group.icon %}
-
- {% endif %}
-
-
-
-
-
-
{% if form.fgcancreatepage is defined %}
@@ -123,7 +109,24 @@
{{ form_widget(form.fgcancreateproject) }}
-
+ {% endif %}
+
+
+
+
+ {% if group.icon %}
+
+ {% endif %}
+
+
+
+
+
+ {% if form.fgcancreatepage is defined %}
Elements du Portail
@@ -143,46 +146,6 @@
{% endif %}
-
-
{{ form_end(form) }}
{% endblock %}
@@ -245,13 +208,21 @@
hideshow();
});
- function selIcon(idicon) {
+ function selIcon(idicon,label) {
$("#group_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 UN 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/CoreBundle/Resources/views/Mail/users.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Mail/users.html.twig
index a631bbc6..7419c7d0 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Mail/users.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Mail/users.html.twig
@@ -7,7 +7,7 @@
{% if not usersnotin is empty %}
Les utilisateurs suivants existent déjà dans {{ app.session.get('appname') }}
- Vous pouvez les ajouter dès maintenant à votre groupe
+ Pour les ajouter à votre groupe cliquez sur le symbole bleu “+” situé à gauche de leur nom
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 8bf0b316..3ef5ba5a 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/IconController.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/IconController.php
@@ -19,8 +19,10 @@ class IconController extends Controller
private $labeldata = 'icon';
private $labeldatas = 'icons';
- public function listAction($access="config")
+ public function listAction(Request $request,$access="config")
{
+ $inframe=$request->get("inframe");
+
$em = $this->getDoctrine()->getManager();
if($access=="config")
$icons=$this->getDoctrine()->getRepository("CadolesPortalBundle:Icon")->findBy(["user"=>null]);
@@ -28,16 +30,19 @@ class IconController extends Controller
$icons=$this->getDoctrine()->getRepository("CadolesPortalBundle:Icon")->findBy(["user"=>$this->getUser()]);
return $this->render($this->labelentity.':list.html.twig',[
- 'useheader' => true,
+ 'useheader' => !($inframe),
'usemenu' => false,
'usesidebar' => ($access=="config"),
'access' => $access,
- $this->labeldatas => $icons
+ $this->labeldatas => $icons,
+ 'inframe' => $inframe
]);
}
public function submitAction(Request $request,$access="config")
{
+ $inframe=$request->get("inframe");
+
// Initialisation de l'enregistrement
$data = new Icon();
@@ -62,23 +67,26 @@ class IconController extends Controller
$em->flush();
// Retour à la liste
- return $this->redirectToRoute('cadoles_portal_'.$access.'_icon');
+ return $this->redirectToRoute('cadoles_portal_'.$access.'_icon',['inframe'=>$inframe]);
}
// Affichage du formulaire
return $this->render($this->labelentity.':edit.html.twig', [
- 'useheader' => true,
+ 'useheader' => !($inframe),
'usemenu' => false,
'usesidebar' => ($access=="config"),
'access' => $access,
$this->labeldata => $data,
'mode' => 'submit',
'form' => $form->createView(),
+ 'inframe' => $inframe,
]);
}
public function updateAction($id,Request $request,$access="config")
{
+ $inframe=$request->get("inframe");
+
// Récupération de l'enregistrement courant
$data=$this->getData($id);
@@ -103,13 +111,13 @@ class IconController extends Controller
$em->flush();
// Retour à la liste
- return $this->redirectToRoute('cadoles_portal_'.$access.'_icon');
+ return $this->redirectToRoute('cadoles_portal_'.$access.'_icon',['inframe'=>$inframe]);
}
// Affichage du formulaire
return $this->render($this->labelentity.':edit.html.twig', [
- 'useheader' => true,
+ 'useheader' => !($inframe),
'usemenu' => false,
'usesidebar' => ($access=="config"),
'access' => $access,
@@ -117,11 +125,14 @@ class IconController extends Controller
'mode' => 'update',
'form' => $form->createView(),
'refresh' => false,
+ 'inframe' => $inframe
]);
}
public function deleteAction($id,Request $request,$access="config")
{
+ $inframe=$request->get("inframe");
+
// Récupération de l'enregistrement courant
$data=$this->getData($id);
@@ -132,9 +143,25 @@ class IconController extends Controller
$em->remove($data);
$em->flush();
- return $this->redirectToRoute('cadoles_portal_'.$access.'_icon');
+ return $this->redirectToRoute('cadoles_portal_'.$access.'_icon',['inframe'=>$inframe]);
}
+ public function selectAction($access="config") {
+ // Affichage du formulaire
+ $icons=$this->getDoctrine()->getRepository("CadolesPortalBundle:Icon")->findBy(["user"=>null]);
+ $iconsuser=null;
+ if($access=="user") $iconsuser=$this->getDoctrine()->getRepository("CadolesPortalBundle:Icon")->findBy(["user"=>$this->getUser()]);
+
+ return $this->render($this->labelentity.':select.html.twig',[
+ 'useheader' => false,
+ 'usemenu' => false,
+ 'usesidebar' => false,
+ 'access' => $access,
+ $this->labeldatas => $icons,
+ 'iconsuser' => $iconsuser
+ ]);
+
+ }
public function iconAction()
{
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/config/routing.yml b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/config/routing.yml
index d5a07897..b1f73f56 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/config/routing.yml
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/config/routing.yml
@@ -59,6 +59,10 @@ cadoles_portal_config_icon_delete:
path: /config/icon/delete/{id}
defaults: { _controller: CadolesPortalBundle:Icon:delete, access: config }
+cadoles_portal_config_icon_select:
+ path: /config/icon/select
+ defaults: { _controller: CadolesPortalBundle:Icon:select, access: config }
+
cadoles_portal_config_icon_icon:
path: /config/icon/icon
defaults: { _controller: CadolesPortalBundle:Icon:icon, access: config }
@@ -79,6 +83,10 @@ cadoles_portal_user_icon_delete:
path: /user/icon/delete/{id}
defaults: { _controller: CadolesPortalBundle:Icon:delete, access: user }
+cadoles_portal_user_icon_select:
+ path: /user/icon/select
+ defaults: { _controller: CadolesPortalBundle:Icon:select, access: user }
+
cadoles_portal_user_icon_icon:
path: /user/icon/icon
defaults: { _controller: CadolesPortalBundle:Icon:icon, access: user }
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Icon/edit.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Icon/edit.html.twig
index e2fcce3b..1a4fead2 100755
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Icon/edit.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Icon/edit.html.twig
@@ -2,18 +2,20 @@
{% block pagewrapper %}
{{ form_start(form) }}
-
+ {% if not inframe %}
+
+ {%endif%}
{{ form_widget(form.submit) }}
- Annuler
+ Annuler
{% if mode=="update" %}
-
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Icon/list.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Icon/list.html.twig
index 0bf0f0e1..ac84dc92 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Icon/list.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Icon/list.html.twig
@@ -1,13 +1,20 @@
{% extends '@CadolesCore/base.html.twig' %}
{% block pagewrapper %}
-
+ {% if not inframe %}
+
+ {% endif %}
+
+
+ Ajouter
+ {% if inframe %}
+ Fermer
+ {% endif %}
+
- Ajouter
-
{% for icon in icons %}
-
+
{% endfor %}
{% endblock %}
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
new file mode 100644
index 00000000..3a5bbdcd
--- /dev/null
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Icon/select.html.twig
@@ -0,0 +1,32 @@
+{% extends '@CadolesCore/base.html.twig' %}
+
+{% block pagewrapper %}
+
+
+
+
+ {% if iconsuser is not empty %}
+
Mes Icônes
+ {% for icon in iconsuser %}
+
+
+
+ {% endfor %}
+
+
Icônes Communs
+ {% endif %}
+ {% for icon in icons %}
+
+
+
+ {% endfor %}
+
+
+{% endblock %}
+
+
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/constants.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/constants.twig
index 855dd26a..70313427 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/constants.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/constants.twig
@@ -160,11 +160,11 @@
{% endif %}
{% if entity.border %}
- {% set stylewidgetbody = stylewidgetbody ~ "padding:10px" %}
+ {% set stylewidgetbody = stylewidgetbody ~ "padding:10px;" %}
{% endif %}
{% if not entity.opened %}
- {% set stylewidgetbody = stylewidgetbody ~ "display:none" %}
+ {% set stylewidgetbody = stylewidgetbody ~ "display:none;" %}
{% endif %}
{{ stylewidgetbody }}
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 50d233dc..c398d35a 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
@@ -28,22 +28,27 @@
{% endif %}
-