From fd63e06eb0b91633ea1ca6696d54f299c1c370b6 Mon Sep 17 00:00:00 2001
From: Anaïs Amato <anais.amato@irap.omp.eu>
Date: Tue, 11 May 2021 15:53:57 +0200
Subject: [PATCH] update coloration of <a> in the navbar with id and not href

---
 app/main/templates/agent.html       |  2 +-
 app/main/templates/agent_form.html  |  2 +-
 app/main/templates/agents.html      |  2 +-
 app/main/templates/charge_form.html |  2 +-
 app/main/templates/periods.html     |  2 +-
 app/main/templates/project.html     |  2 +-
 app/main/templates/projects.html    |  2 +-
 app/main/templates/services.html    |  2 +-
 app/static/js/navbar.js             |  2 +-
 app/templates/base_page.html        | 16 ++++++++--------
 app/templates/project_form.html     |  2 +-
 11 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/main/templates/agent.html b/app/main/templates/agent.html
index dca5d3f..d4f24c1 100644
--- a/app/main/templates/agent.html
+++ b/app/main/templates/agent.html
@@ -11,7 +11,7 @@
 {% block content %}
 
 <!-- Invisible span to definte wich ul and a in the navbar are actived -->
-<span id="nav_actived" style="display: none">agent,agents</span>
+<span id="nav_actived" style="display: none">agent,liste_agents</span>
 
 <div class="card">
   <div class="card-header">
diff --git a/app/main/templates/agent_form.html b/app/main/templates/agent_form.html
index 315b618..ec95dc1 100644
--- a/app/main/templates/agent_form.html
+++ b/app/main/templates/agent_form.html
@@ -10,7 +10,7 @@
 {% block content %}
 
   <!-- Invisible span to define wich ul and a in the navbar are actived -->
-  <span id="nav_actived" style="display: none">cds,agent/create</span>
+  <span id="nav_actived" style="display: none">cds,edit_agent</span>
 
   <form id="agent_form" class="pdc-form" action="{{ url_for('main.agent_edit') }}" method="post">
     {% if agent and agent['id'] not in ['', None] %}
diff --git a/app/main/templates/agents.html b/app/main/templates/agents.html
index f7a2a85..67cce38 100644
--- a/app/main/templates/agents.html
+++ b/app/main/templates/agents.html
@@ -10,7 +10,7 @@
 {% block content %}
 
 <!-- Invisible span to definte wich ul and a in the navbar are actived -->
-<span id="nav_actived" style="display: none">agent,agents</span>
+<span id="nav_actived" style="display: none">agent,liste_agents</span>
 
 <table id="table_datatables" class="table table-hover">
   <thead>
diff --git a/app/main/templates/charge_form.html b/app/main/templates/charge_form.html
index 7f92ea7..5c1619c 100644
--- a/app/main/templates/charge_form.html
+++ b/app/main/templates/charge_form.html
@@ -2,7 +2,7 @@
 {% block content %}
 
   <!-- Invisible span to definte wich ul and a in the navbar are actived -->
-  <span id="nav_actived" style="display: none">cds,charge/add</span>
+  <span id="nav_actived" style="display: none">cds,add_charge</span>
 
   <form id="charge_form" class="pdc-form" action="{{ url_for('main.charge_add') }}" method="post">
     <div class="form-group">
diff --git a/app/main/templates/periods.html b/app/main/templates/periods.html
index e04766c..e8f7d63 100644
--- a/app/main/templates/periods.html
+++ b/app/main/templates/periods.html
@@ -2,7 +2,7 @@
 {% block content %}
 
 <!-- Invisible span to definte wich ul and a in the navbar are actived -->
-<span id="nav_actived" style="display: none">admin,periods</span>
+<span id="nav_actived" style="display: none">admin,liste_periodes</span>
 
 <table class="table table-hover">
   <thead>
diff --git a/app/main/templates/project.html b/app/main/templates/project.html
index 3bcda17..7740a28 100644
--- a/app/main/templates/project.html
+++ b/app/main/templates/project.html
@@ -9,7 +9,7 @@
 
 {% block content %}
 <!-- Invisible span to definte wich ul and a in the navbar are actived -->
-<span id="nav_actived" style="display: none">projet,projects</span>
+<span id="nav_actived" style="display: none">projet,liste_projets</span>
 
 <div class="card">
   <div class="card-header">
diff --git a/app/main/templates/projects.html b/app/main/templates/projects.html
index 60432b8..1736037 100644
--- a/app/main/templates/projects.html
+++ b/app/main/templates/projects.html
@@ -9,7 +9,7 @@
 {% block content %}
 
 <!-- Invisible span to definte wich ul and a in the navbar are actived -->
-<span id="nav_actived" style="display: none">projet,projects</span>
+<span id="nav_actived" style="display: none">projet,liste_projets</span>
 
 <table id="table_datatables" class="table table-hover">
   <thead>
diff --git a/app/main/templates/services.html b/app/main/templates/services.html
index c49b8a4..5d9981d 100644
--- a/app/main/templates/services.html
+++ b/app/main/templates/services.html
@@ -2,7 +2,7 @@
 {% block content %}
 
 <!-- Invisible span to definte wich ul and a in the navbar are actived -->
-<span id="nav_actived" style="display: none">service,services</span>
+<span id="nav_actived" style="display: none">service,liste_services</span>
 
 <table class="table table-hover">
   <thead>
diff --git a/app/static/js/navbar.js b/app/static/js/navbar.js
index bba12d0..2db7b15 100644
--- a/app/static/js/navbar.js
+++ b/app/static/js/navbar.js
@@ -9,5 +9,5 @@ const a_active = navbar_active_split[1];
 $("#" + ul_active).addClass("show");
 
 /* Active the li */
-var sublink_activate = $("a[href='/" + a_active + "']");
+var sublink_activate = $("#" + a_active);
 sublink_activate.addClass("sublink_activate");
\ No newline at end of file
diff --git a/app/templates/base_page.html b/app/templates/base_page.html
index 95ab0f9..f24c77e 100644
--- a/app/templates/base_page.html
+++ b/app/templates/base_page.html
@@ -47,12 +47,12 @@
                 Agent
               </a>
               <ul aria-expanded="false" class="collapse" class="nav" data-parent="#v_menu" id="agent">
-                <li class="nav-item"><a class="sub_link nav-link " href="{{ url_for('main.agents') }}">Liste des
+                <li class="nav-item"><a id="liste_agents" class="sub_link nav-link " href="{{ url_for('main.agents') }}">Liste des
                   agents</a>
                 </li>
                 <li class="nav-item"><a class="sub_link nav-link disabled" href="#">Statistiques</a></li>
                 <li class="nav-item"><a class="sub_link nav-link disabled" href="#">Liste des responsabilités</a></li>
-                <li class="nav-item"><a class="sub_link nav-link " href="{{ url_for('main.capacities') }}">Liste des
+                <li class="nav-item"><a id="capacities" class="sub_link nav-link " href="{{ url_for('main.capacities') }}">Liste des
                   fonctions</a>
                 </li>
                 <li class="nav-item"><a class="sub_link nav-link disabled" href="#">Liste des compétences</a></li>
@@ -66,7 +66,7 @@
                 Projet
               </a>
               <ul aria-expanded="false" class="collapse" data-parent="#v_menu" id="projet">
-                <li class="nav-item"><a class="sub_link nav-link " href="{{ url_for('main.projects') }}">Liste des
+                <li class="nav-item"><a id="liste_projets" class="sub_link nav-link " href="{{ url_for('main.projects') }}">Liste des
                   projets</a></li>
                 <li class="nav-item"><a class="sub_link nav-link disabled" href="#">Statistiques</a></li>
                 <li class="nav-item"><a class="sub_link nav-link disabled" href="#">Listes des domaines</a></li>
@@ -80,7 +80,7 @@
                 Service
               </a>
               <ul aria-expanded="false" class="collapse" data-parent="#v_menu" id="service">
-                <li class="nav-item"><a class="sub_link nav-link " href="{{ url_for('main.services') }}">Liste des
+                <li class="nav-item"><a id="liste_services" class="sub_link nav-link " href="{{ url_for('main.services') }}">Liste des
                   services</a>
                 </li>
                 <li class="nav-item"><a class="sub_link nav-link disabled" href="#">Statistiques</a></li>
@@ -92,12 +92,12 @@
                 Chef de service
               </a>
               <ul aria-expanded="false" class="collapse" data-parent="#v_menu" id="cds">
-                <li class="nav-item"><a class="sub_link nav-link " href="{{ url_for('main.agent_edit') }}">Ajouter un
+                <li class="nav-item"><a id="edit_agent" class="sub_link nav-link " href="{{ url_for('main.agent_edit') }}">Ajouter un
                   Agent</a></li>
                 <li class="nav-item"><a class="sub_link nav-link disabled" href="#">Renseigner le statut d'un agent pour
                   un
                   semestre</a></li>
-                <li class="nav-item"><a class="sub_link nav-link " href="{{ url_for('main.charge_add') }}">Affecter un
+                <li class="nav-item"><a id="add_charge" class="sub_link nav-link " href="{{ url_for('main.charge_add') }}">Affecter un
                   agent à un
                   projet/service</a></li>
                 <li class="nav-item"><a class="sub_link nav-link disabled" href="#">Création agent virtuel</a></li>
@@ -113,7 +113,7 @@
               </a>
               <ul aria-expanded="false" class="collapse" data-parent="#v_menu" id="admin">
 
-                <li class="nav-item"><a class="sub_link nav-link" href="{{ url_for('main.project_edit') }}">Nouveau projet</a></li>
+                <li class="nav-item"><a id="project_edit" class="sub_link nav-link" href="{{ url_for('main.project_edit') }}">Nouveau projet</a></li>
                 <li class="nav-item"><a class="sub_link nav-link disabled" href="#">Nouveau service</a></li>
                 <li class="nav-item"><a class="sub_link nav-link disabled" href="#">Nouvelle compétence</a></li>
                 <li class="nav-item"><a class="sub_link nav-link disabled" href="#">Nouvelle fonction</a></li>
@@ -123,7 +123,7 @@
                   projet</a></li>
                 <li class="nav-item"><a class="sub_link nav-link disabled" href="#">Affecter un responsable de
                   service</a></li>
-                <li class="nav-item"><a class="sub_link nav-link " href="{{ url_for('main.periods') }}">Liste des
+                <li class="nav-item"><a id="liste_periodes" class="sub_link nav-link " href="{{ url_for('main.periods') }}">Liste des
                   périodes</a></li>
                 <li class="nav-item"><a class="sub_link nav-link disabled" href="#">Nouveau semestre</a></li>
 
diff --git a/app/templates/project_form.html b/app/templates/project_form.html
index b4e8ffc..9140844 100644
--- a/app/templates/project_form.html
+++ b/app/templates/project_form.html
@@ -10,7 +10,7 @@
 {% block content %}
 
   <!-- Invisible span to define wich ul and a in the navbar are actived -->
-  <span id="nav_actived" style="display: none">admin,project/create</span>
+  <span id="nav_actived" style="display: none">admin,project_edit</span>
 
   <form id="project_form" class="pdc-form" action="{{ url_for('main.project_edit') }}" method="post">
     {% if project['id'] and project['id'] != '' %}
--
libgit2 0.21.2