From f3f718421641f64c0b20cd2587cdda8d3b66fffd Mon Sep 17 00:00:00 2001
From: Luis Aleixo <luis.aleixo@cern.ch>
Date: Fri, 8 Oct 2021 12:07:30 +0200
Subject: [PATCH] Added expert app back to topbar, and moved user guide button
 to calculator page

---
 cara/apps/calculator/templates/calculator.form.html.j2 | 4 ++++
 cara/apps/templates/layout.html.j2                     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/cara/apps/calculator/templates/calculator.form.html.j2 b/cara/apps/calculator/templates/calculator.form.html.j2
index 872b5406..b9dcd305 100644
--- a/cara/apps/calculator/templates/calculator.form.html.j2
+++ b/cara/apps/calculator/templates/calculator.form.html.j2
@@ -441,6 +441,10 @@ v{{ calculator_version }} <span style="float:right; font-weight:bold">Please sen
 </section>
 
 <div class="center">
+  <button class="btn btn-primary bigButton">
+    <a href="{{ calculator_prefix }}/user-guide" class="{{ "nav-link active" if "user-guide" in active_page else "nav-link" }}">User guide</a>
+  </button>
+  &nbsp;&nbsp;
   <button type='submit' class="btn btn-primary bigButton" id="generate_report">
       Generate report
   </button>
diff --git a/cara/apps/templates/layout.html.j2 b/cara/apps/templates/layout.html.j2
index dceffb77..d5fa30b5 100644
--- a/cara/apps/templates/layout.html.j2
+++ b/cara/apps/templates/layout.html.j2
@@ -45,7 +45,7 @@
         <ul class="navbar-nav ml-auto">
           <li class="nav-item"><a href="/" class="{{ "nav-link active" if "home/" == active_page else "nav-link" }}">HOME</a></li>
           <li class="nav-item"><a href="{{ calculator_prefix }}" class="{{ "nav-link active" if "calculator/" == active_page else "nav-link" }}">COVID CALCULATOR</a></li>
-          <li class="nav-item"><a href="{{ calculator_prefix }}/user-guide" class="{{ "nav-link active" if "user-guide" in active_page else "nav-link" }}">USER GUIDE</a></li>
+          <li class="nav-item"><a href="/expert-app" class="{{ "nav-link active" if "/expert-app" == active_page else "nav-link" }}">EXPERT APP (BETA)</a></li>
           <li class="nav-item"><a href="https://hse.cern/covid-19-information" class="nav-link">COVID INFORMATION</a></li>
           <li class="nav-item"><a href="/about" class="{{ "nav-link active" if "about" == active_page else "nav-link" }}">ABOUT</a></li>
         </ul>