Merge pull request #1456 from Princeton-CDH/bugfix/1221-delete

Annotorious upgrade, delete key fix (#1221), polygon tool (#1311)
Princeton-CDH · Sep 11, 2023 · 0a9299e · 0a9299e
2 parents 3b0685c + bcba810
commit 0a9299e
Show file tree

Hide file tree

Showing 7 changed files with 1,059 additions and 543 deletions.
diff --git a/geniza/corpus/templates/corpus/snippets/document_transcription.html b/geniza/corpus/templates/corpus/snippets/document_transcription.html
@@ -115,14 +115,18 @@
                             <h2>{{ image_info.shelfmark }} {{ image_info.label }}</h2>
                             {% if not image_info.excluded %}
                                 {% if edit_mode %}
+                                    {# popout and close button #}
                                     <button class="primary popout-close-button" type="button" aria-label="Close"><i class="ph-x"></i></button>
                                     <button class="popout-button" type="button">
                                         <svg>
                                             <use xlink:href="{% static 'img/ui/desktop/all/pop-out.svg' %}#pop-out-icon" />
                                         </svg>
                                         <span class="sr-only">Pop out</span>
                                     </button>
+                                    {# tahqiq toolbar for switching annotation tools #}
+                                    <fieldset class="tahqiq-toolbar"></fieldset>
                                 {% else %}
+                                    {# enlarge button #}
                                     <button class="enlarge-button" type="button"><span class="sr-only">Enlarge image</span></button>
                                 {% endif %}
                                 <div class="img-controls">

diff --git a/geniza/corpus/templates/corpus/snippets/transcription_instructions.html b/geniza/corpus/templates/corpus/snippets/transcription_instructions.html
@@ -3,14 +3,19 @@ <h2 dir="ltr">
     {% if edit_mode == "transcribing" %}Transcribe{% else %}Translate{% endif %}
 </h2>
 <p dir="ltr" class="instructions">
-    Hold shift and then click and drag over the image to select a rectangular
-    region for the block of text you want to transcribe (this is an annotation
-    zone).
+    When using the rectangle tool, hold shift and then click and drag over the
+    image to select a rectangular region for the block of text you want to transcribe
+    (this is an annotation zone).
 </p>
 <p dir="ltr" class="instructions">
     When an annotation zone is active on the image, use the red square in the
     thumbnail to move around the image when zoomed in.
 </p>
+<p dir="ltr" class="instructions">
+    To use the polygon tool, hold shift and click once to begin creating a polygonal
+    annotation zone. Then, release shift and click once more for each point on the
+    polygon. To complete the polygon, double-click on the final point.
+</p>
 <p dir="ltr" class="instructions">
     Drag blocks of text to reorder or move to a different image.
 </p>