Change verse/prose behaviour

evt-project · Jul 11, 2024 · 1c07397 · 1c07397
1 parent 3abf4c3
commit 1c07397
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 15 deletions.
diff --git a/src/app/app.config.ts b/src/app/app.config.ts
@@ -236,4 +236,4 @@ export interface CustomEditorialConvention {
     };
 }
 
-export type TextFlow = 'prose' | 'prose_strict' | 'verses';
+export type TextFlow = 'prose' | 'prose_mixed' | 'verses';
diff --git a/src/app/components/verse-prose-select/verse-prose-select.component.ts b/src/app/components/verse-prose-select/verse-prose-select.component.ts
@@ -12,7 +12,7 @@ export class VerseProseSelectComponent {
 
   @Output() textModeSelectionChange: EventEmitter<TextFlow> = new EventEmitter();
 
-  public textFlowTypes: TextFlow[] = ['prose_strict', 'prose', 'verses'];
+  public textFlowTypes: TextFlow[] = ['prose', 'prose_mixed', 'verses'];
 
   public selectedType: TextFlow = 'prose';
 

diff --git a/src/app/components/verse/verse.component.html b/src/app/components/verse/verse.component.html
@@ -1,6 +1,6 @@
 <span class="verse l " [evtHtmlAttributes]="data.attributes"
 	[class.display-block]="displayBlock$ | async" [class]="data.class" >
-	<span *ngIf="!plainTextFlow" class="verse-num" [class.hidden]="(displayBlock$ | async) && showNumber">{{data.n}}</span>
+	<span *ngIf="!plainTextFlow" class="verse-num" [class.verse-baloon]="baloon" [class.hidden]="(displayBlock$ | async) && showNumber">{{data.n}}</span>
 	<evt-source-note *ngIf="data.source !== null || data.analogue !== null" [data]="data"></evt-source-note>
 	<evt-content-viewer *ngFor="let el of data.content" [content]="el" [editionLevel]="editionLevel"
 		[itemsToHighlight]="itemsToHighlight" [evtHighlight]="highlightData" [textFlow]="textFlow" [withDeletions]="withDeletions" [selectedLayer]="selectedLayer">

diff --git a/src/app/components/verse/verse.component.scss b/src/app/components/verse/verse.component.scss
@@ -12,9 +12,6 @@
         height: 16px;
         color: get-color(versesColor);
         font-size: 0.7em;
-        border: 1px solid #000000b5;
-        border-radius: 8px;
-        padding-bottom: 1rem;
         &:before {
             content: '';
             width: 100%;
@@ -41,4 +38,10 @@
             }
         }
     }
+    .verse-baloon {
+        border: 1px solid #000000b5;
+        border-radius: 8px;
+        padding-bottom: 1rem;
+        padding-right: 0.1rem;
+    }
 }
diff --git a/src/app/components/verse/verse.component.ts b/src/app/components/verse/verse.component.ts
@@ -45,8 +45,12 @@ export class VerseComponent {
     return !isNaN(num) && num % this.verseNumberPrinter !== 0;
   }
 
+  get baloon() {
+    return this.textFlow !== 'verses';
+  }
+
   get plainTextFlow() {
-    return this.textFlow === 'prose_strict';
+    return this.textFlow === 'prose';
   }
 
   constructor(

diff --git a/src/assets/config/custom-styles.css b/src/assets/config/custom-styles.css
@@ -32,10 +32,6 @@
     vertical-align: text-bottom;
 }
 
-evt-verse {
-    display: block;
-}
-
 evt-page :not(evt-apparatus-entry-detail) .head {
     font-weight: bold;
     display: inline-block;

diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
@@ -51,9 +51,9 @@
     "omitted": "omitted",
     "prose": "Prose",
     "verses": "Verses",
-    "option_prose": "Prose with verse numbers",
+    "option_prose": "Prose",
+    "option_prose_mixed": "Prose with verse numbers",
     "option_verses": "Verses",
-    "option_prose_strict": "Prose",
     "page": "Page {{value}}",
     "front": "Front",
     "mainText": "Main text",

diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json
@@ -50,9 +50,9 @@
   "omitted": "omissione",
   "prose": "Prosa",
   "verses": "Versi",
-  "option_prose": "Prose with verse numbers",
+  "option_prose": "Prose",
+  "option_prose_mixed": "Prose with verse numbers",
   "option_verses": "Verses",
-  "option_prose_strict": "Prose",
   "page": "Pagina {{value}}",
   "front": "Front",
   "mainText": "Testo principale",
-Original file line number
+Diff line change
@@ Expand Up / @@ -236,4 +236,4 @@ export interface CustomEditorialConvention { @@
         };
     }
-    export type TextFlow = 'prose' | 'prose_strict' | 'verses';
+    export type TextFlow = 'prose' | 'prose_mixed' | 'verses';