Merge pull request #366 from dbarzin/dev

fix invalid menu activation

Author: dbarzin

ROADMAP.md

@@ -11,8 +11,8 @@ This document contains the evolutions planned in 2024 / 2025.
 * [x] Measurement linked to multiple controls
 * [x] Groups management
 * [ ] Export set of controls for audit
-* [ ] Docker
 * [ ] Automatically remove measurements after a defined number of months
+* [ ] Docker
 * [ ] Non-regression tests
 
 ## Improvements

resources/css/app.css

@@ -23,7 +23,7 @@
   border-color: #023671 !important;
 }
 
-/* Temporary fix for file upload */
+/* Temporary fix for Metro file upload */
 input[type="file"] {
     display: block;
     font-size: 16px;

resources/views/layout.blade.php

@@ -39,7 +39,9 @@
                     <span class="caption">{{ trans("menu.home") }}</span>
                 </a>
             </li>
-            <li class="{{ request()->is('alice*') ? 'active': '' }}">
+            <li class="{{
+                    request()->is('alice*') && !request()->is('alice/import')
+                    ? 'active': '' }}">
                 <a href="/alice/index">
                     <span class="icon mif-books"></span>
                     <span class="caption">{{ trans("menu.measures") }}</span>