Commit e506c120 authored by Mathias Goebel's avatar Mathias Goebel 🎠
Browse files

Merge branch 'release/4.6.0'

parents adcf614a b32f2f76
Pipeline #101071 passed with stages
in 16 minutes and 18 seconds
project.version=4.4.0
project.name=http://textgrid.de/exist/fontane-develop
project.version=4.6.0
project.abbrev=fontane
project.title=[Fontane] SADE-Project
project.processorversion=4.7.0
......
......@@ -326,19 +326,19 @@ ul.workList li.item:before, li.group.wrk > ul > li:before {
border: medium none;
}
#transBtn, #facsBtn, #xmlBtn, #tocBtn, #btns, #infoView, #rsBtn, #dateBtn, #refBtn, #infoViewer, #rotationBtn {
#transBtn, #facsBtn, #xmlBtn, #tocBtn, #btns, #infoView, #rsBtn, #dateBtn, #refBtn, #infoViewer, #rotationBtn, #seqBtn {
cursor: pointer;
}
#toc > ol {
list-style: none;
padding: 10px;}
#tocBtn, #btns, #infoViewer, #rotationBtn {
#tocBtn, #btns, #infoViewer, #rotationBtn, #seqBtn {
display: inline;
margin-right: 15px;
float:left;
max-width: 15px;
}
#btns span i, #tocBtn span i, #infoViewer span i, #rotationBtn span i {
#btns span i, #tocBtn span i, #infoViewer span i, #rotationBtn span i, #seqBtn span i {
min-width: 30px;
text-align: center;
}
......@@ -356,6 +356,15 @@ ul.workList li.item:before, li.group.wrk > ul > li:before {
.teixml b {
white-space: nowrap;
}
#seqBtn span i {
background-color: transparent;
animation-name: highlightfade;
animation-duration: 3s;
animation-delay: 1s;
}
@keyframes highlightfade {
50% {background-color: rgba(182, 71, 61, 0.3);}
}
#navNext, #navPrev {
white-space: nowrap;
}
......
......@@ -136,7 +136,18 @@
#goldenEdition {
height: calc(100vh - 150px);
}
.ffacs, .ftran {margin:20px;}
.ffacs, .ftran {
margin:20px;
}
.facsLoader {
position: absolute;
}
.codeLoader {
margin:20px;
}
body .lm_content{
overflow: auto;
}
......@@ -154,5 +165,5 @@ body .lm_content{
font-weight:300;
}
.lm_goldenlayout {
background: none;
}
\ No newline at end of file
background: none;
}
......@@ -18,7 +18,11 @@ place them in the alphanumeric order of the signatures
position: relative;
top: -0.65cm;
}
#A08 #s29r .line.brown_ink .add .caret_half-bow_pos-left {
margin-left: -0.1cm;
top: -0.1cm;
height: 1.4cm;
}
#A09 #s55r.surface div.zone span.metamark.deletion.pencil {
background: linear-gradient(65deg, rgba(0,0,0,0) 0%, rgba(0,0,0,0) calc(50% - 1px), rgba(47,79,79,1) 50%, rgba(0,0,0,0) calc(50% + 1px));
margin-left: -133px;
......@@ -26,6 +30,15 @@ place them in the alphanumeric order of the signatures
#A09_55r_2::after {
content: "";
}
#A10 #s12r .below {
border: 1px solid darkslategray;
border-top: none;
}
#A10 #s66v div.line:nth-child(11) span.add span.above {
left: -0.2cm !important;
}
#A11 #souter_front_cover div.surface.teilabel.Etikett_von_Fontane_angefertigt_-_Aufgeklebtes_Blatt.nested div.surface.teilabel.Etikett_von_Fontane_angefertigt_-_Aufgeklebtes_Blatt.nested {
position: absolute;
top: -0.3cm;
......@@ -34,6 +47,9 @@ place them in the alphanumeric order of the signatures
height: 15.2cm;
background-color: rgba(255, 229, 204, 0.7);
}
#A11_17v_m.mod.subst div.modHover.italic span:nth-child(3)::after {
content: " Kreishälfte";
}
#A11 #s19v div.line:nth-child(11) > span:nth-child(4) > span:nth-child(2) > svg:nth-child(2) {
bottom: 10px;
position: absolute;
......@@ -114,6 +130,7 @@ left: -0.1cm;
#B04 #s52v span.addWrapper:nth-child(5) {
position: relative;
}
#B05 #s7r span.addWrapper:nth-child(5) {
position: relative !important;
}
......@@ -127,6 +144,24 @@ left: -0.1cm;
margin-top: -1.6cm;
margin-left: 1.3cm;
}
#B05 #s42r .zone:nth-child(5) .line:first-child span:first-child span:nth-child(4) span span:nth-child(3) {
text-decoration-color: darkslategrey;
border-color: #42b4e6;
}
#B05 #s42r .zone:nth-child(5) .line:nth-child(2) span.hi span.seg span.rs.direct.psn span.modSeq1.text-decoration.underline.modSeq2.underline-medium_blue_pencil.pencil.Fontane.Latf.hasty {
text-decoration-color: darkslategrey;
border-color: #42b4e6;
}
#B05 #s42r .zone:nth-child(5) .line:nth-child(2) span:first-child span:nth-child(4) {
border-color: #42b4e6;
}
#B05 #s42r .zone:nth-child(5) .line:first-child span:first-child span:nth-child(3) {
border-color: #42b4e6;
}
#B05 #s42r .zone:nth-child(5) .line:first-child span:first-child span:nth-child(4) span span:first-child {
border-color: #42b4e6;
}
#B06_24r_1 span.hi:nth-child(2) > span:nth-child(3), #B06_24r_1 div.line:nth-child(14) > span:nth-child(1) > span:nth-child(3) {
padding-bottom: 4px;
}
......@@ -223,6 +258,9 @@ left: -0.1cm;
#B11 #s24r.surface div#B11_24r.zone span.metamark.authorial_note.pencil {
left: -150%;
}
#B11 #s24r.surface span.metamark.authorial_note.bracket_right.pencil span.bracket_right {
margin-left: -1.5cm;
}
#B11 #s25r.surface div.zone span.metamark.authorial_note.pencil{
bottom: 60% !important;
left: -100%;
......@@ -269,6 +307,13 @@ left: -0.1cm;
left: 0.1cm;
}
#C01 #sIIr {
display: none;
}
#C01 .ftran.sourceDoc > #sIIr.surface.teiclipping.Marienbild {
display:block !important;
}
#C02 #s9r .add {
z-index: 1000;
}
......@@ -283,6 +328,23 @@ left: -0.1cm;
z-index:1000;
}
#C04_28v_styling .underline {
border-bottom: 1px solid;
padding-bottom: 3px;
}
#C04_28v_styling .seg.underline > .seg.underline {
border-bottom: 3px double;
padding-bottom: 1px;
}
#C04_32r_styling .underline.underline-style.half-s-shapedlower-right {
padding-bottom: 0;
}
#C04_32r_styling .seg.underline > .seg.underline {
border-bottom: 1px solid;
padding-bottom: 10px;
}
#C05_3rar_1.zone div.line span span.addWrapper svg.curved_V {
top:-12px !important;
}
......@@ -294,6 +356,9 @@ left: -0.1cm;
position: relative;
/* https://projects.gwdg.de/issues/18394 */
}
#C08_7r_2 {
transform: scaleX(0.3) !important;
}
#D01 #sinner_back_cover #sBeilage_1r.surface.teiadditional.Visitenkarte.nested {
display: none;
}
......@@ -302,6 +367,10 @@ left: -0.1cm;
background-color: ghostwhite;
}
#D02_1r_d {
margin-top: 0;
position: absolute;
}
#D02_15r_a.hi span.seg.text-decoration.underline span.mod.subst.addSesquipedalian div.modHover.italic.hoverTop span:first-child::before {
content: "ge-";
}
......@@ -309,6 +378,36 @@ left: -0.1cm;
left: -0.6cm !important;
}
#D03 #s4r .zone:nth-child(2) .line:nth-child(3) .above {
left: -1.8cm !important;
}
#D03 #s4r .above + svg.quartercircle-upper-right {
position: absolute;
right: -8px;
top: -12px;
}
#D03 #s24r .seg.underline > .seg.underline {
border-bottom: inherit;
}
#D06 #s60r .caret_bow_pos-left, #D06 #s60r .above {
left: -1.0cm !important;
}
#D06_68v_x > * {
border-color: darkslategray;
}
#D06 #s69v .zone:nth-child(16) {
/* metamark connect */
border-bottom: 1px solid sienna;
}
#D06 #sVv .metamark::before {
display:block;
position: absolute;
height: 5cm;
width: 5cm;
background-image: url('public/img/caret_umschlungener-bogen.svg');
}
#D08 #s68r.surface div.zone.illustration.figure div.zone:nth-child(14) div.line:nth-child(3) {
font-size: 0.85em;
}
......
......@@ -66,6 +66,17 @@ pre {border:none;}
.surface.no-nesting .surface {
display:none;
}
.surface.vertical_bar::after {
content: " ";
display: block;
height: 100%;
border-left: 1px solid darkslategray;
position: absolute;
top: 0;
left: 18px;
}
img.facs {
width: auto;
height: 100%;
......@@ -443,11 +454,11 @@ medium{
font-family: initial;
}
.segHover, .restoreHover {
display: none;
background-color: rgba(100, 100, 100, 0.75);
font-size: 0.9em;
color: white;
white-space: nowrap;
display: none;
background-color: rgba(100, 100, 100, 0.75);
font-size: 0.9em;
color: white;
white-space: nowrap;
position: absolute;
margin-top: -0.5cm;
padding: 0px 10px;
......@@ -455,6 +466,7 @@ medium{
line-height: 1cm;
font-style: italic;
transform-origin: center center 0;
letter-spacing: 0px;
}
.seg:hover .segHover {
display: block;
......@@ -607,6 +619,7 @@ svg {
.above + svg.quartercircle-upper-right {
position: absolute;
right: 0;
bottom: -11px;
}
.above + svg.quartercircle-upper-left {
position: absolute;
......@@ -698,7 +711,14 @@ svg {
border-width: medium 1px 1px;
position: relative !important;
}
.above.looped_arc {
border-width: 0px 1px 1px 1px;
border-style: solid;
border-color: darkslategray;
padding: 0;
line-height: 100%;
bottom: 100%;
}
/*
.teicaret {
position: absolute;
......@@ -743,6 +763,9 @@ svg {
text-decoration-color: sienna;
-webkit-text-decoration-color: sienna;
}
.line-through.line-through-medium_pencil {
text-decoration-color: darkslategray !important;
}
.underline {
border-bottom: 1px solid;
......@@ -931,6 +954,20 @@ svg {
.underline-weight.bold {
border-bottom-width: 3px;
}
.underline.underline-cancel.jagged::after {
content: " ";
display: inline-block;
position: absolute;
border-bottom-width: 5px;
width: 100%;
bottom: -3px;
left: 0;
border-bottom-color: red;
border-bottom-style: solid;
border-image-source: url(/public/img/border.png);
border-image-slice: 12 12 12 12;
border-image-repeat: repeat repeat;
}
.fw-fontane .semicircle {
padding: 0 8px;
......@@ -1061,6 +1098,20 @@ svg {
.line-through.single_oblique90deg {
text-decoration:none;
}
.line-through.double_oblique90deg.line-through-medium_pencil {
text-decoration: none;
background: linear-gradient(90deg,
transparent 0%,
transparent calc(25% - 1px),
black 25%,
transparent calc(25% + 1px),
transparent calc(75% - 1px),
black 75%,
transparent calc(75% + 1px)
);
}
.letter-spacing .line-through.single_oblique90deg::before {
left: -7px;
}
......@@ -1133,7 +1184,14 @@ svg {
rgba(47,79,79,1) 50%,
rgba(0,0,0,0) calc(50% + 1px));
}
.line-through-style.single_oblique45deg.brown_ink {
background:
linear-gradient(to bottom left,
rgba(0,0,0,0) 0%,
rgba(0,0,0,0) calc(50% - 1px),
rgba(160,82,45,1) 50%,
rgba(0,0,0,0) calc(50% + 1px));
}
.line-through.single_oblique135deg {
text-decoration:none;
......@@ -1257,20 +1315,36 @@ svg {
text-decoration: none;
}
.multiple_oblique45deg {
background:
linear-gradient(45deg,
rgba(0,0,0,0) calc(20% - 1px),
rgba(0,0,0,1) 20%,
rgba(0,0,0,0) calc(20% + 1px),
rgba(0,0,0,0) calc(40% - 1px),
rgba(0,0,0,1) 40%,
rgba(0,0,0,0) calc(40% + 1px),
rgba(0,0,0,0) calc(60% - 1px),
rgba(0,0,0,1) 60%,
rgba(0,0,0,0) calc(60% + 1px),
rgba(0,0,0,0) calc(80% - 1px),
rgba(0,0,0,1) 80%,
rgba(0,0,0,0) calc(80% + 1px));
}
.multiple_oblique45deg.brown_ink {
background:
linear-gradient(45deg,
rgba(0,0,0,0) 20%,
rgba(0,0,0,1) 20%,
rgba(160, 82, 45,1) 20%,
rgba(0,0,0,0) 21%,
rgba(0,0,0,0) 39%,
rgba(0,0,0,0) 40%,
rgba(0,0,0,1) 40%,
rgba(160, 82, 45,1) 40%,
rgba(0,0,0,0) 41%,
rgba(0,0,0,0) 60%,
rgba(0,0,0,1) 60%,
rgba(160, 82, 45,1) 60%,
rgba(0,0,0,0) 61%,
rgba(0,0,0,0) 80%,
rgba(0,0,0,1) 80%,
rgba(160, 82, 45,1) 80%,
rgba(0,0,0,0) 81%);
}
.multiple_oblique135deg {
......@@ -1408,13 +1482,20 @@ svg {
-o-border-image: url('/public/img/border-wavy.png') 27 27 26 repeat;
border-image: url('/public/img/border-wavy.png') 27 27 26 fill repeat;
}
.border-left-style.retrace{
.border-left-style.retrace {
border-image-slice: 13 27 55 95;
border-image-width: 0px 0px 0px 20px;
border-image-outset: 0px 0px 0px 20px;
border-image-repeat: stretch stretch;
border-image-source: url('/public/img/border:retrace.svg');
}
.border-left-style.retrace.border-medium_blue_pencil {
border-image-slice: 13 27 55 95;
border-image-width: 0px 0px 0px 20px;
border-image-outset: 0px 0px 0px 20px;
border-image-repeat: stretch stretch;
border-image-source: url('/public/img/border:retrace-blue_pencil.svg');
}
.border-left-style.retrace.border-medium_red_pencil{
border-image-source: url('/public/img/border:retrace-red_pencil.svg');
}
......@@ -1551,7 +1632,9 @@ svg {
top: 5px;
width: 10px;
}
.brown_ink .g svg path {
stroke: sienna !important;
}
.instant:after {content:'\21AF'}
.unclear:before , .unclear:after{
content: '?';
......@@ -1722,6 +1805,17 @@ hr.Schlusslinie {
margin: 0;
position: relative;
}
hr.Schlusslinie.slightly_wavy.brown_ink {
border-image-repeat: repeat repeat;
border-image-slice: 12 12 12 12;
border-image-source: url('/public/img/border-slightly_wavy-brown_ink.png');
border-left: 0 none;
border-right: 0 none;
border-style: none none solid;
border-top: 0 none;
border-bottom-width:3px;
}
.hrHover {
display: none;
background-color: rgba(100, 100, 100, 0.75);
......
......@@ -27,6 +27,12 @@
<i class="fa fa-rotate-right"/>
</span>
</h1>
<h1 id="seqBtn" class="Btn animated slideInRight inactive">
<span>
<i id="seqDisp" class="fa fa-retweet">
</i>
</span>
</h1>
</div>
</div>
</div>
......
......@@ -91,20 +91,20 @@ if( savedState !== null ) {
// register components
myLayout.registerComponent( 'code', function( container, state ){
container.getElement().html( '<div id="placeholder">…</div>');
container.getElement().html( '<img alt="" class="codeLoader" src="https://fontane-nb.dariah.eu/public/img/loader.svg" width="500">');
$.ajax({
url: "get/code.html"+window.location.search,
dataType: "text"
}).done( function(data){
$( "#placeholder" ).replaceWith( data );
$( ".codeLoader" ).replaceWith( data );
});
});
myLayout.registerComponent( 'tran', function( container, state ){
if ( getParameter("page").indexOf("-") > 0 && getParameter("page").indexOf("alt") == -1 ) {
var newElement = '<div class="ftran sourceDoc double"></div>'
var newElement = '<div class="ftran sourceDoc double"><img alt="" class="facsLoader" src="https://fontane-nb.dariah.eu/public/img/loader.svg" width="500"></div>'
}
else {var newElement = '<div class="ftran sourceDoc"></div>'}
else {var newElement = '<div class="ftran sourceDoc"><img alt="" class="transLoader" src="https://fontane-nb.dariah.eu/public/img/loader.svg" width="500"></div>'}
container.getElement().html( newElement );
$.ajax({
url: "get/trans.html"+window.location.search,
......@@ -122,25 +122,39 @@ container.getElement().html( newElement );
}
highlightLinkedAreas();
indexTranscriptionHighlighting();
$( ".transLoader" ).remove();
}).fail(function(e) {
$(".ftran").html("<h3>error loading transcription</h3><p>If you want to get this error analysed, please send the following code and together with the current url to the support team.</p><div><code class='json hljs'>" + JSON.stringify(e) + "</code></div>");
});
});
myLayout.registerComponent( 'facs', function( container, state ){
if ( getParameter("page").indexOf("-") > 0 && getParameter("page").indexOf("alt") == -1 ) {
var newElement = '<div class="ffacs double"></div>'
var newElement = '<div class="ffacs double"><img alt="" class="facsLoader" src="https://fontane-nb.dariah.eu/public/img/loader.svg" width="500"></div>'
}
else {var newElement = '<div class="ffacs"></div>'}
else {var newElement = '<div class="ffacs"><img alt="" class="facsLoader" src="https://fontane-nb.dariah.eu/public/img/loader.svg" width="500"></div>'}
container.getElement().html( newElement );
$.ajax({
url: "get/facs.html"+window.location.search,
dataType: "text"
}).done( function(data){
$( ".ffacs" ).append( data );
$("img.facs").on("error", function(e){
$(".ffacs").html("<h3>error loading the image</h3><p>If you want to get this error analysed, please send the following code and together with the current url to the support team.</p><div><code class='json hljs'>" + JSON.stringify(e.currentTarget.currentSrc) + "\
" + JSON.stringify(e)
+ "</code></div>");
});
syncScroll( $(".ffacs").parent(), $(".ftran").parent() );
if( myLayout.root.getItemsById("facs")[0] ) {
rotate( myLayout.root.getItemsById("facs")[0].config.componentState.rotation );
}
altFacs();
document.getElementsByClassName("facs")[1].onload = function(){
$( ".facsLoader" ).remove();
};
})
.fail(function(e) {
$(".ffacs").html("<h3>error loading facsimile</h3><p>If you want to get this error analysed, please send the following code and together with the current url to the support team.</p><div><code class='json hljs'>" + JSON.stringify(e) + "</code></div>");
});
});
......@@ -152,6 +166,9 @@ container.getElement().html( '<div class="ftoc"></div>');
}).done( function(data){
$( ".ftoc" ).append( data );
$('li.target' + page).parent().parent().parent().addClass("in");
})
.fail(function(e) {
$(".ftoc").html("<h3>error loading table of contents</h3><p>If you want to get this error analysed, please send the following code and together with the current url to the support team.</p><div><code class='json hljs'>" + JSON.stringify(e) + "</code></div>");
});
});
......@@ -176,6 +193,9 @@ container.getElement().html( '<div class="fcomm"></div>');
$(".fhighlighted").removeClass("fhighlighted");
});
});
})
.fail(function(e) {
$(".fcomm").html("<h3>error loading commentary</h3><p>If you want to get this error analysed, please send the following code and together with the current url to the support team.</p><div><code class='json hljs'>" + JSON.stringify(e) + "</code></div>");
});
});
......@@ -191,6 +211,9 @@ container.getElement().html( '<div class="findex"></div>');
var newTitle = currentTitle.replace(/\d+/g, numEntities);
container.setTitle(newTitle);
indexTranscriptionHighlighting();
})
.fail(function(e) {
$(".findex").html("<h3>error loading index data</h3><p>If you want to get this error analysed, please send the following code and together with the current url to the support team.</p><div><code class='json hljs'>" + JSON.stringify(e) + "</code></div>");
});
});
......@@ -402,9 +425,28 @@ if ( $( ".surface" ).length ) {
}
function test4mod(){
var $allMods = $("[class*='mod-seq']"), len = $allMods.length, c=0;
var i = 0;