Commit 6462b37b authored by alexandre's avatar alexandre

Dernier ajustements

parent c55c2781
......@@ -50,19 +50,19 @@
.replace(/-+$/, ''); // Trim - from end of text
}
var $toc = $('<ol class="help__toc"></ol>')
// var $toc = $('<ol class="help__toc"></ol>')
$("h2").each(function() {
var txt = $(this).text();
var id = slugify(txt);
$(this).attr('id', id);
var $li = $('<li></li>');
var $a = $('<a></a>').attr('href', '#' + id).text(txt);
$li.append($a);
$toc.append($li);
});
// $("h2").each(function() {
// var txt = $(this).text();
// var id = slugify(txt);
// $(this).attr('id', id);
// var $li = $('<li></li>');
// var $a = $('<a></a>').attr('href', '#' + id).text(txt);
// $li.append($a);
// $toc.append($li);
// });
$toc.insertBefore($("h2").first());
// $toc.insertBefore($("h2").first());
</script>
</body>
</html>
......@@ -418,6 +418,15 @@ section.hidden { display: none; }
.body-text h2 {
font-weight: bold;
letter-spacing: 1px;
font-size: 1.2rem;
margin-top: var(--line-height);
margin-bottom: var(--line-height);
}
.body-text h3 {
font-size: 1.2rem;
margin-top: var(--line-height);
margin-bottom: var(--line-height);
}
......@@ -426,11 +435,13 @@ section.hidden { display: none; }
.body-text em { font-style: italic; }
.body-text :matches(p, ul, h2) + :matches(p, ul, h2) { margin-top: var(--line-height); }
/* .body-text :matches(p, ul, h2) + :matches(p, ul, h2) { margin-top: calc(var(--line-height) / 2); } */
.body-text li:before { content: "- "; }
.body-text :matches(p) + :matches(p) { text-indent: 2rem; }
.body-text ul { margin-left: 2em; }
.body-text ul li:before { content: "- "; }
.body-text ul { margin-left: 2em; margin-top: var(--line-height); margin-bottom: var(--line-height);}
.body-text--about { max-width: 45em; }
......@@ -913,25 +924,25 @@ li.axis { position: relative; }
padding-right: .7em;
}
.line__body[data-aspect="itératif"]:before,
.line__body[data-aspect="duratif"]:before {
content: '';
position: absolute;
top: 0; right: 0;
border-right: .7em solid var(--background-color);
border-bottom: .7em solid var(--row-color);
width: 0;
}
.line__body[data-aspect="sémelfactif"]:after,
.line__body[data-aspect="duratif"]:after {
content: '';
position: absolute;
bottom: 0; right: 0;
border-right: .7em solid var(--background-color);
border-top: .7em solid var(--row-color);
width: 0;
}
/* .line__body[data-aspect="itératif"]:before, */
/* .line__body[data-aspect="duratif"]:before { */
/* content: ''; */
/* position: absolute; */
/* top: 0; right: 0; */
/* border-right: .7em solid var(--background-color); */
/* border-bottom: .7em solid var(--row-color); */
/* width: 0; */
/* } */
/* .line__body[data-aspect="sémelfactif"]:after, */
/* .line__body[data-aspect="duratif"]:after { */
/* content: ''; */
/* position: absolute; */
/* bottom: 0; right: 0; */
/* border-right: .7em solid var(--background-color); */
/* border-top: .7em solid var(--row-color); */
/* width: 0; */
/* } */
.alt-symbol {
color: var(--row-color);
......@@ -1038,6 +1049,7 @@ li.axis { position: relative; }
border-radius: .8em/50%;
z-index: 1;
position: relative;
top: 11px;
}
......@@ -1083,6 +1095,7 @@ li + li .alt-symbol { display: none; }
.line__title {
position: relative;
font-size: 1.2rem;
cursor: move;
}
.line__title, .attachment--view {
......@@ -1101,7 +1114,6 @@ li + li .alt-symbol { display: none; }
}
[data-module="true"] > .axis-row > .axis-row--background-wrapper > .line__body > .line__title {
font-style: italic;
animation: pulse 500ms infinite alternate;
}
......@@ -1221,6 +1233,7 @@ li + li .alt-symbol { display: none; }
max-width: 500px;
min-width: 200px;
white-space: normal;
line-height: var(--font-size);
}
.line__indications .label,
......@@ -1232,9 +1245,10 @@ li + li .alt-symbol { display: none; }
position: absolute;
color: var(--row-color);
background-color: white;
padding: 5.5px;
padding: 7px 8px 6px 8px;
left: 0;
z-index: 2;
line-height: var(--font-size);
}
.line__indications p + p {
......@@ -1242,16 +1256,15 @@ li + li .alt-symbol { display: none; }
}
.indications-label {
/* display: block; */
font-weight: 400;
}
.indications-label:nth-child(n+2) { margin-top: 1em; }
.line__condition .label,
.line__terme .label { top: -8px; }
.line__terme .label { top: -7px; }
.line__indications .label { top: -11px; }
.line__indications .label { top: -8px; }
.line__indications:hover .label,
.line__condition:hover .label,
......@@ -1279,6 +1292,7 @@ li + li .alt-symbol { display: none; }
*/
.attachment--view {
display: inline-block;
font-size: 1.2rem;
}
.attachment--view a {
......@@ -1369,6 +1383,7 @@ li + li .alt-symbol { display: none; }
.axis-edit-form {
position: absolute;
top: 3.5em;
left: 39px;
border-width: 3px;
border-style: solid;
background: var(--background-color);
......@@ -1529,14 +1544,14 @@ ol[data-alternative]:before {
}
.help__content h2 {
letter-spacing: 1px;
text-transform: uppercase;
/* letter-spacing: 1px; */
/* text-transform: uppercase; */
}
.help__content h2,
.help__content h3 {
font-weight: bold;
padding-top: 28pt;
padding-top: 14pt;
padding-bottom: 14pt;
}
......@@ -1548,7 +1563,7 @@ ol[data-alternative]:before {
.help__content h2:first-of-type { padding-top: 0; }
.help__content :matches(p, ul, ol, pre) + :matches(p, ul, ol, pre) { margin-top: 14pt; }
.help__content :matches(p, ul, ol, pre) + :matches(p, ul, ol, pre) { margin-top: calc(var(--line-height) / 2); }
.help__content :matches(ul, ol) { margin-left: 2em; text-indent: -.75em; }
......@@ -1853,7 +1868,7 @@ ol[data-alternative]:before {
}
.scores-list {
column-width: 35em;
column-count: 2;
}
.scores-list > div {
......
......@@ -41,6 +41,7 @@ W.lang.en = {
"Etes-vous sur de vouloir vous deconnecter?": "Are you sure you want to disconnect",
"exactement": "exactly",
"Export": "Export",
"formats acceptés:": "file formats:",
"Fiche": "File",
"Genre": "Genre",
// "indéterminé": "undefined",
......@@ -69,6 +70,7 @@ W.lang.en = {
"Pièce-jointe": "Attachment",
"Prescription": "Prescription",
"Présentation": "Presentation",
"Publiée": "Published",
"Créée le": "Created at",
"rechercher": "search",
"Répertoire de partitions": "Score directory",
......
......@@ -243,7 +243,7 @@ window.W = window.W || {};
// An id is necessary to make links to axes before they are saved.
// Once models have an id they are managed by the collection.
id: uuidv4(),
title: t('Sans titre'), //(uniq)
title: t('axe principal'), //(uniq)
contingent: false, // optionnel, au choix de l'interprète
module_: false,
aspect: '',
......@@ -318,7 +318,7 @@ window.W = window.W || {};
addSubLine: function () {
var sublines = this.get('sublines');
var title = "Sous axe " + (sublines.length + 1);
var title = "sous-axe " + (sublines.length + 1);
var tag = (sublines.length > 0) ? sublines[0] : W.tags[0];
sublines.add((new W.LineModel({ title: title, tag: tag })));
},
......
......@@ -990,6 +990,7 @@ window.W = window.W || {};
events: {
'click @ui.title': 'toggleClick',
'dblclick @ui.titleSpan': 'titleDblClick',
'click @ui.titleSpan': 'titleClick',
'click [name="toggle"]': 'toggle',
'click [name="add"]': 'addLine',
......@@ -1291,6 +1292,8 @@ window.W = window.W || {};
// Triggered by a subline view beeing relocated
relocateChild: function (event, model, index) {
this.expand();
if (valid_move(model, this.model)) {
var previous_parent = model.get("parent");
previous_parent.get("sublines").remove(model);
......@@ -1340,6 +1343,14 @@ window.W = window.W || {};
}
},
titleDblClick: function (e) {
e.stopImmediatePropagation();
e.preventDefault();
// alert('dbl click');
this.toggle();
},
titleClick: function (e) {
e.stopImmediatePropagation();
e.preventDefault();
......@@ -1348,9 +1359,8 @@ window.W = window.W || {};
this.model.getEditable() && this.showInlineForm();
} else if (e.ctrlKey || e.metaKey || e.altKey) {
this.model.getEditable() && this.toggleForm();
} else {
this.toggle();
}
}
},
toggleClick: function (e) {
......@@ -1457,7 +1467,7 @@ window.W = window.W || {};
W.TreeNodeLink = Marionette.View.extend({
tagName: 'li',
className: 'linked-node axis',
className: 'linked-node axis score__line line',
template: _.noop, // Trick to have an empty template
initialize: function () {
......@@ -1989,7 +1999,7 @@ window.W = window.W || {};
forcePlaceholderSize: true,
opacity: 0.25,
helper: 'clone',
handle: '.icon--handle',
handle: '.line__title',
isTree: true,
items: 'li',
toleranceElement: '> header',
......
......@@ -6,4 +6,6 @@
<span class="label-text"></span>
<input type="file" name="file" class="inline">
<button class="inline"><%- t('Mode URL') %></button>
</label>
\ No newline at end of file
</label>
<p><%- t('formats acceptés:') %> .jpg, .png, .gif, .pdf, .mp3, .flac, .ogg, .oga, .wav, .opus, .aac, .m4a</p>
{% spaceless %}
<header class="axis-row">
<span class="icon icon--handle"></span>
<!-- <span class="icon icon--handle"></span> -->
<section class="axis-row--background-wrapper <% if (condition) { %>conditional<% } %>">
<% if (condition) { %>
......@@ -28,6 +28,15 @@
<section class="attachment--view"></section>
<% } %>
<% if (aspect == "duratif") { %>
<span style="font-weight: lighter"> &rarr;</span>
<% } else if (aspect == "itératif") { %>
<span style="font-weight: lighter"> </span>
<% } else if (aspect == "sémelfactif") { %>
<span style="font-weight: lighter"> &darr;</span>
<% } %>
<% if (hasIndications) { %>
<span class="line__indications">
<span class="label">
......
......@@ -64,7 +64,7 @@
<!-- Permissions -->
<label>
<input type="checkbox" name="is_public" <% if (is_public) { %>checked<% } %>>
<span class="label-text" style="display: inline"><%- t('Publiée?') %>: </span>
<span class="label-text" style="display: inline"><%- t('Publiée') %>: </span>
</label>
<span class="label-text"><%- t('Partager avec') %>: </span>
......
......@@ -70,20 +70,20 @@
</dd>
<% } %>
<% if (effectif && effectif !== "") { %>
<dt class="score-meta__term"><%- t('Effectif') %></dt>
<dd class="score-meta__def">
<% if (effectif && effectif.type === rangeType.exact) { %>
<%- effectif.value %> <%- (effectif.value > 1) ? t('performeurs') : t('performeur') %>
<% } else if (effectif && effectif.type === rangeType.minimal) { %>
<%- t('au moins') %> <%- effectif.value %> <%- t('performeurs') %>
<% } else if (effectif && effectif.type === rangeType.range) { %>
<%- t('entre') %> <%- effectif.value[0] %> et <%- effectif.value[1] %> <%- t('performeurs') %>
<% } else { %>
<%- t('indéterminé') %>
<% } %>
</dd>
<% } %>
<!-- <% if (effectif && effectif !== "") { %> -->
<!-- <dt class="score-meta__term"><%- t('Effectif') %></dt> -->
<!-- <dd class="score-meta__def"> -->
<!-- <% if (effectif && effectif.type === rangeType.exact) { %> -->
<!-- <%- effectif.value %> <%- (effectif.value > 1) ? t('performeurs') : t('performeur') %> -->
<!-- <% } else if (effectif && effectif.type === rangeType.minimal) { %> -->
<!-- <%- t('au moins') %> <%- effectif.value %> <%- t('performeurs') %> -->
<!-- <% } else if (effectif && effectif.type === rangeType.range) { %> -->
<!-- <%- t('entre') %> <%- effectif.value[0] %> et <%- effectif.value[1] %> <%- t('performeurs') %> -->
<!-- <% } else { %> -->
<!-- <%- t('indéterminé') %> -->
<!-- <% } %> -->
<!-- </dd> -->
<!-- <% } %> -->
<% if (duration) { %>
<dt class="score-meta__term"><%- t('Durée') %></dt>
......@@ -106,7 +106,7 @@
<dd class="score-meta__def"><%- formatTimestamp(updated_at) %></dd>
</dl>
<p><% if (is_public) { %>Cette partition est public<% } else { %>Cette partition est privée<% } %></p>
<p><% if (is_public) { %>Cette partition est publique<% } else { %>Cette partition est privée<% } %></p>
{% comment %}
<dl class="score-meta">
......@@ -120,7 +120,7 @@
<% } %>
</ul>
</dd>
<dt class="score-meta__term score-meta__term--inline"><%- t('Publiée?') %></dt>
<dt class="score-meta__term score-meta__term--inline"><%- t('Publiée') %></dt>
<dd class="score-meta__def"><%- is_public %></dd>
</dl>
{% endcomment %}
......
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