More terminology updates (#1600)

* Update terminology

* Update display

* Rename expression-list to headword-list

* Rename expression-current-indicator

* Rename expression classes

* Update dictionary entry container

* Rename glossary => gloss

* Rename heading

* Rename gloss classes to gloss-content

1 files changed, 20 insertions, 20 deletions

diff --git a/ext/display-templates.html b/ext/display-templates.html
index 25beacb0..6496b73e 100644
--- a/ext/display-templates.html
+++ b/ext/display-templates.html
@@ -11,9 +11,9 @@
             <button class="action-button action-play-audio" data-icon="play-audio" title="Play audio" data-title-default="Play audio" data-hotkey='["playAudio",["title","data-title-default"],"Play audio ({0})"]' data-menu-position="left below h-cover v-cover"><div class="action-button-badge icon" hidden></div></button>
             <span class="entry-current-indicator-icon" title="Current entry"></span>
         </div>
-        <div class="expression-list"></div>
-        <div class="expression-list-details">
-            <div class="expression-list-tag-list tag-list"></div>
+        <div class="headword-list"></div>
+        <div class="headword-list-details">
+            <div class="headword-list-tag-list tag-list"></div>
             <div class="inflection-list"></div>
         </div>
     </div>
@@ -30,19 +30,19 @@
     </div>
     <div class="debug-info"><a class="debug-log-link">Log debug info to console</a></div>
 </div></template>
-<template id="expression-template" data-remove-whitespace-text="true"><div class="expression">
-    <div class="expression-text-container">
-        <span class="expression-text-outer source-text">
-            <span class="expression-current-indicator"></span>
-            <span class="expression-text"></span>
+<template id="headword-template" data-remove-whitespace-text="true"><div class="headword">
+    <div class="headword-text-container">
+        <span class="headword-term-outer source-text">
+            <span class="headword-current-indicator"></span>
+            <span class="headword-term"></span>
         </span>
-        <span class="expression-reading-outer">
-            <span class="expression-reading"></span>
+        <span class="headword-reading-outer">
+            <span class="headword-reading"></span>
         </span>
     </div>
-    <div class="expression-details">
+    <div class="headword-details">
         <button class="action-button action-play-audio" data-icon="play-audio" title="Play audio" data-title-default="Play audio" data-hotkey='["playAudio",["title","data-title-default"],"Play audio ({0})"]' data-menu-position="right below h-cover v-cover"><div class="action-button-badge icon" hidden></div></button>
-        <div class="expression-tag-list tag-list"></div>
+        <div class="headword-tag-list tag-list"></div>
     </div>
 </div></template>
 <template id="definition-item-template" data-remove-whitespace-text="true"><li class="definition-item">
@@ -51,13 +51,13 @@
         <div class="definition-item-content">
             <div class="definition-tag-list tag-list"></div>
             <div class="definition-disambiguation-list"></div>
-            <ul class="glossary-list"></ul>
+            <ul class="gloss-list"></ul>
         </div>
     </div>
 </li></template>
 <template id="definition-disambiguation-template"><span class="definition-disambiguation"></span></template>
-<template id="glossary-item-template"><li class="glossary-item click-scannable"><span class="glossary-separator"> </span><span class="glossary"></span></li></template>
-<template id="glossary-item-image-template"><li class="glossary-item click-scannable" data-has-image="true"><span class="glossary-separator"> </span><span class="glossary"><a class="glossary-image-link" target="_blank" rel="noreferrer noopener"><span class="glossary-image-container"><span class="glossary-image-aspect-ratio-sizer"></span><img class="glossary-image" alt=""><span class="glossary-image-container-overlay"></span></span><span class="glossary-image-link-text">Image</span></a> <span class="glossary-image-description"></span></span></li></template>
+<template id="gloss-item-template"><li class="gloss-item click-scannable"><span class="gloss-separator"> </span><span class="gloss-content"></span></li></template>
+<template id="gloss-item-image-template"><li class="gloss-item click-scannable" data-has-image="true"><span class="gloss-separator"> </span><span class="gloss-content"><a class="gloss-image-link" target="_blank" rel="noreferrer noopener"><span class="gloss-image-container"><span class="gloss-image-aspect-ratio-sizer"></span><img class="gloss-image" alt=""><span class="gloss-image-container-overlay"></span></span><span class="gloss-image-link-text">Image</span></a> <span class="gloss-image-description"></span></span></li></template>
 <template id="inflection-template"><span class="inflection"></span><span class="inflection-separator"> </span></template>
 
 <!-- Frequency templates -->
@@ -66,7 +66,7 @@
     <span class="tag-label"><span class="tag-label-content"></span></span>
     <span class="tag-body"><span class="tag-body-content frequency-body">
         <span class="frequency-disambiguation"><ruby>
-            <span class="frequency-disambiguation-expression"></span>
+            <span class="frequency-disambiguation-term"></span>
             <span class="frequency-disambiguation-separator"></span>
             <rt class="frequency-disambiguation-reading"></rt>
         </ruby></span>
@@ -104,7 +104,7 @@
             <span class="entry-current-indicator-icon" title="Current entry"></span>
         </div>
         <div class="kanji-glyph-container">
-            <span class="expression-current-indicator"></span>
+            <span class="headword-current-indicator"></span>
             <div class="kanji-glyph source-text"></div>
         </div>
         <div class="kanji-tag-list tag-list"></div>
@@ -116,12 +116,12 @@
     </div>
     <table class="kanji-glyph-data"><tbody>
         <tr>
-            <th>Glossary</th>
+            <th>Meaning</th>
             <th>Readings</th>
             <th>Statistics</th>
         </tr>
         <tr>
-            <td class="kanji-glossary-container"><ol class="kanji-glossary-list"></ol></td>
+            <td class="kanji-gloss-container"><ol class="kanji-gloss-list"></ol></td>
             <td class="kanji-readings"><dl class="kanji-readings-chinese"></dl><dl class="kanji-readings-japanese"></dl></td>
             <td class="kanji-statistics"></td>
         </tr>
@@ -137,7 +137,7 @@
 <template id="kanji-info-table-template"><table class="kanji-info-table"><tbody class="kanji-info-table-body"></tbody></table></template>
 <template id="kanji-info-table-item-template"><tr class="kanji-info-table-item"><th class="kanji-info-table-item-header"></th><td class="kanji-info-table-item-value"></td></tr></template>
 <template id="kanji-info-table-empty-template"><tr class="kanji-info-table-item kanji-info-table-item-empty"><td class="kanji-info-table-item-value-empty">No data found</td></tr></template>
-<template id="kanji-glossary-item-template"><li class="kanji-glossary-item"><span class="kanji-glossary"></span></li></template>
+<template id="kanji-gloss-item-template"><li class="kanji-gloss-item"><span class="kanji-gloss-content"></span></li></template>
 <template id="kanji-reading-template"><dd class="kanji-reading"></dd></template>
 
 <!-- Tag templates -->