Merge branch 'bugfix/doc_refs' into 'master'

Corrected user guide and about doc refs See merge request caimira/caimira!521
CERN · Nov 20, 2024 · 539bf60 · 539bf60
2 parents 6b96d7c + 700bd78
commit 539bf60
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/cern_caimira/src/cern_caimira/apps/templates/base/calculator.form.html.j2 b/cern_caimira/src/cern_caimira/apps/templates/base/calculator.form.html.j2
@@ -774,15 +774,15 @@
 <br><br>
 
 <div class="container container--padding">
-  <b>Quick Guide</b>: Refer to <a href="{{ documentation_url }}/project_overview/user_guide/quick_guide"> Calculator App quick user guide</a>.
+  <b>Quick Guide</b>: Refer to <a href="{{ documentation_url }}/user_interfaces/CAiMIRA/quick_guide"> Calculator App quick user guide</a>.
   <br>
-  <b>Full Guide</b>: Refer to <a href="{{ documentation_url }}/project_overview/user_guide/full_guide"> Calculator App full user guide</a>.
+  <b>Full Guide</b>: Refer to <a href="{{ documentation_url }}/user_interfaces/CAiMIRA/full_guide"> Calculator App full user guide</a>.
   <br>
 </div>
 
 <div class="center container--padding pr-3 pl-3">
 <button class="btn btn-primary bigButton">
-  <a href="{{ documentation_url }}/project_overview/user_guide/full_guide" class="nav-link" style="color:white">User guide</a>
+  <a href="{{ documentation_url }}/user_interfaces/CAiMIRA/full_guide" class="nav-link" style="color:white">User guide</a>
 </button>
 <button class="btn btn-primary bigButton  ml-2" type="button" data-toggle="collapse" data-target="#collapseDisclaimer" aria-expanded="false" aria-controls="collapseDisclaimer">
     Disclaimer 

diff --git a/cern_caimira/src/cern_caimira/apps/templates/base/index.html.j2 b/cern_caimira/src/cern_caimira/apps/templates/base/index.html.j2
@@ -50,7 +50,7 @@
     </div>
     <div class="w-25 mobile-sub-section"><hr width="95%">
       <div class="d-flex m-2 align-items-center"><i class="bi bi-info-square-fill" style="font-size: 25px"></i><div><p class="paragraph-title ml-2">About</p></div></div>
-      <div class="m-2"><a href="{{ documentation_url }}/about">About</a> page for details on methodology, assumptions and limitations of CAiMIRA.</div>
+      <div class="m-2"><a href="{{ documentation_url }}/root/about">About</a> page for details on methodology, assumptions and limitations of CAiMIRA.</div>
     </div>
     <div class="w-25 mobile-sub-section"><hr width="95%">
       <div class="d-flex m-2 align-items-center"><i class="bi bi-journal-text" style="font-size: 25px"></i><div><p class="paragraph-title ml-2">Documentation</p></div></div>

diff --git a/cern_caimira/src/cern_caimira/apps/templates/base/layout.html.j2 b/cern_caimira/src/cern_caimira/apps/templates/base/layout.html.j2
@@ -44,19 +44,19 @@
               </a>
               <ul class="dropdown-menu dropwown-navbar-colors" style="min-width: 12rem;" aria-labelledby="navbarDropdown">
                 <li><a href="{{ get_calculator_url() }}" class="{{ "header-navbar nav-link active" if "calculator/" == active_page else "header-navbar nav-link" }}">Calculator</a></li>
-                <li><div class="d-flex"><span class="d-flex align-self-center submenu-division"></span><a href="{{ documentation_url }}/project_overview/user_guide/full_guide" class="header-navbar nav-link">User Guide</a></div></li>
+                <li><div class="d-flex"><span class="d-flex align-self-center submenu-division"></span><a href="{{ documentation_url }}/user_interfaces/CAiMIRA/full_guide" class="header-navbar nav-link">User Guide</a></div></li>
                 <li><a href="{{ get_url() }}/expert-app" class="{{ "header-navbar nav-link active" if "expert-app" == active_page else "header-navbar nav-link" }}">Expert app</a></li>
                 <li><a href="{{ get_url() }}/expert-app" class="{{ "header-navbar nav-link active" if "expert-app" == active_page else "header-navbar nav-link" }}">CO₂ Simulator</a></li>
               </ul>
             </li>
           </div>
           <div id="mobile_calculator_option">
             <li class="nav-link"><a href="{{ get_calculator_url() }}" class="{{ "header-navbar nav-link active" if "calculator/" == active_page else "header-navbar nav-link" }}">Calculator</a></li>
-            <li class="nav-link"><a href="{{ documentation_url }}/project_overview/user_guide/full_guide" class="header-navbar nav-link">User Guide</a></li>
+            <li class="nav-link"><a href="{{ documentation_url }}/user_interfaces/CAiMIRA/full_guide" class="header-navbar nav-link">User Guide</a></li>
           </div>
           {% block covid_information%}
           {% endblock covid_information%}
-          <li class="nav-link"><a href="{{ documentation_url }}/project_overview/about/" class="header-navbar nav-link">About</a></li>
+          <li class="nav-link"><a href="{{ documentation_url }}/root/about" class="header-navbar nav-link">About</a></li>
             {% if user.is_authenticated() %}
             <li class="nav-item dropdown p-2">
               <a class="nav-link active dropdown-toggle d-inline-block" href="https://cern.ch/users-portal" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">