Commit 7b355dbd authored by gijs's avatar gijs

Furthered form, made save form disabled without changes

parent a68e57bb
......@@ -5,12 +5,6 @@ body {
padding: 2em;
}
[contenteditable="true"]:active, [contenteditable="true"]:focus{
border:1px solid blue;
outline:none;
padding: 3px;
}
#slider {
display: none;
}
......@@ -80,12 +74,14 @@ label .label-text {
.axis-edit-form {
/* display: none; */
position: absolute;
position: fixed;
left: 50px;
top: 30px;
background: white;
z-index: 1;
border-width: 0px 2px 2px 2px;
z-index: 2;
border-width: 2px 2px 2px 2px;
border-style: solid;
width: calc(100% - 1.25em);
width: calc(70vw - 50px - 2em);
margin-left: calc(-.25em - 2px);
padding: .25em;
padding-top: 1.25em;
......@@ -372,7 +368,7 @@ li li li li li li li li .axis-title { color: rgb(204,194, 16); }
float: right;
position: relative;
padding-right: 5em;
z-index: 2;
z-index: 1;
}
.axis-title:hover .axis-actions {
......@@ -383,6 +379,7 @@ li li li li li li li li .axis-title { color: rgb(204,194, 16); }
.axis-actions [name="toggle"] {
position: absolute;
right: 0;
top: 0px;
}
li + li > .axis-title #alt_symbole { display: none; }
......@@ -399,4 +396,8 @@ textarea {
vertical-align: top;
width: 20em;
height: 5em;
}
section.hidden {
display: none;
}
\ No newline at end of file
This diff is collapsed.
......@@ -40,11 +40,11 @@
</script>
<script id="rangefield-template" type="text/template">
{% include "playground/underscore/node-form.mtpl" %}
{% include "playground/underscore/rangefield.mtpl" %}
</script>
<script id="node-template-vue" type="text/template">
{% include "playground/underscore/rangefield.mtpl" %}
{% include "playground/underscore/node-vue.mtpl" %}
</script>
<script id="slider-template" type="text/template">
......@@ -72,19 +72,6 @@
<script src="{% static 'playground/js/routers.js' %}"></script>
<script src="{% static 'playground/js/apps.js' %}"></script>
<script src="{% static 'playground/js/main.js' %}"></script>
<script>
$(document).ready(function () {
$('.axis-fermer-infos').click(function () {
$(this).parent().parent().hide();
});
// $('.deplieTout').click(function(){
// $('li').attr('data-toggled',false);
//
// });
});
</script>
</body>
</html>
\ No newline at end of file
<fieldset>
<label><span class="label-text">titre</span>
<select name="tag">
<% _.each(tagChoices, function(t) {%>
<option value="<%= t %>" <% if (tag===t) { %>selected<% } %>><%= t %></option>
<% }); %>
</select>
<input type="text" name="title" value="<%= title %>">
</label>
<!-- condition -->
<label class="inline"><span class="label-text">condition</span>
<input type="text" name="condition" value="<%= condition %>">
......@@ -75,4 +84,5 @@
</section>
</fieldset>
<button type="submit">OK</button>
\ No newline at end of file
<button data-name="close">Fermer</button>
<button data-name="submit">Enregistrer</button>
\ No newline at end of file
......@@ -55,10 +55,14 @@
<span id="boucle">
&#10560;
<sup>
<% if (boucle[0] !== boucle[1]) { %>
<%= boucle[0] %>-<%= boucle[1] %>
<% } else { %>
<%= boucle[0] %>
<% if (boucle.type === rangeType.undetermined) { %>
indeterminé
<% } else if (boucle.type === rangeType.exact) { %>
<%= boucle.value %>
<% } else if (boucle.type === rangeType.minimal) { %>
<%= boucle.value %>+
<% } else if (boucle.type === rangeType.range) { %>
<%= boucle.value[0] %>-<%= boucle.value[1] %>
<% } %>
</sup>
</span>
......
<label class="inline">
<input type="checkbox" name="boucle" <% if (boucle) { %>checked<% } %>>
<input type="checkbox" name="toggle-range-field" <% if (enabled) { %>checked<% } %>>
<%= label %>
</label>
<label class="inline">
pour
<select name="boucle-type">
<option value="<%= rangeType.undetermined %>" <% if (!type || type == rangeType.undetermined) { %>selected<% } %>>
indeterminé
</option>
<option value="<%= rangeType.exact %>" <% if (type == rangeType.exact) { %>selected<% } %>>
exactement
</option>
<option value="<%= rangeType.minimal %>" <% if (type == rangeType.minimal) {%>selected<% } %>>
au moins
</option>
<option value="<%= rangeType.range %>" <% if (type == rangeType.range){ %>selected<% } %>>
entre
</option>
</select>
</label>
<section data-range-type="<%= rangeType.exact %>" class="type-fields inline hidden">
<select name="type">
<option value="<%= rangeType.undetermined %>" <% if (!type || type == rangeType.undetermined) { %>selected<% } %>>
indeterminé
</option>
<option value="<%= rangeType.exact %>" <% if (type == rangeType.exact) { %>selected<% } %>>
exactement
</option>
<option value="<%= rangeType.minimal %>" <% if (type == rangeType.minimal) {%>selected<% } %>>
au moins
</option>
<option value="<%= rangeType.range %>" <% if (type == rangeType.range){ %>selected<% } %>>
entre
</option>
</select>
<section data-range-type="<%= rangeType.exact %>" class="type-fields inline">
<input type="number" name="exact" min="1" class="small-number" value="<%= (type == rangeType.exact) ? value : 1 %>" />
</section>
<section data-range-type="<%= rangeType.minimal %>" class="type-fields inline hidden">
<section data-range-type="<%= rangeType.minimal %>" class="type-fields inline">
<input type="number" name="minimal" min="0" class="small-number" value="<%= (type == rangeType.minimal) ? value : 0 %>" />
</section>
<section data-range-type="<%= rangeType.range %>" class="type-fields inline hidden">
<section data-range-type="<%= rangeType.range %>" class="type-fields inline">
<input type="number" name="range-min" min="0" class="small-number" value="<%= (type == rangeType.range) ? value[0] : 0 %>" /> á
<input type="number" name="range-max" min="1" class="small-number" value="<%= (type == rangeType.range) ? value[1] : 1 %>" />
</section>
fois
\ No newline at end of file
</section>
\ No newline at end of file
......@@ -4,8 +4,8 @@
<div id="stage_set">
<%= stage_set %>
</div>
<button class="deplieTout">Tout déplier</button>
<button class="save">Enregistrer</button>
<button class="unfold">Tout déplier</button>
<button class="save" data-label-progress="Saving..." data-label="Enregistrer" <% if (!hasChanges) { %>disabled<% } %>>Enregistrer</button>
<button class="delete">Supprimer</button>
<div class="choix_mode">
</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