diff --git a/app/static/add_tuto.css b/app/static/css/add_tuto.css
similarity index 100%
rename from app/static/add_tuto.css
rename to app/static/css/add_tuto.css
diff --git a/app/static/test.css b/app/static/css/test.css
similarity index 91%
rename from app/static/test.css
rename to app/static/css/test.css
index 06cd0ec5145ed4a7f376b4358386293ba2edd247..2e9d55f2beae669b4e6df9370299cf6eb05cc841 100644
--- a/app/static/test.css
+++ b/app/static/css/test.css
@@ -42,5 +42,5 @@
}
body {
- background-image: url("background_loop.png");
+ background-image: url("../img/background_loop.png");
}
\ No newline at end of file
diff --git a/app/static/background.png b/app/static/img/background.png
similarity index 100%
rename from app/static/background.png
rename to app/static/img/background.png
diff --git a/app/static/background_loop.png b/app/static/img/background_loop.png
similarity index 100%
rename from app/static/background_loop.png
rename to app/static/img/background_loop.png
diff --git a/app/static/background_loop2.png b/app/static/img/background_loop2.png
similarity index 100%
rename from app/static/background_loop2.png
rename to app/static/img/background_loop2.png
diff --git a/app/static/background_loop3.png b/app/static/img/background_loop3.png
similarity index 100%
rename from app/static/background_loop3.png
rename to app/static/img/background_loop3.png
diff --git a/app/static/background_origin.png b/app/static/img/background_origin.png
similarity index 100%
rename from app/static/background_origin.png
rename to app/static/img/background_origin.png
diff --git a/app/static/boue_france.png b/app/static/img/boue_france.png
similarity index 100%
rename from app/static/boue_france.png
rename to app/static/img/boue_france.png
diff --git a/app/static/boue_france_black.png b/app/static/img/boue_france_black.png
similarity index 100%
rename from app/static/boue_france_black.png
rename to app/static/img/boue_france_black.png
diff --git a/app/static/boue_usa.png b/app/static/img/boue_usa.png
similarity index 100%
rename from app/static/boue_usa.png
rename to app/static/img/boue_usa.png
diff --git a/app/static/boue_usa_black.png b/app/static/img/boue_usa_black.png
similarity index 100%
rename from app/static/boue_usa_black.png
rename to app/static/img/boue_usa_black.png
diff --git a/app/static/checked.png b/app/static/img/checked.png
similarity index 100%
rename from app/static/checked.png
rename to app/static/img/checked.png
diff --git a/app/static/close.png b/app/static/img/close.png
similarity index 100%
rename from app/static/close.png
rename to app/static/img/close.png
diff --git a/app/static/swimming.small.png b/app/static/img/swimming.small.png
similarity index 100%
rename from app/static/swimming.small.png
rename to app/static/img/swimming.small.png
diff --git a/app/static/unchecked_swimming.small.png b/app/static/img/unchecked_swimming.small.png
similarity index 100%
rename from app/static/unchecked_swimming.small.png
rename to app/static/img/unchecked_swimming.small.png
diff --git a/app/static/ajax.js b/app/static/js/ajax.js
similarity index 100%
rename from app/static/ajax.js
rename to app/static/js/ajax.js
diff --git a/app/static/array_opperations.js b/app/static/js/array_opperations.js
similarity index 100%
rename from app/static/array_opperations.js
rename to app/static/js/array_opperations.js
diff --git a/app/static/create_arbo.js b/app/static/js/create_arbo.js
similarity index 100%
rename from app/static/create_arbo.js
rename to app/static/js/create_arbo.js
diff --git a/app/static/father_child.js b/app/static/js/father_child.js
similarity index 100%
rename from app/static/father_child.js
rename to app/static/js/father_child.js
diff --git a/app/static/labels.js b/app/static/js/labels.js
similarity index 100%
rename from app/static/labels.js
rename to app/static/js/labels.js
diff --git a/app/static/maj_tutorial.js b/app/static/js/maj_tutorial.js
similarity index 100%
rename from app/static/maj_tutorial.js
rename to app/static/js/maj_tutorial.js
diff --git a/app/static/vue.js b/app/static/js/vue.js
similarity index 100%
rename from app/static/vue.js
rename to app/static/js/vue.js
diff --git a/app/templates/add_new_tuto.html b/app/templates/add_new_tuto.html
index 261a6fface145b41cf65620b883351e245c35daa..39863c29f7e934a895dd47f6f281d911e5048e0b 100644
--- a/app/templates/add_new_tuto.html
+++ b/app/templates/add_new_tuto.html
@@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Add tutos</title>
- <link rel="stylesheet" href="static/add_tuto.css">
+ <link rel="stylesheet" href="static/css/add_tuto.css">
<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
<!-- Bootstrap -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
@@ -57,9 +57,9 @@
</body>
- <script src="static/create_arbo.js"></script>
- <script src="static/array_opperations.js"></script>
- <script src="static/ajax.js"></script>
+ <script src="static/js/create_arbo.js"></script>
+ <script src="static/js/array_opperations.js"></script>
+ <script src="static/js/ajax.js"></script>
<script>
function create_empty_tab(size) {
diff --git a/app/templates/browse.html b/app/templates/browse.html
index 313f3f7ddd6cd3100a72f99ae367acaace5ba225..b997361ee64f9d814c9c5a4b7f872730fa7f06d4 100644
--- a/app/templates/browse.html
+++ b/app/templates/browse.html
@@ -5,12 +5,12 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Browse</title>
- <link rel="stylesheet" href="static/add_tuto.css">
- <link rel="stylesheet" href="static/test.css">
+ <link rel="stylesheet" href="static/css/add_tuto.css">
+ <link rel="stylesheet" href="static/css/test.css">
<!-- Bootstrap -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
<!-- VueJs -->
- <script src="static/vue.js"></script>
+ <script src="static/js/vue.js"></script>
<style type="text/css">[v-cloak] {display: none;}</style>
</head>
@@ -31,42 +31,42 @@
<span v-else style="margin-left: -6%; margin-right: 4%;"><span class="glyphicon glyphicon-tags"></span>[[Â txt['labels_title_fr'] ]]</span>
<span style="margin-right: -10%;">
<span v-if='this.labels_language == "FR"'>
- <img style="height:25px; width:25px; margin-right: 3%;" src="static/boue_france.png">
- <img title="Passe le nom des étiquettes en Anglais" @click="change_labels_language('US')" style="height:25px; width:25px;" src="static/boue_usa_black.png" onmouseover="this.src='static/boue_usa.png'" onmouseout="this.src='static/boue_usa_black.png'">
+ <img style="height:25px; width:25px; margin-right: 3%;" src="static/img/boue_france.png">
+ <img title="Passe le nom des étiquettes en Anglais" @click="change_labels_language('US')" style="height:25px; width:25px;" src="static/img/boue_usa_black.png" onmouseover="this.src='static/img/boue_usa.png'" onmouseout="this.src='static/img/boue_usa_black.png'">
</span>
<span v-else>
- <img title="Pass the name of the labels in French" @click="change_labels_language('FR')" style="height:25px; width:25px; margin-right: 3%;" src="static/boue_france_black.png" onmouseover="this.src='static/boue_france.png'" onmouseout="this.src='static/boue_france_black.png'">
- <img style="height:25px; width:25px;" src="static/boue_usa.png">
+ <img title="Pass the name of the labels in French" @click="change_labels_language('FR')" style="height:25px; width:25px; margin-right: 3%;" src="static/img/boue_france_black.png" onmouseover="this.src='static/img/boue_france.png'" onmouseout="this.src='static/img/boue_france_black.png'">
+ <img style="height:25px; width:25px;" src="static/img/boue_usa.png">
</span>
</span>
</div>
<div class="pannel-body hierarchy">
<span v-for='(value, index) in old_labels_tab'>
- <img v-if="labels_language == 'FR'" title="Désélectionne les éléments portant cette étiquette" class="icone_left" @click="rm_label_of_old_tab(index)" src="static/swimming.small.png" onmouseover="this.src='static/unchecked_swimming.small.png'" onmouseout="this.src='static/swimming.small.png'">
- <img v-else-if="labels_language == 'US'" title="Deselect the elements bearing this label" class="icone_left" @click="rm_label_of_old_tab(index)" src="static/swimming.small.png" onmouseover="this.src='static/unchecked_swimming.small.png'" onmouseout="this.src='static/swimming.small.png'">
+ <img v-if="labels_language == 'FR'" title="Désélectionne les éléments portant cette étiquette" class="icone_left" @click="rm_label_of_old_tab(index)" src="static/img/swimming.small.png" onmouseover="this.src='static/img/unchecked_swimming.small.png'" onmouseout="this.src='static/img/swimming.small.png'">
+ <img v-else-if="labels_language == 'US'" title="Deselect the elements bearing this label" class="icone_left" @click="rm_label_of_old_tab(index)" src="static/img/swimming.small.png" onmouseover="this.src='static/img/unchecked_swimming.small.png'" onmouseout="this.src='static/img/swimming.small.png'">
<span v-if="(value[1].length <= 13)"><b>{{ value[1] }}</b></span>
<span v-else v-bind:title="value[1]"><b>{{ value[1].slice(0, 12)+"..." }}</b></span>
- <img class="icone_right" src="static/swimming.small.png" style="visibility: hidden;"><br>
+ <img class="icone_right" src="static/img/swimming.small.png" style="visibility: hidden;"><br>
</span>
<span v-for='(value, index) in unselect_tab'>
- <img class="icone_left" src="static/swimming.small.png" style="visibility: hidden;">
+ <img class="icone_left" src="static/img/swimming.small.png" style="visibility: hidden;">
<span v-if="(value[1].length <= 13)"><b>{{ value[1] }}</b></span>
<span v-else v-bind:title="value[1]"><b>{{ value[1].slice(0, 12)+"..." }}</b></span>
- <img v-if="labels_language == 'FR'" title="Autorise les éléments portant cette étiquette" class="icone_right" @click="rm_label_to_unselect_tab(index)" src="static/swimming.small.png" onmouseover="this.src='static/unchecked_swimming.small.png'" onmouseout="this.src='static/swimming.small.png'">
- <img v-if="labels_language == 'US'" title="Authorizes elements bearing this label" class="icone_right" @click="rm_label_to_unselect_tab(index)" src="static/swimming.small.png" onmouseover="this.src='static/unchecked_swimming.small.png'" onmouseout="this.src='static/swimming.small.png'">
+ <img v-if="labels_language == 'FR'" title="Autorise les éléments portant cette étiquette" class="icone_right" @click="rm_label_to_unselect_tab(index)" src="static/img/swimming.small.png" onmouseover="this.src='static/img/unchecked_swimming.small.png'" onmouseout="this.src='static/img/swimming.small.png'">
+ <img v-if="labels_language == 'US'" title="Authorizes elements bearing this label" class="icone_right" @click="rm_label_to_unselect_tab(index)" src="static/img/swimming.small.png" onmouseover="this.src='static/img/unchecked_swimming.small.png'" onmouseout="this.src='static/img/swimming.small.png'">
<br>
</span>
<div v-if="this.loading == 1">
<hr v-if="(this.old_labels_tab.length > 0 || this.unselect_tab.length > 0) && this.new_labels_tab.length > 0"/>
<transition-group name="new_labels">
<span v-for='(label, index) in new_labels_tab' v-bind:key="label">
- <img v-if="labels_language == 'FR'" title="Sélectionne les éléments possèdant cette étiquette" class="icone_left" @click="add_label_to_old_tab(index, 1)" src="static/unchecked_swimming.small.png" onmouseover="this.src='static/swimming.small.png'" onmouseout="this.src='static/unchecked_swimming.small.png'">
- <img v-else-if="labels_language == 'US'" title="Selects elements with this label" class="icone_left" @click="add_label_to_old_tab(index, 1)" src="static/unchecked_swimming.small.png" onmouseover="this.src='static/swimming.small.png'" onmouseout="this.src='static/unchecked_swimming.small.png'">
+ <img v-if="labels_language == 'FR'" title="Sélectionne les éléments possèdant cette étiquette" class="icone_left" @click="add_label_to_old_tab(index, 1)" src="static/img/unchecked_swimming.small.png" onmouseover="this.src='static/img/swimming.small.png'" onmouseout="this.src='static/img/unchecked_swimming.small.png'">
+ <img v-else-if="labels_language == 'US'" title="Selects elements with this label" class="icone_left" @click="add_label_to_old_tab(index, 1)" src="static/img/unchecked_swimming.small.png" onmouseover="this.src='static/img/swimming.small.png'" onmouseout="this.src='static/img/unchecked_swimming.small.png'">
<span v-if="(label[1].length <= 13)"><b>{{ label[1] }}</b></span>
<span v-else v-bind:title="label[1]"><b>{{ label[1].slice(0, 12)+"..." }}</b></span>
- <img v-if="labels_language == 'FR'" title="Interdit les éléments possèdant cette étiquette" class="icone_right" @click="add_label_to_unselect_tab(index)" src="static/unchecked_swimming.small.png" onmouseover="this.src='static/swimming.small.png'" onmouseout="this.src='static/unchecked_swimming.small.png'">
- <img v-if="labels_language == 'US'" title="Prohibits elements with this label" class="icone_right" @click="add_label_to_unselect_tab(index)" src="static/unchecked_swimming.small.png" onmouseover="this.src='static/swimming.small.png'" onmouseout="this.src='static/unchecked_swimming.small.png'">
+ <img v-if="labels_language == 'FR'" title="Interdit les éléments possèdant cette étiquette" class="icone_right" @click="add_label_to_unselect_tab(index)" src="static/img/unchecked_swimming.small.png" onmouseover="this.src='static/img/swimming.small.png'" onmouseout="this.src='static/img/unchecked_swimming.small.png'">
+ <img v-if="labels_language == 'US'" title="Prohibits elements with this label" class="icone_right" @click="add_label_to_unselect_tab(index)" src="static/img/unchecked_swimming.small.png" onmouseover="this.src='static/img/swimming.small.png'" onmouseout="this.src='static/img/unchecked_swimming.small.png'">
<br>
</span>
</transition-group>
@@ -88,16 +88,16 @@
<span style="margin-left: 0%">
<span v-if="this.results_language[0] % 2 == 0 && this.results_language[1] % 2 == 0">
- <img title="Enlève les tutoriels en langue française" style="height:25px; width:25px; margin-right: 2%;" @click="change_results_language([1, 0])" src="static/boue_france.png" onmouseover="this.src='static/boue_france_black.png'" onmouseout="this.src='static/boue_france.png'">
- <img title="Enlève les tutoriels en langue anglaise" style="height:25px; width:25px; margin-right: 3%;" @click="change_results_language([0, 1])" src="static/boue_usa.png" onmouseover="this.src='static/boue_usa_black.png'" onmouseout="this.src='static/boue_usa.png'">
+ <img title="Enlève les tutoriels en langue française" style="height:25px; width:25px; margin-right: 2%;" @click="change_results_language([1, 0])" src="static/img/boue_france.png" onmouseover="this.src='static/img/boue_france_black.png'" onmouseout="this.src='static/img/boue_france.png'">
+ <img title="Enlève les tutoriels en langue anglaise" style="height:25px; width:25px; margin-right: 3%;" @click="change_results_language([0, 1])" src="static/img/boue_usa.png" onmouseover="this.src='static/img/boue_usa_black.png'" onmouseout="this.src='static/img/boue_usa.png'">
</span>
<span v-if="this.results_language[0] % 2 != 0 && this.results_language[1] % 2 == 0">
- <img title="Remet les tutoriels en langue française" style="height:25px; width:25px; margin-right: 2%;" @click="change_results_language([1, 0])" src="static/boue_france_black.png" onmouseover="this.src='static/boue_france.png'" onmouseout="this.src='static/boue_france_black.png'">
- <img style="height:25px; width:25px; margin-right: 3%;" src="static/boue_usa.png">
+ <img title="Remet les tutoriels en langue française" style="height:25px; width:25px; margin-right: 2%;" @click="change_results_language([1, 0])" src="static/img/boue_france_black.png" onmouseover="this.src='static/img/boue_france.png'" onmouseout="this.src='static/img/boue_france_black.png'">
+ <img style="height:25px; width:25px; margin-right: 3%;" src="static/img/boue_usa.png">
</span>
<span v-if="this.results_language[0] % 2 == 0 && this.results_language[1] % 2 != 0">
- <img style="height:25px; width:25px; margin-right: 2%;" src="static/boue_france.png">
- <img title="Remet les tutoriels en langue anglaise" style="height:25px; width:25px; margin-right: 3%;" @click="change_results_language([0, 1])" src="static/boue_usa_black.png" onmouseover="this.src='static/boue_usa.png'" onmouseout="this.src='static/boue_usa_black.png'">
+ <img style="height:25px; width:25px; margin-right: 2%;" src="static/img/boue_france.png">
+ <img title="Remet les tutoriels en langue anglaise" style="height:25px; width:25px; margin-right: 3%;" @click="change_results_language([0, 1])" src="static/img/boue_usa_black.png" onmouseover="this.src='static/img/boue_usa.png'" onmouseout="this.src='static/img/boue_usa_black.png'">
</span>
</span>
</div>
@@ -115,11 +115,11 @@
</body>
- <script src="static/ajax.js"></script>
- <script src="static/array_opperations.js"></script>
- <script src="static/father_child.js"></script>
- <script src="static/labels.js"></script>
- <script src="static/maj_tutorial.js"></script>
+ <script src="static/js/ajax.js"></script>
+ <script src="static/js/array_opperations.js"></script>
+ <script src="static/js/father_child.js"></script>
+ <script src="static/js/labels.js"></script>
+ <script src="static/js/maj_tutorial.js"></script>
<script>
function init_research() {
diff --git a/app/templates/manage_labels.html b/app/templates/manage_labels.html
index 22b5b4cd46a8e1ec609c46d8959b37e024ffa341..a196b7522740d701738a58b94c863d4d58c7e690 100644
--- a/app/templates/manage_labels.html
+++ b/app/templates/manage_labels.html
@@ -9,7 +9,7 @@
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
<!-- VueJS -->
<script src="https://cdn.jsdelivr.net/npm/vue/dist/vue.js"></script>
- <script src="static/ajax.js"></script>
+ <script src="static/js/ajax.js"></script>
</head>
<body>