Merge pull request #3 from Orange-Cyberdefense/sca-develop

Fine tuning for 0.3
Orange-Cyberdefense · Feb 13, 2023 · 8192bc1 · 8192bc1
2 parents dcfe737 + 4ee81f4
commit 8192bc1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/app/base/templates/footer.html b/app/base/templates/footer.html
@@ -4,6 +4,6 @@ <h6 class="d-inline">
       &copy; <div class="text-orange d-inline">Orange</div>Cyberdefense
     </h6>
     <div class="float-right d-none d-sm-inline-block">
-      grepmarx v0.2.1
+      grepmarx v0.3.1
     </div>
   </footer>
diff --git a/app/base/templates/login.html b/app/base/templates/login.html
@@ -81,7 +81,7 @@ <h6>
             &copy; <div class="text-orange d-inline">Orange</div>Cyberdefense
           </h6>
           <small>
-            grepmarx v0.2.1
+            grepmarx v0.3.1
           </small>
         </div>
 

diff --git a/app/base/templates/sidebar.html b/app/base/templates/sidebar.html
@@ -1,7 +1,7 @@
   <!-- Main Sidebar Container -->
   <aside class="main-sidebar sidebar-dark-orange elevation-4">
     <!-- Brand Logo -->
-    <a href="index3.html" class="brand-link">
+    <a href="/" class="brand-link">
       <img src="/static/assets/img/grepmarx-icon.png" alt="grepmarx" class="brand-image mt-0 ml-2">
       <span class="brand-text">
         <h3 class="d-inline">

diff --git a/app/projects/templates/projects_list.html b/app/projects/templates/projects_list.html
@@ -177,6 +177,13 @@ <h3 class="card-title">Projects list</h3>
                                     {% endif %}
                                 </td>
                                 <td class="project-actions">
+
+                                    {% if c_project.status == 2 %}
+                                    <a class="btn btn-default btn-sm text-danger"
+                                        href="/analysis/scans/stop/{{ c_project.analysis.id }}">
+                                        <i class="fas fa-ban"></i> Abort scan
+                                    </a>
+                                    {% else %}
                                     <div class="btn-group btn-group-sm">
                                         <button type="button" class="btn btn-default dropdown-toggle"
                                             data-toggle="dropdown" aria-expanded="true">
@@ -218,12 +225,8 @@ <h3 class="card-title">Projects list</h3>
                                             {% endif %}
                                         </div>
                                     </div>
-                                    {% if c_project.status == 2 %}
-                                    <a class="btn btn-default btn-sm text-danger"
-                                        href="/analysis/scans/stop/{{ c_project.analysis.id }}">
-                                        <i class="fas fa-ban"></i> Abort scan
-                                    </a>
                                     {% endif %}
+
                                 </td>
                             </tr>
                             {% endfor %}