Separate folders

This commit is contained in:
2023-06-01 11:40:41 +02:00
parent aeec3a65af
commit ff25581e99
9 changed files with 83 additions and 108 deletions

View File

@@ -0,0 +1,30 @@
.alternate-font {
font-family: Arial;
}
tbody {
font-family: Courier;
}
.tag {
cursor: pointer;
}
.ajaxLoading {
cursor: progress !important;
}
#file-table tbody tr.selected td {
background-color: #0dcaf0;
color: white;
}
#report-table tbody tr.selected td {
background-color: #0dcaf0;
color: white;
}
.btn-small {
padding: 0.25rem 0.5rem;
font-size: 0.75rem;
}

View File

@@ -2,54 +2,19 @@
<html> <html>
<head> <head>
<title>{{ title }}</title> <title>{{ title }}</title>
<link <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-KK94CHFLLe+nY2dmCWGMq91rCGa5gtU4mk92HdvYe+M/SXH301p5ILy+dN9+nJOZ" crossorigin="anonymous" />
href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha3/dist/css/bootstrap.min.css" <link href="https://fonts.googleapis.com/css?family=Montserrat:300,400,500,600" rel="stylesheet" />
rel="stylesheet" <link rel="stylesheet" href="https://cdn.datatables.net/1.10.25/css/jquery.dataTables.min.css" />
integrity="sha384-KK94CHFLLe+nY2dmCWGMq91rCGa5gtU4mk92HdvYe+M/SXH301p5ILy+dN9+nJOZ" <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/MaterialDesign-Webfont/7.1.96/css/materialdesignicons.css" integrity="sha512-lD1LHcZ8tFHvMFNeo6qOLY/HjzSPCasPJOAoir22byDxlZI1R71S5lZel8zRL2TZ+Dut1wOHfYgSU2lHXuL00w==" crossorigin="anonymous" referrerpolicy="no-referrer" />
crossorigin="anonymous" <link rel="stylesheet" href="{{ url_for('static', filename='css/main.css') }}" />
/>
<link href="https://fonts.googleapis.com/css?family=Montserrat:300,400,500,600" rel="stylesheet">
<style>
.alternate-font {
font-family: Arial;
}
tbody {
font-family: Courier;
}
#file-table tbody tr.selected td {
background-color: #0dcaf0;
color: white;
}
#report-table tbody tr.selected td {
background-color: #0dcaf0;
color: white;
}
.btn-small {
padding: 0.25rem 0.5rem;
font-size: 0.75rem;
}
.ajaxLoading {
cursor: progress !important;
}
</style>
<link
rel="stylesheet"
href="https://cdn.datatables.net/1.10.25/css/jquery.dataTables.min.css"
/>
<link
rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/MaterialDesign-Webfont/7.1.96/css/materialdesignicons.css"
integrity="sha512-lD1LHcZ8tFHvMFNeo6qOLY/HjzSPCasPJOAoir22byDxlZI1R71S5lZel8zRL2TZ+Dut1wOHfYgSU2lHXuL00w=="
crossorigin="anonymous"
referrerpolicy="no-referrer"
/>
</head> </head>
<body> <body>
{% block content %} {% endblock %} {% block content %}
{% endblock %}
</body> </body>
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script> <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
{% block jscript %} {% endblock %} {% block jscript %}
{% endblock %}
</html> </html>

View File

@@ -2,41 +2,18 @@
<html> <html>
<head> <head>
<title>{{ title }}</title> <title>{{ title }}</title>
<link <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.9.3/css/bulma.min.css" />
rel="stylesheet" <link rel="stylesheet" href="https://cdn.datatables.net/1.10.25/css/jquery.dataTables.min.css" />
href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.9.3/css/bulma.min.css" <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/MaterialDesign-Webfont/7.1.96/css/materialdesignicons.css" integrity="sha512-lD1LHcZ8tFHvMFNeo6qOLY/HjzSPCasPJOAoir22byDxlZI1R71S5lZel8zRL2TZ+Dut1wOHfYgSU2lHXuL00w==" crossorigin="anonymous" referrerpolicy="no-referrer" />
/> <link rel="stylesheet" href="{{ url_for('static', filename='css/main.css') }}" />
<style>
.alternate-font{
font-family: Arial;
}
tbody {
font-family: Courier;
}
.tag {
cursor: pointer;
}
.ajaxLoading {
cursor: progress !important;
}
</style>
<link
rel="stylesheet"
href="https://cdn.datatables.net/1.10.25/css/jquery.dataTables.min.css"
/>
<link
rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/MaterialDesign-Webfont/7.1.96/css/materialdesignicons.css"
integrity="sha512-lD1LHcZ8tFHvMFNeo6qOLY/HjzSPCasPJOAoir22byDxlZI1R71S5lZel8zRL2TZ+Dut1wOHfYgSU2lHXuL00w=="
crossorigin="anonymous"
referrerpolicy="no-referrer"
/>
</head> </head>
<body> <body>
{% block content %} {% endblock %} {% block content %}
{% endblock %}
</body> </body>
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script> <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
{% block jscript %} {% endblock %} {% block jscript %}
{% endblock %}
</html> </html>

View File

@@ -43,7 +43,7 @@
{% endblock %} {% endblock %}
{% block jscript %} {% block jscript %}
<script> <script>
{% include "partials/excelFiles.js" %} {% include "js/excelFiles.js" %}
$(document).ready(function () { $(document).ready(function () {
$(document).ajaxStart(function(){ $(document).ajaxStart(function(){
$("body").addClass('ajaxLoading'); $("body").addClass('ajaxLoading');

View File

@@ -1,26 +1,29 @@
{% set title = "Report Viewer" %} {% macro javascript(file) %}
{% extends "base_" ~ framework ~ ".html" %} <script src="{{ url_for('static', filename=file) }}"></script>
{% block content%} {% endmacro %}
{% if framework == "bootstrap" %} {% set title = 'Report Viewer' %}
{% set center = "text-center" %} {% extends 'base_' ~ framework ~ '.html' %}
{% set right = "text-end" %} {% block content %}
{% set button = "btn btn-primary" %} {% if framework == 'bootstrap' %}
{% include "partials/table_report_bootstrap.html" %} {% set center = 'text-center' %}
{% set right = 'text-end' %}
{% set button = 'btn btn-primary' %}
{% include 'partials/table_report_bootstrap.html' %}
{% else %} {% else %}
{% set center = "has-text-centered" %} {% set center = 'has-text-centered' %}
{% set right = "has-text-right" %} {% set right = 'has-text-right' %}
{% set button = "button is-primary" %} {% set button = 'button is-primary' %}
{% include "partials/table_report_bulma.html" %} {% include 'partials/table_report_bulma.html' %}
{% endif %} {% endif %}
{% endblock %} {% endblock %}
{% block jscript %} {% block jscript %}
{% if framework == "bootstrap" %} {% if framework == 'bootstrap' %}
{% set selected = "selected" %} {% set selected = 'selected' %}
{% else %} {% else %}
{% set selected = "is-selected" %} {% set selected = 'is-selected' %}
{% endif %} {% endif %}
<script> <script>
{% include "partials/report.js" %} {% include "js/report.js" %}
{% include "partials/excelFiles.js" %}
</script> </script>
{{ javascript("js/excelFiles.js") }}
{% endblock %} {% endblock %}

View File

@@ -1,20 +1,20 @@
{% set title = "Benchmark Results" %} {% macro javascript(file) %}
{% extends "base_" ~ framework ~ ".html" %} <script src="{{ url_for('static', filename=file) }}"></script>
{% import "partials/cfg_select_" ~ framework ~ ".jinja" as select %} {% endmacro %}
{% set title = 'Benchmark Results' %}
{% extends 'base_' ~ framework ~ '.html' %}
{% import 'partials/cfg_select_' ~ framework ~ '.jinja' as select %}
{% block content %} {% block content %}
{% include "partials/table_select_design.html" %} {% include 'partials/table_select_design.html' %}
{% endblock %} {% endblock %}
{% block jscript %} {% block jscript %}
<script src="https://cdn.datatables.net/1.10.25/js/jquery.dataTables.min.js"></script> <script src="https://cdn.datatables.net/1.10.25/js/jquery.dataTables.min.js"></script>
{% if framework == "bootstrap" %} {% if framework == 'bootstrap' %}
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.min.js" integrity="sha384-cuYeSxntonz0PPNlHhBs68uyIAVpIIOZZ5JqeqvYYIcEL727kskC66kF92t6Xl2V" <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.min.js" integrity="sha384-cuYeSxntonz0PPNlHhBs68uyIAVpIIOZZ5JqeqvYYIcEL727kskC66kF92t6Xl2V" crossorigin="anonymous"></script>
crossorigin="anonymous"></script>
{% endif %} {% endif %}
<script> <script>
{% include "partials/select.js" %} {% include'/js/select.js' %}
{% include "partials/excelFiles.js" %}
</script> </script>
{{ javascript('/js/excelFiles.js') }}
{% endblock %} {% endblock %}