From 6085d4c6808bcae99dbd42d64be5fda2f51dc15b Mon Sep 17 00:00:00 2001
From: CyrilM <mammar@lal.in2p3.fr>
Date: Thu, 18 Oct 2018 15:55:01 +0200
Subject: [PATCH] =?UTF-8?q?Ajout=20Transparence=20+=20d=C3=A9callage=20gau?=
=?UTF-8?q?che=20+=20rotation=20diver=20+=20r=C3=A9tr=C3=A9cissement=20mar?=
=?UTF-8?q?ge:=20Toutes=20ces=20modification=20ont=20=C3=A9t=C3=A9=20appli?=
=?UTF-8?q?qu=C3=A9s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/static/css/hierarchy.css | 17 ++++++++++++-
app/static/css/main.css | 15 +++---------
app/templates/browse.html | 47 +++++++++++++++---------------------
3 files changed, 39 insertions(+), 40 deletions(-)
diff --git a/app/static/css/hierarchy.css b/app/static/css/hierarchy.css
index 94cb876..3da1083 100644
--- a/app/static/css/hierarchy.css
+++ b/app/static/css/hierarchy.css
@@ -1,7 +1,7 @@
.hierarchy {
padding-top: 5px;
font-size: 18px;
- text-align: center;
+ text-align: left;
line-height: 190%;
}
@@ -29,4 +29,19 @@
.hierarchy-lang_icon_right {
height:25px;
width:25px;
+}
+
+/* Hierarchy diver icon */
+
+.hierarchy-icone_left {
+ float: left;
+ margin-right: 10%;
+ margin-left: 10px;
+ margin-top: 7px;
+}
+.hierarchy-icone_right {
+ float: right;
+ margin-right: 10px;
+ margin-top: 7px;
+ transform: rotate(180deg)
}
\ No newline at end of file
diff --git a/app/static/css/main.css b/app/static/css/main.css
index 878ba18..f79958f 100644
--- a/app/static/css/main.css
+++ b/app/static/css/main.css
@@ -16,17 +16,10 @@
padding-top: 5px;
}
-.icone_left {
- float: left;
- margin-left: 10px;
- margin-top: 7px;
-}
-.icone_right {
- float: right;
- margin-right: 10px;
- margin-top: 7px;
-}
-
body {
background-image: url("../img/background_loop.png");
+}
+
+.panel {
+ opacity: 0.93;
}
\ No newline at end of file
diff --git a/app/templates/browse.html b/app/templates/browse.html
index 698bd9b..6b12e15 100644
--- a/app/templates/browse.html
+++ b/app/templates/browse.html
@@ -29,7 +29,6 @@
<br>
<div class="row">
- <br><br>
<div class="col-md-4">
<div id='hierarchy' class="panel panel-primary" v-cloak>
@@ -51,21 +50,21 @@
<div class="pannel-body hierarchy">
<!-- HIERARCHY.OLD_LABELS_TAB -->
<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/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 <= 23)"><b>{{ value[1] }}</b></span>
- <span v-else v-bind:title="value[1]"><b>{{ value[1].slice(0, 17)+"..." }}</b></span>
- <img class="icone_right" src="static/img/swimming.small.png" style="visibility: hidden;"><br>
+ <img v-if="labels_language == 'FR'" title="Désélectionne les éléments portant cette étiquette" class="hierarchy-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="hierarchy-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 <= 20)"><b>{{ value[1] }}</b></span>
+ <span v-else v-bind:title="value[1]"><b>{{ value[1].slice(0, 16)+"..." }}</b></span>
+ <img class="hierarchy-icone_right" src="static/img/swimming.small.png" style="visibility: hidden;"><br>
</span>
<!-- HIERARCHY.OLD_LABELS_TAB -->
<!-- HIERARCHY.UNSELECT_TAB -->
<span v-for='(value, index) in unselect_tab'>
- <img class="icone_left" src="static/img/swimming.small.png" style="visibility: hidden;">
- <span v-if="(value[1].length <= 23)"><b>{{ value[1] }}</b></span>
- <span v-else v-bind:title="value[1]"><b>{{ value[1].slice(0, 17)+"..." }}</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/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'">
+ <img class="hierarchy-icone_left" src="static/img/swimming.small.png" style="visibility: hidden;">
+ <span v-if="(value[1].length <= 20)"><b>{{ value[1] }}</b></span>
+ <span v-else v-bind:title="value[1]"><b>{{ value[1].slice(0, 16)+"..." }}</b></span>
+ <img v-if="labels_language == 'FR'" title="Autorise les éléments portant cette étiquette" class="hierarchy-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="hierarchy-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>
<!-- HIERARCHY.UNSELECT_TAB -->
@@ -75,12 +74,12 @@
<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/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 <= 23)"><b>{{ label[1] }}</b></span>
- <span v-else v-bind:title="label[1]"><b>{{ label[1].slice(0, 17)+"..." }}</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/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'">
+ <img v-if="labels_language == 'FR'" title="Sélectionne les éléments possèdant cette étiquette" class="hierarchy-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="hierarchy-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 <= 20)"><b>{{ label[1] }}</b></span>
+ <span v-else v-bind:title="label[1]"><b>{{ label[1].slice(0, 16)+"..." }}</b></span>
+ <img v-if="labels_language == 'FR'" title="Interdit les éléments possèdant cette étiquette" class="hierarchy-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="hierarchy-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>
@@ -89,7 +88,6 @@
</div>
</div>
-
</div>
<div class="col-md-8" id="result" v-cloak>
@@ -147,13 +145,9 @@
* Initialise the two different par of hierarcy and
* the array that contain all tutos.
*/
- if (getCookie('old_labels_tab') != null)
- setup_session();
- else {
- hierarchy.init_all_labels();
- hierarchy.init_new_labels_tab();
- result.init_result_tab();
- }
+ hierarchy.init_all_labels();
+ hierarchy.init_new_labels_tab();
+ result.init_result_tab();
}
function update_loading(value) {
@@ -227,7 +221,6 @@
result.init_result_tab();
del_unselect_language(-2);
hierarchy.maj_new_labels_tab();
- save_session();
update_loading(1);
//hierarchy.init_new_labels_tab();
},
@@ -254,7 +247,6 @@
this.new_labels_tab = research(this.new_labels_tab, this.all_labels);
this.old_labels_tab = research(this.old_labels_tab, this.all_labels);
this.unselect_tab = research(this.unselect_tab, this.all_labels);
- save_session();
update_loading(1);
},
add_label_to_old_tab: function(index, source) {
@@ -273,7 +265,6 @@
this.unselect_tab.splice(index, 1);
result.maj_results(3);
}
- save_session();
update_loading(1);
},
rm_label_of_old_tab: function(index) {
--
GitLab