Merge branch 'release/4.5.0'

build.properties

-project.version=4.4.0
+project.version=4.5.0
 project.name=http://textgrid.de/exist/fontane-develop
 project.abbrev=fontane
 project.title=[Fontane] SADE-Project

sade-projects/textgrid/templates/tmpl1/css/goldenLayoutLight.css

@@ -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;
+}

sade-projects/textgrid/templates/tmpl1/css/specific.css

@@ -34,6 +34,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;
@@ -127,6 +130,18 @@ 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;
+}
+
 #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 +238,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%;
@@ -302,6 +320,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 +331,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;
 }

sade-projects/textgrid/templates/tmpl1/css/transcription.css

@@ -1408,13 +1408,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');
 }

sade-projects/textgrid/templates/tmpl1/js/goldenconfig.js

@@ -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,14 +122,15 @@ container.getElement().html( newElement );
             }
             highlightLinkedAreas();
             indexTranscriptionHighlighting();
+            $( ".transLoader" ).remove();
         });
 });
 
 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,
@@ -141,6 +142,9 @@ container.getElement().html( newElement );
                 rotate( myLayout.root.getItemsById("facs")[0].config.componentState.rotation );
             }
             altFacs();
+            document.getElementsByClassName("facs")[1].onload = function(){
+                $( ".facsLoader" ).remove();
+            };
         });
 });