Satzvarianten: aus Zitation raus

thesaurus-linguae-aegyptiae · Oct 11, 2023 · 4b785bc · 4b785bc
1 parent b16008f
commit 4b785bc
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 31 deletions.
diff --git a/src/main/resources/i18n/messages_de.properties b/src/main/resources/i18n/messages_de.properties
@@ -30,6 +30,7 @@ msg_hieroglyph_search=Eine <strong>Hieroglyphensuche</strong> wird in einer zuk
 msg_collocation_search=Eine Kollokationssuche <strong>mit definiertem Lemma-Abstand</strong> wird in einer zukünftigen Version der TLA-Web-Applikation hinzugefügt werden. Den Entwicklungsplan finden Sie <a href="/info/tla-development">hier</a>.
 msg_occurences_sorting=Möglichkeiten die Ergebnisliste zu <strong>sortieren</strong> werden in einer zukünftigen Version der TLA-Web-Applikation hinzugefügt werden.
 msg_sentences_page=Eine Seite mit der <strong>Sequenz von Sätzen</strong> des Textes wird aktuell für eine nächste Version der TLA-Web-Applikation programmiert. Den Entwicklungsplan finden Sie <a href="/info/tla-development">hier</a>.
+msg_pid_variant_warning=<em class="text-warning">Achtung:</em> Aus technischen Gründen können für Satzlesungsvarianten keine individuellen permanenten IDs gearantiert werden. Die Zitation erfolgt daher nur über die Basis-Satz-ID inkl. aller Varianten.
 msg_sentence_comments=In einer zukünftigen Version der TLA-Webanwendung werden auch die <strong>Referenzbereiche</strong> der Kommentare und Annotationen zu Sätzen angezeigt werden, d.h. auf welche Teile des Satzes sich der Kommentar/die Annotation jeweils bezieht. Den Entwicklungsplan finden Sie <a href="/info/tla-development">hier</a>.
 msg_sending_comments=Die Funktion Kommentare zu senden ist noch nicht implementiert.
 msg_related_with_invalid_names=Auf den Inhalt dieses Kommentars/dieser Annotation können wir aktuell noch nicht zugreifen:
@@ -594,6 +595,7 @@ sentence_latest_access=letzte Änderung
 sentence_date=Datierung
 sentence_variants1=Eine von
 sentence_variants2=Lesevarianten dieses Satzes
+sentence_variant_label=Variante
 button_copy_wordtokenID=Token ID kopieren
 button_copy_sentenceID=Satz ID kopieren
 

diff --git a/src/main/resources/i18n/messages_en.properties b/src/main/resources/i18n/messages_en.properties
@@ -30,6 +30,7 @@ msg_hieroglyph_search=<strong>Hieroglyph search</strong> yet to be implemented f
 msg_collocation_search=A collocation search <strong>with defined lemma distance</strong> yet to be implemented for a future version of the TLA web app. For the development plan, see <a href="/info/tla-development">here</a>.
 msg_occurences_sorting=Possibilities  to <strong>sort</strong> the results list will be added in a future version of the TLA web application.
 msg_sentences_page=A page that displays the <strong>sequence of sentences</strong> of the text is currently being implemented for a future release of the TLA web app. For the development plan, see <a href="/info/tla-development">here</a>.
+msg_pid_variant_warning=<em class="text-warning">Attention:</em> For technical reasons, no permanent IDs can be assigned to individual sentence reading variants. Therefore, the citation is only via the base sentence ID incl. all variants.
 msg_sentence_comments=A future release of the TLA web app will also indicate the <strong>scope</strong> of authors’ comments or annotations, i.e., which parts of the sentence a comment/annotation refers to. For the development plan, see <a href="/info/tla-development">here</a>.
 msg_sending_comments=The function of sending comments is not yet implemented.
 msg_related_with_invalid_names=We are yet unable to access the content of this comment/annotation:
@@ -596,6 +597,7 @@ sentence_latest_access=latest changes
 sentence_date=Dating (time frame)
 sentence_variants1=One of
 sentence_variants2=reading variants of this sentence
+sentence_variant_label=Variant
 button_copy_wordtokenID=Copy token ID
 button_copy_sentenceID=Copy sentence ID
 

diff --git a/src/main/resources/static/css/tla-styles.css b/src/main/resources/static/css/tla-styles.css
@@ -123,6 +123,9 @@ a:hover,
 hr {
     border-top: 2px solid #EEE;
 }
+hr.marked-hr {
+    border-top: 2px solid var(--BBAWred);
+}
 
 blockline
  {

diff --git a/src/main/resources/templates/fragments/details.html b/src/main/resources/templates/fragments/details.html
@@ -17,8 +17,9 @@ <h2 class="id ml-3 mt-sm-1">
 
     <div th:fragment="sentence-page-header" class="row mb-sm-3 d-flex justify-content-between details-header">
 		<div id="title-header">
-			<h2 class="id ml-3 mt-sm-1">
-			  <span class="words-breakable" th:text="#{object_id_label_BTSSentence} + ' ' + ${obj.id}">Sentence ID</span>
+			<h2 class="id ml-3 mt-sm-1" th:with="isVariant=${#strings.contains(obj.id,'-')}, stableId=${isVariant ? #strings.substringBefore(obj.id,'-') : obj.id}, varNo=${isVariant ? #strings.substringAfter(obj.id,'-') : ''}">
+			  <span class="words-breakable" th:text="#{object_id_label_BTSSentence} + ' ' + ${stableId}">Sentence ID</span>
+          <span th:if="${isVariant}" th:text="'('+#{sentence_variant_label}+' '+(${varNo}+1)+')'">(Var. 00)</span>
 			</h2>
 		</div>
 		<div th:replace="fragments/common :: social('sentence-page')"/>
@@ -830,6 +831,7 @@ <h2 class="id ml-3 mt-sm-1">
     <!-- Single sentence comment -->
    <div th:fragment="sentence-comment" id="sentence-comment"> 
        <i class="fas fa-comment-alt"></i>
+       <!--<span th:text="${relatedobj}"></span>-->
        <p class="ml-4" th:utext="${related.BTSComment.get(relatedobj.id).body}"/>
        <p th:replace=" :: comment-authorship"/>  
    </div>
@@ -845,7 +847,7 @@ <h2 class="id ml-3 mt-sm-1">
 				<blockquote id="full-citation">
             <th:block th:unless="${obj.eclass == 'BTSThsEntry' or obj.eclass == 'BTSLemmaEntry' or objtype == 'sentences/text' or objtype == 'sentence/token'}">
                <!-- Default citation (with author [not editor] and page label) -->
-               <span th:text="${obj.edited.author}">author</span><span th:unless="${obj.edited.contributors} == null" class="editors">, <span class="details-property-label" th:text="#{object_property_editors}">contributors</span> <span th:each="contributor, nr : ${obj.edited.contributors}" th:utext="${nr.first} ? ${contributor} : ', ' + ${contributor}"/></span>, <span  th:unless="${obj.eclass == 'BTSSentence'}" th:text="'&quot;' + ${(obj.type == 'root') ? '&radic;' : ''} + ${{'<shortlabel>'+obj.name+'</shortlabel>'}} + '&quot; ('"></span><span th:text="#{|object_id_label_${obj.eclass}|} +' '+ ${objid}"></span><span  th:unless="${obj.eclass == 'BTSSentence'}" th:text="') '"></span> <span th:text="'<' + ${env.baseUrl} + '/' + ${objtype} + '/' + ${objid} +'>,'"></span>
+               <span th:text="${obj.edited.author}">author</span><span th:unless="${obj.edited.contributors} == null" class="editors">, <span class="details-property-label" th:text="#{object_property_editors}">contributors</span> <span th:each="contributor, nr : ${obj.edited.contributors}" th:utext="${nr.first} ? ${contributor} : ', ' + ${contributor}"/></span>, <span  th:unless="${obj.eclass == 'BTSSentence'}" th:text="'&quot;' + ${{'<shortlabel>'+obj.name+'</shortlabel>'}} + '&quot; ('"></span><span th:text="#{|object_id_label_${obj.eclass}|} +' '+ ${objid}"></span><span  th:unless="${obj.eclass == 'BTSSentence'}" th:text="') '"></span> <span th:text="'<' + ${env.baseUrl} + '/' + ${objtype} + '/' + ${objid} +'>,'"></span>
             </th:block> 
             <th:block th:if="${obj.eclass == 'BTSLemmaEntry' and obj.type == 'root'}">
                <!-- Root citation -->
@@ -896,7 +898,8 @@ <h2 class="id ml-3 mt-sm-1">
      </div>  
     </div>
 
-    <!-- Persitent Lemma ID  -->
+    <!-- Persitent ID  -->
+
     <div th:fragment="property-pid(objtype, objid)" id="property-pid">
 		<hr/>
 		<p>         
@@ -913,6 +916,10 @@ <h2 class="id ml-3 mt-sm-1">
 		</p>
 	  </div>
 
+    <div th:fragment="property-pid-variant-warning" id="property-pid-variant-warning">
+		 <p th:utext="#{msg_pid_variant_warning}"/>
+	  </div>     
+
     <!-- "Atoms" -->
 
     <!-- POS/type -->

diff --git a/src/main/resources/templates/fragments/search/results.html b/src/main/resources/templates/fragments/search/results.html
@@ -201,12 +201,19 @@ <h2 class="result-list-item-element label bbaw-libertine" th:utext="${{'<shortla
 
       <!-- SENTENCE search result -->
 
-      <div th:fragment="sentence-search-result" class="result-list-item" th:object="${obj}" th:with="hasGlyphs=*{hasGlyphs},isArtificiallyAligned=*{isArtificiallyAligned}">
+      <div th:fragment="sentence-search-result" class="result-list-item mt-3" th:object="${obj}" th:with="hasGlyphs=*{hasGlyphs},isArtificiallyAligned=*{isArtificiallyAligned}">
+
+      <!-- Same for Both views -->
+     <hr class="marked-hr"/>
+
+ 		<div class="occ-list-item-element mt-2">
+	      	<div th:replace="fragments/common :: variants-info"/>
+		</div>     
 
       <!-- Block view -->
         <div class="sentence-line-mode" >
 
-          <div class="occ-list-item mt-sm-3 py-sm-1">
+          <div class="occ-list-item-element mt-sm-3 py-sm-1">
 
             <th:block th:if="${hasGlyphs}">
 			    <th:block th:if="${isArtificiallyAligned}"><a th:replace="fragments/common :: artificial-alignment"></a></th:block>
@@ -300,10 +307,6 @@ <h2 class="result-list-item-element label bbaw-libertine" th:utext="${{'<shortla
 
 		</div>
 
-		<div class="occ-list-item-element">
-	      	<div th:replace="fragments/common :: variants-info"/>
-		</div>
-
 		<div class="occ-list-item-element">
 	      	<div th:replace="fragments/common :: sentence-dating"/>
 		</div>

diff --git a/src/main/resources/templates/sentence/details.html b/src/main/resources/templates/sentence/details.html
@@ -15,37 +15,23 @@
       <div th:replace="fragments/details :: sentence-page-header"/>
 
       <div class="row" >
-        <div class="col-lg-8 content">
+        <div class="col-lg-8 content" th:with="isVariant=${#strings.contains(obj.id,'-')}, stableId=${isVariant ? #strings.substringBefore(obj.id,'-') : obj.id}, varNo=${isVariant ? #strings.substringAfter(obj.id,'-') : ''}">
           <div class= "result-list">
-				<th:block th:insert="fragments/search/results :: sentence-search-result"  th:object="${obj}"/>
+				   <th:block th:insert="fragments/search/results :: sentence-search-result"  th:object="${obj}"/>
           </div>
-          <th:block th:insert="fragments/search/results :: sentence-cotext-button"/>
+          <div th:insert="fragments/search/results :: sentence-cotext-button"/>
           <div th:replace="fragments/details :: object-property-comments"/>
           <!--<div th:replace="fragments/details :: object-property-annotations"/>-->
           <div th:replace="fragments/details :: object-property-related-objects"/>
-          <div th:replace="fragments/details :: property-pid('sentence', ${obj.id})"/>
-          <div th:replace="fragments/details :: object-property-citationBox('sentence', ${obj.id})"/>
+          <div th:replace="fragments/details :: property-pid('sentence', ${stableId})"/>
+          <div th:if="${#bools.isTrue(isVariant)}" th:include="fragments/details :: property-pid-variant-warning"/>
+          <div th:replace="fragments/details :: object-property-citationBox('sentence', ${stableId})"/>
 		</div>
-
-        <!--ALT: <div class="col-sm-12 col-lg-8 occ-list-item" id="details-content" th:object="${obj}">
-
-          <div class="mt-3 pt-1 pb-1" th:id="*{id}">
-            <div class="sentence-line-mode">
-              <div th:replace="fragments/common :: sentence-hieroglyphs"/>
-              <div th:replace="fragments/common :: sentence-transcription"/>
-            </div>
-          </div>
-
-          <div th:replace="fragments/details :: translations"/>
-          <div th:replace="fragments/details :: object-property-object-paths('sentence')"/>
-          <div th:replace="fragments/details :: editor-info"/>
-
-        </div>-->
 
         <!-- sidebar -->
         <div class="col-lg-4 sidebar">
           <div class="sticky-top m-sm-0 m-lg-4">
-            <div th:replace="fragments/search/results :: hide-properties-buttons"/><!-- Buttons werden nicht angelegt, da Var. "hideableProperties" nicht für "details" angemeldet? -->
+            <div th:replace="fragments/search/results :: hide-properties-buttons"/>
           </div>
         </div>
       </div>