Commit cfde1704 authored by alexandre's avatar alexandre

Cleaning

parent f8d35629
......@@ -440,10 +440,11 @@ window.W = window.W || {};
openInfos: function(e) {
var $target = $(e.target);
var infos = $target.parent().find('.axis-infos');
// console.log(infos);
infos.show();
infos.css('top', $target.offset().top);
infos.css('left', $target.offset().left);
return false;
},
......
......@@ -23,10 +23,6 @@
{% include "playground/underscore/list-item.mtpl" %}
</script>
<script id="score-edit-template" type="text/template">
{% include "playground/underscore/score-edit.mtpl" %}
</script>
<script id="score-template" type="text/template">
{% include "playground/underscore/score.mtpl" %}
</script>
......
<div class="axis-title" tabindex="0">
<span class="handle"></span>
<!-- The alternative symbol -->
<% if (alternative_symbole) { %>
<span id="alt_symbole">
<% if (alternative_symbole) { %><%= alternative_symbole %><% } else { %><% }%>
<%= alternative_symbole %>
</span>
<% }%>
<!-- The choice of tag -->
<select id="tag" class="el_tag">
<% _.each(tagChoices, function(tagChoice) {%>
<option value="<%= tagChoice %>" <% if (tag==tagChoice) { %>selected<% } %>><%= tagChoice %></option>
<% }); %>
</select>
<!-- The title of the axis-->
<span class="axis-title-edit" contenteditable="true"><%- title %></span>
<!-- Extra info over the axis -->
<span class="trigger_infos">(i)</span>
<!-- autre possibilité avec placeholder
<input type="text" id="boucle" value="" placeholder="placeholder" />
-->
<div class="axis-infos">
Axe:
<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>
Aspects:
<select id="aspect">
<% _.each(aspectChoices, function(aspectChoice) {%>
<option value="<%= aspectChoice %>" <% if (aspect==aspectChoice) { %>selected<% } %>><%= aspectChoice %></option>
<% }); %>
</select>
</div>
<!-- <div>Pièce jointe</div> -->
<div>
<div>Indications</div>
<textarea id="indications">
<% if (indications) { %><%= indications %><% } %>
</textarea>
</div>
<div>
<input type="button" class="axis-fermer-infos" value="fermer" />
</div>
</div>
<span class="options">
<span contenteditable="true" id="terme">
<% if (terme) { %><%= terme %><% } else { %>terme<% }%>
</span>
<span contenteditable="true" id="boucle">
<% if (boucle) { %><%= boucle %><% } else { %>boucle<% }%>
</span>
<span contenteditable="true" id="alternative">
<% if (alternative) { %><%= alternative %><% } else { %>alternative<% }%>
</span>
<span contenteditable="true" id="condition" class="invis">
<% if (condition) { %><%= condition %><% } else { %>condition<% }%>
</span>
<span id="imperative_env" class="invis">
<input type="checkbox" name="imperative" id="imperative" value="1" <% if (imperative) { %>checked<% } %> tabindex="0"> impérative
</span>
......@@ -40,10 +94,15 @@
<!--- les conditions sont au niveau des Sous-axes donc ne doit pas apparaitre dans le menu déroulant -->
<button class="add">Ajouter</button>
<button class="toggle">(Dé)plier</button>
<button class="effaceAxe">Effacer</button>
<button class="effaceAxe">Effacer</button>
</span>
<div class="boucle-infos" class="invis">
<input type="checkbox" name="boucle_check" id="boucle_check" value="1" <% if (boucle_check) { %>checked<% } %> tabindex="0">
boucle de
......@@ -55,6 +114,7 @@
<!-- <input type="button" id="boucle_x" value="effacer" /> -->
</div>
<div class="alt-infos" class="invis">
entre
<input type="text" value="<% if (alternative_n) { %><%= alternative_n %><% } else { %>1<% }%>" id="alt_n" name="alt_n" />
......@@ -67,42 +127,10 @@
<option value="<%= alternativeChoice %>" <% if (alternative_mode==alternativeChoice) { %>selected<% } %>><%= alternativeChoice %></option>
<% }); %>
</select>
<input type="button" id="alt_ok" value="ok" />
<input type="button" id="alt_x" value="effacer" />
</div>
<div class="axis-infos">
Axe:
<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>
Aspects:
<select id="aspect">
<% _.each(aspectChoices, function(aspectChoice) {%>
<option value="<%= aspectChoice %>" <% if (aspect==aspectChoice) { %>selected<% } %>><%= aspectChoice %></option>
<% }); %>
</select>
</div>
<!-- <div>Pièce jointe</div> -->
<div>
<div>Indications</div>
<textarea id="indications">
<% if (indications) { %><%= indications %><% } %>
</textarea>
</div>
<input type="button" id="alt_ok" value="ok" />
<div>
<input type="button" class="axis-fermer-infos" value="fermer" />
</div>
<input type="button" id="alt_x" value="effacer" />
</div>
</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