[#179] Fix bad branch merge

Replace Project Nav section of sidebar to the fixed version of #179 before bad merge modified: templates/base.html
mikerae · Oct 10, 2023 · d8ab2b7 · d8ab2b7
1 parent ecba3e0
commit d8ab2b7
Showing 1 changed file with 14 additions and 15 deletions.
diff --git a/templates/base.html b/templates/base.html
@@ -124,38 +124,37 @@ <h6>{{user.first_name}} {{user.last_name}}</h6>
 
                 <!-- Projects Nav -->
                 <li class="nav-item">
-                    <a id="projects-nav" class="nav-link collapsed" data-bs-target="#components-nav"
+                    <a id="projects-nav" class="nav-link collapsed" data-bs-target="#project-nav"
                         data-bs-toggle="collapse" href="">
                         <i class="bi bi-menu-button-wide"></i><span>Projects</span><i
                             class="bi bi-chevron-down ms-auto"></i>
                     </a>
                     {% if office %}
-                    <ul id="components-nav" class="nav-content collapse " data-bs-parent="#sidebar-nav">
-                        <li class="nav-item">
+                    <ul id="project-nav" class="nav-content collapse" data-bs-parent="#projects-nav">
+                        <li>
                             {% for project in projects %}
-                            <a class="nav-content collapsed" data-bs-target="#{{project.slug}}-nav"
-                                data-bs-toggle="collapse" href="">
-                                <i class="bi bi-menu-button-wide"></i><span>{{project.name}}</span><i
-                                    class="bi bi-chevron-down ms-auto"></i>
+                            <a id="project{{project.id}}-nav" class="dropdown-toggle" role="button"
+                                data-bs-toggle="dropdown" aria-expanded="false" data-bs-parent="#project-nav" href="">
+                                <i class="bi bi-circle"></i><span class="text-wrap">{{project.name}}</span>
                             </a>
-                            <ul id="{{project.slug}}-nav" class="nav-content collapse" data-bs-parent="#components-nav">
-                                <li class="nav-item">
-                                    {% for section in sections %}
-                                    <a href="{% url 'rota_office' project.slug section.id %}">
-                                        <i class="bi bi-circle"></i><span>{{section.name}}</span>
+                            <ul class="dropdown-menu" area-labelledby="project{{project.id}}-nav">
+                                {% for section in sections %}
+                                <li>
+                                    <a class="dropdown-item" href="{% url 'rota_office' project.slug section.id%}">
+                                        <i class="bi bi-circle"></i>{{section.name}}
                                     </a>
-                                    {% endfor %}
                                 </li>
+                                {% endfor %}
                             </ul>
                             {% endfor %}
                         </li>
                     </ul>
                     {% else %}
-                    <ul id="components-nav" class="nav-content collapse " data-bs-parent="#sidebar-nav">
+                    <ul id="project-nav" class="nav-content collapse" data-bs-parent="#sidebar-nav">
                         <li>
                             {% for project in projects %}
                             <a href="{% url 'rota' project.slug %}">
-                                <i class="bi bi-circle"></i><span>{{project.name}}</span>
+                                <i class="bi bi-circle"></i>{{project.name}}
                             </a>
                             {% endfor %}
                         </li>