Commit a5c150a8 authored by Nicolas's avatar Nicolas

vue suite

- amélioration du soulignage
- rajouter après l’axe (dans la même police et couleur), un symbole pour
l’aspect :  duratif →, itératif ~, sémelfactif↓
parent b8fe3dba
......@@ -109,6 +109,12 @@ li li {
.invis_root, .invis{
display: none;
}
.prefix{
clear:both;
float:left;
margin-right: 10px;
text-decoration: none !important;
}
.view_tag{
font-size: 24px;
}
......@@ -139,7 +145,7 @@ li li li li li li .axis-title { color: rgb(144,103,167); }
li li li li li li li .axis-title { color: rgb(171,104, 87); }
li li li li li li li li .axis-title { color: rgb(204,194, 16); }
[data-contingent="true" ] {
.axis-title-view + ol li[data-contingent="true" ] {
/*opacity: 0.8;*/
text-decoration: line-through;
}
......
......@@ -436,6 +436,40 @@ window.W = window.W || {};
this.$el.attr("data-contingent", this.model.get("contingent"));
var sublines = this.model.get('sublines');
console.log("mode lecture");
if(this.model.get('contingent')){
console.log("contingent")
this.$el.find("#condition").removeClass("invis");
this.$el.find("#condition").addClass("vis");
}else{
this.$el.find("#condition").removeClass("vis");
this.$el.find("#condition").addClass("invis");
}
var hasparent = this.model.get("parent");
//console.log(this.$el);
if (!hasparent) {
this.$el.find(".el_tag").addClass("invis_root");
}else if(hasparent.get("alternative_mode") == "exclusive"){
console.log("exclusive");
this.$el.find("#tag").removeClass("vis");
this.$el.find("#tag").addClass("invis");
}else{
this.$el.find("#tag").removeClass("invis");
this.$el.find("#tag").addClass("vis");
}
if(hasparent && (hasparent.get("alternative_mode"))){
console.log("PARENT", hasparent.get("alternative_mode"));
}
if(hasparent && ((hasparent.get("alternative_mode") == "inclusive") | (hasparent.get("alternative_mode") == "exclusive"))){
this.$el.find("#condition").removeClass("invis");
this.$el.find("#condition").addClass("vis");
this.$el.find("#imperative_env").removeClass("invis");
this.$el.find("#imperative_env").addClass("vis");
}else if(hasparent && !(hasparent.get("alternative_mode"))){
this.$el.find("#condition").removeClass("vis");
this.$el.find("#condition").addClass("invis");
this.$el.find("#imperative_env").removeClass("vis");
this.$el.find("#imperative_env").addClass("invis");
}
if (sublines.length) {
var treeView = new W.TreeView({
collection: sublines
......
......@@ -169,12 +169,13 @@
<% } %>
</script>
<script id="node-template-vue" type="text/template">
<div class="axis-title" tabindex="0">
<span class="tag view_tag"><% if (tag) { %><%= tag %><% } else { %>><% }%></span>
<div class="axis-title axis-title-view" tabindex="0">
<span class="prefix">
<span class="tag view_tag el_tag"><% if (tag) { %><%= tag %><% } else { %>><% }%></span>
<span id="alt_symbole">
<% if (alternative_symbole) { %><%= alternative_symbole %><% } else { %><% }%>
</span>
</span>
<span class="axis-title-edit"><%- title %></span>
<span class="trigger_infos_vue">(i)</span>
......@@ -183,6 +184,11 @@
-->
<span class="options">
<span>
<% if (aspect && (aspect == 'duratif')) { %> &rarr;<% }%>
<% if (aspect && (aspect == 'sémelfactif')) { %> &darr;<% }%>
<% if (aspect && (aspect == 'itératif')) { %> &tilde;<% }%>
</span>
<span id="terme">
<% if (terme && !(terme == 'terme')) { %><%= terme %><% } else { %><% }%>
</span>
......@@ -235,17 +241,13 @@
<div class="axis-infos axis-infos-vue">
Axe:
<!-- La gestion contingent / modulé est faite par le souligné et le barré, non plus explicitée. -->
<!-- <div>
<input type="checkbox" name="contingent" id="contingent" value="1" <% if (contingent) { %>checked<% } %> tabindex="0"> contingent
</div>
<div>
<input type="checkbox" name="module_" id="module_" value="1" <% if (module_) { %>checked<% } %>> modulé
</div> -->
<div>
Aspect: <% if (aspect) { %><%= aspect %><% } %>
</div>
<!-- <div>Pièce jointe</div> -->
<div>
<div>Indications</div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment