From 2561f6a916b80f4239b1df8ef0767df495beb706 Mon Sep 17 00:00:00 2001
From: Bryan Brancotte <bryan.brancotte@pasteur.fr>
Date: Fri, 18 Apr 2025 10:25:31 +0200
Subject: [PATCH] merge templates
---
.../assemblies/simulator_results.html | 35 -------------------
.../assemblies/simulatorjob_detail.html | 22 ++++++++++++
2 files changed, 22 insertions(+), 35 deletions(-)
delete mode 100644 src/InSillyCloWeb/assemblies/templates/assemblies/simulator_results.html
diff --git a/src/InSillyCloWeb/assemblies/templates/assemblies/simulator_results.html b/src/InSillyCloWeb/assemblies/templates/assemblies/simulator_results.html
deleted file mode 100644
index 424f371..0000000
--- a/src/InSillyCloWeb/assemblies/templates/assemblies/simulator_results.html
+++ /dev/null
@@ -1,35 +0,0 @@
-{% extends "base.html" %}
-{% load crispy_forms_tags %}
-{% load sstatic %}
-{% load i18n %}
-
-{% block extra_js %}
-{{block.super}}
-{% if extra_js_file %}
-<script src="{% sstatic extra_js_file %}"></script>
-{% endif%}
-{% for extra_js_file in extra_js_files %}
-<script src="{% sstatic extra_js_file %}"></script>
-{% endfor%}
-{% endblock %}
-
-{% block extra_css %}
-{{block.super}}
-{% if extra_css_file %}
-<link rel="stylesheet" href="{% sstatic extra_css_file %}"/>
-{% endif%}
-{% for extra_css_file in extra_css_files %}
-<link rel="stylesheet" href="{% sstatic extra_css_file %}"/>
-{% endfor%}
-{% endblock %}
-
-{% block container_class %}{{block.super}} {{ custom_container_class }}{% endblock %}
-
-{% block title %}Results{% endblock %}
-{% block page_title %}Results{% endblock %}
-
-{% block content %}
-<div class="formset-container col-12 col-xs-12 {%if custom_css_width %}{{custom_css_width}}{%else%}{%if not medium_width%}col-sm-10 col-sm-offset-1 offset-sm-1 col-md-8 col-md-offset-2 offset-md-2 col-lg-6 col-lg-offset-3 offset-lg-3 col-xl-4 col-xl-offset-4 offset-xl-4 col-xxl-2 col-xxl-offset-5{%endif%}{%if medium_width%}col-md-10 col-md-offset-1 offset-md-1 col-lg-8 col-lg-offset-2 offset-lg-2 col-xl-6 col-xl-offset-3 offset-xl-3 col-xxl-4 col-xxl-offset-4 col-xxxl-2 col-xxxl-offset-5{%endif%}{%endif%}">
- {{ simulation.uuid }}
-</div>
-{% endblock content %}
\ No newline at end of file
diff --git a/src/InSillyCloWeb/assemblies/templates/assemblies/simulatorjob_detail.html b/src/InSillyCloWeb/assemblies/templates/assemblies/simulatorjob_detail.html
index 009b993..ab1b344 100644
--- a/src/InSillyCloWeb/assemblies/templates/assemblies/simulatorjob_detail.html
+++ b/src/InSillyCloWeb/assemblies/templates/assemblies/simulatorjob_detail.html
@@ -1,7 +1,29 @@
{% extends "assemblies/base.html" %}
+{% load crispy_forms_tags %}
{% load assemblies_tags %}
+{% load sstatic %}
{% load i18n %}
+{% block extra_js %}
+{{block.super}}
+{% if extra_js_file %}
+<script src="{% sstatic extra_js_file %}"></script>
+{% endif%}
+{% for extra_js_file in extra_js_files %}
+<script src="{% sstatic extra_js_file %}"></script>
+{% endfor%}
+{% endblock %}
+
+{% block extra_css %}
+{{block.super}}
+{% if extra_css_file %}
+<link rel="stylesheet" href="{% sstatic extra_css_file %}"/>
+{% endif%}
+{% for extra_css_file in extra_css_files %}
+<link rel="stylesheet" href="{% sstatic extra_css_file %}"/>
+{% endfor%}
+{% endblock %}
+
{% block title %}Job: {{object.uuid_short}}{% endblock %}
{% block page_title %}Assembly simulator{% endblock %}
--
GitLab