Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
V
validata-ui
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
19
Issues
19
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Validata
validata-ui
Commits
336265e9
Commit
336265e9
authored
Jun 17, 2019
by
Christophe Benz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use macros to control <script> tags order
parent
580c78c8
Pipeline
#1014
failed with stage
in 16 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
33 additions
and
17 deletions
+33
-17
validata_ui/templates/base_template.html
validata_ui/templates/base_template.html
+5
-5
validata_ui/templates/schema_info_part.html
validata_ui/templates/schema_info_part.html
+5
-5
validata_ui/templates/validation_form.html
validata_ui/templates/validation_form.html
+13
-6
validata_ui/templates/validation_report.html
validata_ui/templates/validation_report.html
+10
-1
No files found.
validata_ui/templates/base_template.html
View file @
336265e9
...
...
@@ -67,11 +67,6 @@
{% block content %}{% endblock %}
</div>
<script
src=
"https://code.jquery.com/jquery-3.3.1.slim.min.js"
integrity=
"sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
crossorigin=
"anonymous"
></script>
<script
src=
"https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"
integrity=
"sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1"
crossorigin=
"anonymous"
></script>
<script
src=
"https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"
integrity=
"sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"
crossorigin=
"anonymous"
></script>
{% block page_scripts %}{% endblock %}
<footer
class=
"footer hidden-print"
>
<div>
Le service de validation du
<a
href=
"https://www.validata.fr/"
>
projet Validata
</a>
...
...
@@ -88,6 +83,11 @@
</ul>
</footer>
<script
src=
"https://code.jquery.com/jquery-3.3.1.slim.min.js"
integrity=
"sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
crossorigin=
"anonymous"
></script>
<script
src=
"https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"
integrity=
"sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1"
crossorigin=
"anonymous"
></script>
<script
src=
"https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"
integrity=
"sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"
crossorigin=
"anonymous"
></script>
{% block page_scripts %}{% endblock %}
</body>
</html>
validata_ui/templates/schema_info_part.html
View file @
336265e9
{% macro html(schema_info, schema_versions) %}
<h5
class=
"card-title"
>
Schéma
{% if schema_info.title %}
...
...
@@ -44,8 +45,10 @@
{% endfor %}
</select>
</p>
{% endif %}
{% endmacro %}
{%
block page_scripts
%}
{%
macro script()
%}
<script>
var
vbox
=
$
(
'
#version_select
'
);
vbox
.
on
(
'
change
'
,
function
()
{
...
...
@@ -81,7 +84,4 @@
document
.
location
.
href
=
new_url
;
})
</script>
{% endblock %}
{% endif %}
{% endmacro %}
validata_ui/templates/validation_form.html
View file @
336265e9
{% extends "base_template.html" %} {% block title %}{{ title }}{% endblock %} {%
block head %}
{{ super() }}
{% endblock %} {% block content %}
{% extends "base_template.html" %}
{% import 'schema_info_part.html' as schema_info_part %}
{% block title %}{{ title }}{% endblock %}
{% block content %}
<h1
class=
"my-4"
>
{{ title }}
</h1>
{% set cols_my_classes = 'my-md-0 my-4' %}
...
...
@@ -9,7 +12,7 @@ block head %}
<div
class=
"col-md-4 {{ cols_my_classes }}"
>
<div
class=
"card bg-faded"
>
<div
class=
"card-body"
>
{% include 'schema_info_part.html' %
}
{{ schema_info_part.html(schema_info, schema_versions) }
}
</div>
</div>
</div>
...
...
@@ -86,6 +89,10 @@ block head %}
</div>
</div>
</div>
{% endblock %}
{% block page_scripts %}
{% if schema_versions %}
{{ schema_info_part.script() }}
{% endif %}
{% endblock %}
\ No newline at end of file
validata_ui/templates/validation_report.html
View file @
336265e9
{% extends "base_template.html" %}
{% import 'schema_info_part.html' as schema_info_part %}
{% block title %}{{ title }}{% endblock %}
{% block head %}
{{ super() }}
<style>
...
...
@@ -19,6 +23,7 @@
}
</style>
{% endblock %}
{% block content %}
{% if print_mode %}
<div
class=
"row"
>
...
...
@@ -46,7 +51,7 @@
<div
class=
"col-md-{% if print_mode %}12{% else %}5{% endif %} my-4"
>
<div
class=
"card bg-faded"
>
<div
class=
"card-body"
>
{
% include 'schema_info_part.html' %
}
{
{ schema_info_part.html(schema_info, schema_versions) }
}
<hr
/>
<div>
<h5
class=
"card-title"
>
...
...
@@ -167,6 +172,10 @@
{% endblock %}
{% block page_scripts %}
{% if schema_versions %}
{{ schema_info_part.script() }}
{% endif %}
<script>
$
(
function
()
{
// Errors tooltip activate
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment