fix: use Expression Language instead

Signed-off-by: WoodenMaiden <yann.pomie@laposte.net>
SouthGreenPlatform · Jul 16, 2024 · 8edcfbc · 8edcfbc
1 parent a9d55dc
commit 8edcfbc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/agrold-javaweb/.vscode.template/settings.json b/agrold-javaweb/.vscode.template/settings.json
@@ -1,7 +1,7 @@
 {
   "maven.terminal.favorites": [
     {
-      "command": "package docker:start fizzed-watcher:run",
+      "command": "package docker:start fizzed-watcher:run -DCATALINA_OPTS='-Dagrold.description=Local -Dagrold.instance=dev'",
       "debug": false,
       "alias": "Run in container"
     }

diff --git a/agrold-javaweb/src/main/webapp/header.jsp b/agrold-javaweb/src/main/webapp/header.jsp
@@ -6,17 +6,8 @@
             <span class="navbar-toggler-icon"></span>
         </button>
         <div class="container">
-            <%! String home = System.getProperty("agrold.name", "aldp"); %>
-            <a class="navbar-brand" href="/<%= home %>">
-                <%
-                    String type = System.getProperty("agrold.instance", "");
-                    if (type == "dev") {
-                %>
-                <span class="ribbon bg-info">DEV</span>
-                <%
-                    }
-                %>
-
+            <a class="navbar-brand" href="/${System.getProperty('agrold.name', 'aldp')}">
+                <span class="ribbon ${System.getProperty('agrold.instance').toLowerCase() == 'dev' ? 'bg-info' : 'd-none'}">DEV</span>
                 <img src="images/v5.png">
             </a>