Commit 76797158 authored by Nicolas's avatar Nicolas

Merge branch 'master' of gitlab.constantvzw.org:osp/work.w

Conflicts:
	playground/static/playground/js/views.js
parents b2feb1c5 7fab61cc
......@@ -86,15 +86,17 @@ window.W = window.W || {};
relocateChild: function(event, model, index) {
model.get("parent").get("sublines").remove(model);
this.model.get("sublines").add(model, {at: index});
this.model.get("sublines").add(model, {
at: index
});
console.log("relocate", model.get("parent").get("alternative_mode"));
var alts;
if(model.get("parent").get("alternative_mode")){
var alts;
if (model.get("parent").get("alternative_mode")) {
alts = "V" + model.get("parent").get('alternative_n') + "-" + model.get("parent").get('alternative_p');
if(model.get("parent").get("alternative_mode") == "exclusive"){
alts = "V"+model.get("parent").get('alternative_p');
if (model.get("parent").get("alternative_mode") == "exclusive") {
alts = "V" + model.get("parent").get('alternative_p');
}
model.set('alternative_symbole',alts);
model.set('alternative_symbole', alts);
}
return false;
},
......
......@@ -24,7 +24,7 @@
</script>
<script id="list-item-template" type="text/template">
<a href="<%= id %>"><%= title %></a>
<a href="<%= id %>"><%= title %></a> <a href="#" class="delete">(X)</a>
</script>
<script id="score-edit-template" type="text/template">
......@@ -37,6 +37,7 @@
<h1 contenteditable="true" id="title"><%- title %></h1>
<div contenteditable="true" id="stage_set" ><%= stage_set %></div>
<button class="save">Enregistrer</button>
<button class="delete">Supprimer</button>
<button class="deplieTout">Tout déplier</button>
<div class="choix_mode">
<button class="mode_vue">Vue</button>
......
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