Commit 70cd21cc authored by Mathias Goebel's avatar Mathias Goebel 🎠
Browse files

Merge branch 'release/4.7.0'

parents e506c120 baca6974
Pipeline #103119 passed with stages
in 11 minutes and 21 seconds
project.name=http://textgrid.de/exist/fontane-develop
project.version=4.6.0
project.version=4.7.0
project.abbrev=fontane
project.title=[Fontane] SADE-Project
project.processorversion=4.7.0
......
......@@ -10,7 +10,7 @@
<item label="Einführung" link=""/>
<item label="Editionsprinzipien" link=""/>
<item label="Editorische Gesamtdokumentation" link="doku.html"/>
<item label="Inhaltsverzeichnis" link=""/>
<item label="Inhaltsverzeichnis" link="inhaltsverzeichnis.html"/>
<item label="Verzeichnis der Abkürzungen" link="doku.html?id=verzeichnis_der_abkuerzungen"/>
<item label="Verzeichnis editorischer Abkürzungen" link="editorische-abkuerzungen.html"/>
<item label="Verzeichnis der Sonderzeichen" link="doku.html?id=gesamtdokumentation_verzeichnis_der_sonderzeichen"/>
......
......@@ -2260,3 +2260,7 @@ li.editorialNote li {
overflow-y: auto;
max-height: 65vh;
}
.gesamtinhaltsverzeichnis li.tocItem > .nbname {
color: lightgrey;
}
......@@ -29,8 +29,8 @@
}
#editedText .fa {
font-size: medium;
display: none;
font-size: inherit;
padding-left: 5px;
}
#editedText .fa:hover,
......@@ -48,13 +48,10 @@
background-color: #b6473d ;
background-color: rgba(182, 71, 61, 0.15);
border-radius: 5px;
-moz-transition: background-color 1000ms linear;
-o-transition: background-color 1000ms linear;
-webkit-transition: background-color 1000ms linear;
-ms-transition: background-color 1000ms linear;
transition: background-color 1000ms linear;
}
#editedText .nb-underline {
text-decoration: none;
border-bottom: 1px solid;
......@@ -71,16 +68,21 @@
margin-top: 20px;
}
#editedText .nb-block-img {
#editedText .nb-img {
width: 100%;
display: block;
margin: 10px 0 10px 0;
text-align: center;
}
#editedText .nb-caption-data {
vertical-align: top;
padding-top: 5px;
}
#editedText .nb-caption {
display: block;
font-size: smaller !important;
}
#editedText .nb-caption-la {
......@@ -101,7 +103,16 @@
content: " ";
}
#editedText .nb-verses {
padding: 25px;
}
/* fonts */
#editedText {
line-height: 1.7em;
}
#editedText body {
font-family: 'Fontine';
}
......@@ -136,6 +147,12 @@
font-size: 1em;
}
#editedText .handshift {
font-size: smaller;
font-style: italic;
margin: 10px 0 10px 0;
}
/* editorial notes */
#editedText .editorial-note {
display: none;
......@@ -155,47 +172,122 @@
text-decoration: none;
}
#optionsBtn .edited-text-options {
position: absolute;
width: 25em;
left: -999em;
float: none;
border-bottom: none;
list-style-type: none;
#optionsBtn .et-dropdown-menu {
background: #f5f5f5;
margin-top: 16px;
padding-bottom: 10px;
text-transform: uppercase;
margin-top: 15px;
margin-left: 15px;
}
#optinsBtn .edited-text-options li {
text-indent: -30px;
padding-bottom: 7px;
#optionsBtn .et-dropdown-menu .option-active {
background: #ecc9c6;
}
.edited-text-options .options-item:hover {
border-bottom: 1px solid #B6473D !important;
#editedText .icon-visible {
display: inline;
padding-left: 5px;
}
.edited-text-options .option-active:hover {
border-bottom: 1px solid #f5f5f5 !important;
#editedText .icon-invisible {
display: none;
padding-left: 0;
}
#optionsBtn:hover .edited-text-options {
left: auto;
.etNavNextInfo {
margin-right: 10px;
}
#optionsBtn:hover .edited-text-options li {
margin-top: 15px;
.etNavPrevInfo {
margin-left: 10px;
}
/* info panels */
.et-section-header #helperUnderSectionHeader {
display: none;
}
.et-section-header .helperUnderSectionHeader-active {
display: block !important;
}
#optionsBtn:hover .edited-text-options .options-item {
border-bottom: 1px solid #f5f5f5;
.et-section-header .infoView-active {
display: block !important;
}
#optionsBtn:hover .edited-text-options .option-active {
border-bottom: 1px solid #B6473D;
.et-section-header #infoViewBtn {
display: inline;
margin-right: 15px;
float:left;
max-width: 15px;
cursor: pointer;
}
/* multiphrases and fraction*/
#editedText .multiphrase,
#editedText .fraction {
display: inline-block;
position: relative;
vertical-align: middle;
letter-spacing: 0.001em;
text-align: center;
font-size: smaller;
margin-top: -5px;
margin-bottom: -5px;
}
#editedText .multiphrase .multiphrase-top,
#editedText .multiphrase .multiphrase-bottom,
#editedText .fraction .fraction-top,
#editedText .fraction .fraction-bottom{
display: block;
padding: 0.1em;
}
#editedText .multiphrase .multiphrase-bottom,
#editedText .fraction .fraction-bottom {
margin-top: -10px;
}
#editedText .fraction .fraction-bottom {
border-top: thin solid black;
}#editedText .fraction .fraction-top {
margin-bottom: 10px;
}
/* paragraph lines */
#editedText .short-paragraph-line {
width: 33%;
border-bottom: 1px black solid;
margin-top: 20px;
margin-left: 33%;
}
/* integrations */
#editedText .integration {
margin: auto;
margin-top: 20px;
margin-bottom: 20px;
}
#editedText .integration-bracket {
padding-left: 20px;
padding-right: 20px;
vertical-align: middle;
}
/* reichsthaler */
#editedText .rth {
width: 12px;
}
.icon-visible {
display: inline !important;
#editedText .rth svg {
height: 20px;
margin-top: -18px;
}
......@@ -487,6 +487,11 @@ medium{
line-height: 100%;
font-size: medium;
}
.zone > .mod {
display: none;
}
.mod .modHover {display:none;}
.mod:hover .modHover {
......@@ -504,6 +509,7 @@ medium{
}
.modHover.italic > span {
font-style: normal !important;
font-family: Fontine;
}
.modSeq1.text-decoration.underline.modSeq2 {
......@@ -773,6 +779,10 @@ svg {
.underline.double, .seg.underline > .seg.underline {
border-bottom: 3px double;
}
.underline .underline .underline {
border-bottom: 1px solid darkslategrey;
padding-bottom: 2px;
}
.underline.wavy, .Abgrenzungslinie.wavy {
border-image-repeat: repeat repeat;
border-image-slice: 12 12 12 12;
......@@ -922,6 +932,11 @@ svg {
border-image: url('https://fontane-nb.dariah.eu/public/img/underline-style:zigzag.svg') 0 0 40 0 / 0 0px 10px 0px / 0px 0px 6px 0px;
}
.zigzag_retrace {
border-bottom: 2px solid darkslategrey;
padding: 7px;
}
.underline.underline-style.half-s-shapedupper-left > .underline.underline-style.half-s-shapedupper-left {
border-image-outset: 5px 0px;
}
......@@ -937,6 +952,9 @@ svg {
.underline-medium_blue_pencil {
border-color: #42b4e6;
}
.mod.modunderline-medium_red_pencil {
text-decoration-color: red !important;
}
.underline.underline-medium_blue_pencil {
text-decoration-color: #42b4e6;
}
......@@ -1060,6 +1078,12 @@ svg {
background-size: 100% 100%;
text-decoration: none;
}
.seg.line-through .seg.line-through.brown_ink {
background-image: url('/public/img/line-through-style:double-brown_ink.svg');
background-repeat: repeat-x;
background-size: 100% 100%;
text-decoration: none;
}
.line-through.double.brown_ink {
background-image: url('/public/img/line-through-style:double-brown_ink.svg');
}
......@@ -1141,7 +1165,21 @@ svg {
transparent 75%);
text-decoration: none;
}
.line-through.triple_oblique45deg.brown_ink {
background:
linear-gradient(45deg,
transparent,
transparent calc(35% - 2px),
sienna,
transparent 35%,
transparent calc(55% - 2px),
sienna,
transparent 55%,
transparent calc(75% - 2px),
sienna,
transparent 75%);
text-decoration: none;
}
.line-through-style.double_oblique45deg::before {
border-top-color: inherit;
border-top-style: solid;
......@@ -1661,29 +1699,54 @@ svg {
.del.instant {display:inline-block;}
.restore {
text-decoration: underline dotted;
border-bottom: 1px dotted black;
}
.restore:hover .restoreHover {
display: block;
}
.gap.illegible.mm4:after {
content: 'xxxxxx';
max-width: 4mm;
.gap.illegible:after {
content: 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx';
display: inline-block;
/* position: absolute; */
overflow:hidden;
height:100%;
font-style: italic;
}
.gap.illegible.mm1:after { max-width: 1mm;}
.gap.illegible.mm10:after { max-width: 10mm;}
.gap.illegible.mm11:after { max-width: 11mm;}
.gap.illegible.mm12:after { max-width: 12mm;}
.gap.illegible.mm13:after { max-width: 13mm;}
.gap.illegible.mm14:after { max-width: 14mm;}
.gap.illegible.mm16:after { max-width: 16mm;}
.gap.illegible.mm17:after { max-width: 17mm;}
.gap.illegible.mm18:after { max-width: 18mm;}
.gap.illegible.mm19:after { max-width: 19mm;}
.gap.illegible.mm2:after { max-width: 2mm;}
.gap.illegible.mm20:after { max-width: 20mm;}
.gap.illegible.mm21:after { max-width: 21mm;}
.gap.illegible.mm22:after { max-width: 22mm;}
.gap.illegible.mm24:after { max-width: 24mm;}
.gap.illegible.mm25:after { max-width: 25mm;}
.gap.illegible.mm26:after { max-width: 26mm;}
.gap.illegible.mm28:after { max-width: 28mm;}
.gap.illegible.mm29:after { max-width: 29mm;}
.gap.illegible.mm3:after { max-width: 3mm;}
.gap.illegible.mm35:after { max-width: 35mm;}
.gap.illegible.mm38:after { max-width: 38mm;}
.gap.illegible.mm4:after { max-width: 4mm;}
.gap.illegible.mm40:after { max-width: 40mm;}
.gap.illegible.mm41:after { max-width: 41mm;}
.gap.illegible.mm42:after { max-width: 42mm;}
.gap.illegible.mm45:after { max-width: 45mm;}
.gap.illegible.mm5:after { max-width: 5mm;}
.gap.illegible.mm50:after { max-width: 50mm;}
.gap.illegible.mm6:after { max-width: 6mm;}
.gap.illegible.mm61:after { max-width: 61mm;}
.gap.illegible.mm7:after { max-width: 7mm;}
.gap.illegible.mm79:after { max-width: 79mm;}
.gap.illegible.mm9:after { max-width: 9mm;}
.gap.illegible.mm19::after {
content: 'xxxxxxxx';
display: table-cell;
font-style: italic;
max-width: 19mm;
overflow: hidden;
}
/* characters */
/* no case */
......@@ -1815,6 +1878,10 @@ hr.Schlusslinie.slightly_wavy.brown_ink {
border-top: 0 none;
border-bottom-width:3px;
}
hr.Seitenzahlabgrenzungslinie {
margin: 0;
border: 0.5px solid black;
}
.hrHover {
display: none;
......
<div data-template="templates:surround" data-template-with="/../../sade-projects/textgrid/templates/tmpl1/page_index.html" data-template-at="content-container">
<div>
<div class="section-header" style="position:fixed; z-index:100; width: 100%;">
<div class="section-header et-section-header" style="position:fixed; z-index:100; width: 100%;">
<div class="container">
<div class="row">
<!-- app:nav includes navigation buttons (arrows) in case of pagewise rendering -->
<div data-template="f-misc:pageNav"/>
<div data-template="f-misc:content"/>
<div class="col-xs-5 col-md-2">
<h1 id="tocBtn" class="animated slideInRight">
<span>
<i class="fa fa-list"/>
</span>
</h1>
<h1 id="btns" class="animated slideInRight inactive">
<span>
<i class="fa fa-plus"/>
</span>
</h1>
<h1 id="infoViewer" class="animated slideInRight inactive">
<span>
<i class="fa fa-info-circle"/>
</span>
</h1>
<h1 id="rotationBtn" class="animated slideInRight inactive">
<span>
<i class="fa fa-rotate-right"/>
</span>
</h1>
</div>
<div data-template="f-misc:editedTextContent"/>
<div data-template="f-misc:notebookNav"/>
</div>
</div>
</div>
<div class="section-header animated slideInTop" id="buttons" style="display:none; position:fixed; z-index:100; width: 100%;margin-top: 49px;">
<div class="container">
<div data-template="f-misc:buttons"/>
</div>
</div>
<div class="section-header animated slideInTop" id="infoView" style="display:none; position:fixed; z-index:100; width: 100%;margin-top: 49px;">
<div class="container">
Informationen zu Schreiberhänden/Schreibmedien und anderen Details erhalten Sie durch Bewegen der Maus über Transkription/Edierter Text.
</div>
</div>
<div id="helperUnderSectionHeader" style="height: 75px;"/>
<div id="editedText" class="row">
<div class="col-md-8 col-md-offset-2">
<div class="col-md-8 col-md-offset-2" style="margin-top: 120px;">
<div data-template="f-render:edited-text"/>
</div>
</div>
......@@ -52,5 +20,5 @@
<script>
$.getScript('js/jquery.lazyload.min.js',function(){$('.imgLazy').lazyload({});});
</script>
<script src="js/goldenconfig.js"/>
<script src="js/editedText.js"/>
</div>
<div data-template="templates:surround" data-template-with="/../../sade-projects/textgrid/templates/tmpl1/page_index.html" data-template-at="content-container">
<div class="section-header" style="position:fixed; z-index:100; width: 100%;">
<div class="container">
<div class="row">
<div id="nb-title" class="col-xs-6 col-sm-6 col-md-3">
<h1 class="animated slideInLeft">
<span>Inhaltsverzeichnis zu allen Notizbüchern</span>
</h1>
</div>
</div>
</div>
</div>
<div id="helperUnderSectionHeader" style="height: 75px;"/>
<div data-template="f-content:main"/>
</div>
// $(".index-disabled").click(function() {
// console.log("drin");
// $(this).removeClass("index-disabled").addClass("index-enabled");
// /* make icons visible */
// var indexType = $(this).attr("id");
// if(indexType == "persons") {
// $(".fa-user").addClass("icon-visible");
// $(this).text("Blende Personen aus");
// }
// else if(indexType == "place") {
// $(".fa-map-marker").addClass("icon-visible");
// $(this).text("Blende Orte aus");
// }
// else if(indexType == "event") {
// $(".fa-flag").addClass("icon-visible");
// $(this).text("Blende Ereignisse aus");
// }
// });
// $(".index-enabled").click(function() {
// console.log("drin");
// $(this).removeClass("index-enabled").addClass("index-disabled");
// /* make icons invisible */
// var indexType = $(this).attr("id");
// if(indexType == "persons") {
// $(".fa-user").removeClass("icon-visible");
// $(this).text("Zeige Personen");
// }
// else if(indexType == "place") {
// $(".fa-map-marker").removeClass("icon-visible");
// $(this).text("Zeige Orte");
// }
// else if(indexType == "event") {
// $(".fa-flag").removeClass("icon-visible");
// $(this).text("Zeige Ereignisse");
// }
// });
// This JS mainly serves for displaying index entries in the edited text.
$(document).ready(function() {
$('.options-item').click(function() {
......@@ -44,35 +6,85 @@ $(document).ready(function() {
if($(this).hasClass('option-active')) {
if(indexType == "persons") {
$(".fa-user").addClass("icon-visible");
$(this).text("Blende Personen aus");
$(".fa-user").addClass("icon-invisible");
$(this).text("Zeige Personen");
}
else if(indexType == "place") {
$(".fa-map-marker").addClass("icon-visible");
$(this).text("Blende Orte aus");
$(".fa-map-marker").addClass("icon-invisible");
$(this).text("Zeige Orte");
}
else if(indexType == "event") {
$(".fa-flag").addClass("icon-visible");
$(this).text("Blende Ereignisse aus");
$(".fa-flag").addClass("icon-invisible");
$(this).text("Zeige Ereignisse");
}
else if(indexType == "works") {
$(".fa-book").addClass("icon-invisible");
$(this).text("Zeige Werke");
}
else if(indexType == "orgs") {
$(".fa-university").addClass("icon-invisible");
$(this).text("Zeige Institutionen und Körperschaften");
}
$(this).removeClass('option-active');
}
else {
if(indexType == "persons") {
$(".fa-user").removeClass("icon-visible");
$(".fa-user").removeClass("icon-invisible");
$(this).text("Blende Personen aus");
}
else if(indexType == "place") {
$(".fa-map-marker").removeClass("icon-invisible");
$(this).text("Blende Orte aus");
}
else if(indexType == "event") {
$(".fa-flag").removeClass("icon-invisible");
$(this).text("Blende Ereignisse aus");
}
else if(indexType == "works") {
$(".fa-book").removeClass("icon-invisible");
$(this).text("Blende Werke aus");
}
else if(indexType == "orgs") {
$(".fa-university").removeClass("icon-invisible");
$(this).text("Blende Institutionen und Körperschaften aus");
}
$(this).addClass("option-active");
}