Commit 5943467c authored by mmarkus1's avatar mmarkus1
Browse files

Merge branch 'feature/transform-words-joined-#73' into 'staging'

add join word functionality closes #73

See merge request ARCHITRAVE/SADE!11
parents 72c3a5d5 81ad9ccf
......@@ -376,6 +376,16 @@
<lang key="en">showAdditionalContent</lang>
<lang key="fr">Afficher les ajouts de l'auteur</lang>
</word>
<word key="joinWord">
<lang key="de">joint correction</lang>
<lang key="en">joint correction</lang>
<lang key="fr">joint correction</lang>
</word>
<word key="showJoinWords">
<lang key="de">show joint correction</lang>
<lang key="en">show joint correction</lang>
<lang key="fr">show joint correction</lang>
</word>
<word key="showInfo">
<lang key="de">Zeige Info</lang>
<lang key="en">show Info</lang>
......
......@@ -620,9 +620,16 @@ return
local:magic($node/node())
}
case element ( tei:w ) return
if ( string($node/@join) = "left") then (
<span class="tei-w-join" data-toggle="tooltip" data-placement="bottom" title="{concat($node/preceding-sibling::tei:w[1]//text(),' ',$node//text())}">{local:magic($node/node())}<i class="fas fa-comment-medical"></i></span>
)
else (local:magic($node/node()))
default return
local:magic($node/node())}
catch * {
element xhtml:span {
attribute class {"error"},
......
......@@ -328,6 +328,11 @@
<i class="far fa-lg fa-square checkbox-invisible"/>
<span data-template="lang:translate" data-template-content="showScientificComments"/>
</a>
<a class="dropdown-item arch-ul" href="#" onclick="toggleDropdownCheckbox(this);" id="joinWords">
<i class="far fa-lg fa-check-square"/>
<i class="far fa-lg fa-square checkbox-invisible"/>
<span data-template="lang:translate" data-template-content="showJoinWords"/>
</a>
<a class="dropdown-item arch-ul" href="#" onclick="toggleDropdownCheckbox(this);" id="origSpelling">
<i class="far fa-lg fa-check-square"/>
<i class="far fa-lg fa-square checkbox-invisible"/>
......@@ -475,6 +480,10 @@
<div class="edition-info-item">
<i class="fa-fw fa-lg fas fa-comment"/>
<span data-template="lang:translate" data-template-content="scientificComments"/>
</div>
<div class="edition-info-item">
<i class="fa-fw fa-lg fas fa-comment-medical"/>
<span data-template="lang:translate" data-template-content="joinWord"/>
</div>
<div class="edition-info-item">
<i class="fa-fw fa-lg fas fa-star"/>
......
......@@ -58,6 +58,9 @@ function toggleSVGVisibility(object) {
triggerSVGVisibility(".translationComment svg");
triggerSVGVisibility(".editorialComment svg");
break;
case 'joinWords':
triggerSVGVisibility(".tei-w-join svg");
break;
case 'origSpelling':
triggerSVGVisibility(".abbr-yes");
triggerSVGVisibility(".abbr-no");
......@@ -91,6 +94,9 @@ function toggleSVGVisibility(object) {
if ($('#scientificComments .fa-check-square').css("display") != "inline-block") {
$('#scientificComments').click();
}
if ($('#joinWords .fa-check-square').css("display") != "inline-block") {
$('#joinWords').click();
}
document.getElementById("showAll").children[0].classList.toggle("checkbox-invisible");
document.getElementById("showAll").children[1].classList.toggle("checkbox-invisible");
break;
......
Supports Markdown
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