From 3ba041b207105745f28187017d900c09dfbbdeb1 Mon Sep 17 00:00:00 2001
From: afornerot <afornerot@cadoles.com>
Date: Fri, 11 Jun 2021 14:31:01 +0200
Subject: [PATCH] ajout du nom de la page dans la barre de navigation (fixes
 #32762)

---
 .../Resources/views/Page/menugroupe.html.twig |  6 +-
 .../Resources/views/Page/pages.html.twig      | 71 ++++---------------
 2 files changed, 18 insertions(+), 59 deletions(-)

diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/menugroupe.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/menugroupe.html.twig
index 87c61532..4538fddf 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/menugroupe.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/menugroupe.html.twig
@@ -13,7 +13,7 @@
                         {% endif %}
                         
                         <li id="menupage-{{page.id}}" {{ isactive }} class="list-group-item {{isactive}}" onClick="$('#listgrouppage li').removeClass('active'); $(this).addClass('active') " style="cursor:pointer">
-                            <a data-group="{{groupshared.id}}" onClick="$('#selgrouppages').modal('hide'); showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','group','{{forcereload}}','{{groupshared.id}}')">
+                            <a data-group="{{groupshared.id}}" onClick="$('#selgrouppages').modal('hide'); showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','group','{{forcereload}}','{{groupshared.id}}','{{page.name}}')">
                                 {% if page.fonticon %}
                                     <i class="{{ page.fonticon }} fa-faw"></i>
                                 {% else %}
@@ -55,7 +55,7 @@
                     {% endif %}
                     
                     <li id="menupage-{{page.id}}" {{ isactive }}  style="cursor:pointer">
-                        <a data-group="{{groupshared.id}}" onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','group','{{forcereload}}','{{groupshared.id}}')">
+                        <a data-group="{{groupshared.id}}" onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','group','{{forcereload}}','{{groupshared.id}}','{{page.name}}')">
                             {% if page.fonticon %}
                                 <i class="{{ page.fonticon }} fa-faw"></i>
                             {% else %}
@@ -93,7 +93,7 @@
                                     {% endif %}
 
                                     <li id="menupage-{{page.id}}" {{isactive}} style="cursor:pointer">
-                                        <a onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','group','{{forcereload}}','{{groupshared.id}}')">
+                                        <a onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','group','{{forcereload}}','{{groupshared.id}}','{{page.name}}')">
                                             {% if page.fonticon %}
                                                 <i class="{{ page.fonticon }} fa-faw"></i>
                                             {% endif %}
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/pages.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/pages.html.twig
index 0db83d96..c2d5e1e6 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/pages.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/pages.html.twig
@@ -15,7 +15,7 @@
 
             {% if entity.id is defined and page.id==entity.id %}
                 <li id="menupage-{{page.id}}" class="active" style="cursor:pointer">
-                    <a onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','portal','{{forcereload}}')">
+                    <a onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','portal','{{forcereload}}',null,'{{page.name}}')">
                         {% if page.fonticon %}
                             <i class="{{ page.fonticon }} fa-faw"></i>&nbsp;
                         {% endif %}                    
@@ -24,7 +24,7 @@
                 </li>
             {% else %}
                 <li id="menupage-{{page.id}}">
-                    <a style="cursor:pointer" onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','portal','{{forcereload}}')">
+                    <a style="cursor:pointer" onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','portal','{{forcereload}}',null,'{{page.name}}')">
                         {% if page.fonticon %}
                             <i class="{{ page.fonticon }} fa-faw"></i>&nbsp;
                         {% endif %}                       
@@ -45,7 +45,7 @@
 
             {% if entity.id is defined and page.id==entity.id %}
                 <li id="menupage-{{page.id}}" class="active" style="cursor:pointer">
-                    <a onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','user','{{forcereload}}')">
+                    <a onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','user','{{forcereload}}',null,'{{page.name}}')">
                         {% if page.fonticon %}
                             <i class="{{ page.fonticon }} fa-faw"></i>
                         {% else %}
@@ -56,7 +56,7 @@
                 </li>
             {% else %}
                 <li id="menupage-{{page.id}}">
-                    <a style="cursor:pointer" onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','user','{{forcereload}}')">
+                    <a style="cursor:pointer" onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','user','{{forcereload}}',null,'{{page.name}}')">
                         {% if page.fonticon %}
                             <i class="{{ page.fonticon }} fa-faw"></i>
                         {% else %}
@@ -91,6 +91,8 @@
 
 
     <div id="menupageaction">
+        <a id="menuname" style="cursor:pointer;font-size:80%" href="">qsfqsdf</a>
+
         {% if canadd %}
             <a id="menusubmit" style="cursor:pointer" onclick="submitPage()" title='Ajouter une page'><i class='fa fa-plus fa-fw'></i></a>
         {% endif %}
@@ -256,20 +258,20 @@
         {% if gotoroute is empty %}
             {% for page in pagesadmin %} 
                 {% if page.id==entity.id %}
-                    showPage({{ page.id }}, {{ page.pagecategory.id }},'{{ page.canupdate }}','portal');
+                    showPage({{ page.id }}, {{ page.pagecategory.id }},'{{ page.canupdate }}','portal',false,null,'{{page.name}}');
                 {% endif %}
             {% endfor %}
             
             {% for page in pagesuser %} 
                 {% if page.id==entity.id %}
-                    showPage({{ page.id }}, {{ page.pagecategory.id }},'{{ page.canupdate }}','user');
+                    showPage({{ page.id }}, {{ page.pagecategory.id }},'{{ page.canupdate }}','user',false,null,'{{page.name}}');
                 {% endif %}
             {% endfor %}      
             
             {% for groupshared in groupsshared %}
                 {% for page in groupshared.pagesshared %}
                     {% if page.id==entity.id %}
-                        showPage({{ page.id }}, {{ page.pagecategory.id }},'{{ page.canupdate }}','group',true,{{groupshared.id}});
+                        showPage({{ page.id }}, {{ page.pagecategory.id }},'{{ page.canupdate }}','group',true,{{groupshared.id}},'{{page.name}}');
                     {% endif %}
                 {% endfor %}       
             {% endfor %}
@@ -406,7 +408,7 @@
     }
 
     // Affichages des pages
-    function showPage(id,catid,canupdate,usage,forcereload,groupid) {
+    function showPage(id,catid,canupdate,usage,forcereload,groupid,pagename) {
         // Sauvegarder la page en cours
         idpage=id;   
 
@@ -449,6 +451,10 @@
             $("#badge-"+groupid).remove()
         }
 
+        // Nom de la page
+        console.log(pagename);
+        $("#menuname").html(pagename);
+
         // Cacher les actions possibles sur la page
         $("#menuupdate").hide();
         $("#menushare").hide();
@@ -578,19 +584,7 @@
         $(location).attr('href', url);
     };      
 
-	function loadmsgCounter() {
-                        /*
-                        menu=$("a[data-group='"+payload.group+"']");
-                        if(menu.length) {
-                            if(payload.add) {
-                                console.log("Ajout counter pour group "+payload.group+" by "+payload.from);
-                                if(menu.children(".badge").length) {
-                                menu.children(".badge").html(+(menu.children(".badge").html())+1);
-                                }
-                                else menu.append("<span id='badge-"+payload.group+"' class='badge'>1</span");
-                            }
-                        }  
-                        */        
+	function loadmsgCounter() {      
 
         $.ajax({
             method: "POST",
@@ -611,40 +605,5 @@
                 });  
             } 
         });
-        /*
-		$.ajax({
-			method: "GET",
-			url: "process.php?process=process-notifuser.php",
-			success: function(data, dataType)
-			{
-				if(data.trim()!="") {
-					var result=data.split(",");
-					if(parseInt(result[0])) {
-						$("#notif").show();
-					
-						if(result[1]!=0) {
-							$("#notifbadge").html(result[1]);
-							$("#notifbadge").css('display', 'inline-block');
-						}
-						else {
-							$("#notifbadge").hide();
-						}
-					}
-					else $("#notifbadge").hide();
-				}
-				else {
-					$("#notif").hide();
-				}
-			}
-		});  
-        */
 	}
-
-    // Permet de déclencher l'évenement de modification des counter
-    /* Plus nécessaire on passe par de l'ajax
-    function counter(event) {
-        $('#refreshcounter').data("event",event);
-        $('#refreshcounter').click();
-    };
-    */ 
 {% endblock %}