Fixes

stefan-jung · Oct 10, 2024 · 5870900 · 5870900
1 parent a7556cd
commit 5870900
Show file tree

Hide file tree

Showing 11 changed files with 494 additions and 200 deletions.
diff --git a/Terminology_Termentry.framework b/Terminology_Termentry.framework
diff --git a/frameworks/termentry/css/termentry.css b/frameworks/termentry/css/termentry.css
@@ -31,8 +31,8 @@
     *[class~="termentry/termContextSource"],
     *[class~="termentry/partOfSpeech"],
     *[class~="topic/note"],
-    *[class~="termentry/domains"],
     *[class~="termentry/agreedWith"],
+    *[class~="termentry/concept-domains"],
     *[class~="termentry/termCommitteeMember"],
     *[class~="termentry/termNotation"],
     *[class~="termentry/antonyms"],
@@ -42,6 +42,7 @@
     *[class~="termentry/subordinateConcepts"],
     *[class~="termentry/relatedTerms"],
     *[class~="termentry/relations-linklist"],
+    *[class~="termentry/term-domains"],
     *[class~="termentry/termRelation"] {
         border-color: #767676;
     }
@@ -58,12 +59,13 @@
  * Common properties for block elements
  ******************************************************************************************/
 *[class~="termentry/annotation"],
+*[class~="termentry/concept-domains"],
 *[class~="termentry/definition"],
 *[class~="termentry/definitionSource"],
-*[class~="termentry/domains"],
 *[class~="termentry/termContext"],
 *[class~="termentry/termContextSource"],
 *[class~="termentry/termContextText"],
+*[class~="termentry/term-domains"],
 *[class~="termentry/termNotation"],
 *[class~="termentry/termSource"],
 *[class~="topic/fig"],
@@ -90,9 +92,10 @@
  ******************************************************************************************/
 *[class~="termentry/agreedWith"]:before(10),
 *[class~="termentry/annotation"]:before(10),
+*[class~="termentry/concept-domains"]:before(10),
 *[class~="termentry/definition"]:before(10),
 *[class~="termentry/definitionSource"]:before(10),
-*[class~="termentry/domains"]:before(10),
+*[class~="termentry/term-domains"]:before(10),
 *[class~="termentry/termContext"]:before(10),
 *[class~="termentry/termContextSource"]:before(10),
 *[class~="termentry/termContextText"]:before(10),
@@ -138,9 +141,10 @@
 /******************************************************************************************
  * Common properties for inline elements
  ******************************************************************************************/
-*[class~="termentry/domain"],
+*[class~="termentry/concept-domain"],
 *[class~="termentry/sourceName"],
 *[class~='termentry/sourceReference'],
+*[class~="termentry/term-domain"],
 *[class~='termentry/termCommitteeMember'],
 *[class~="termentry/termVariant"],
 *[class~="topic/fig"] > *[class~="topic/title"] {
@@ -158,9 +162,10 @@
 /******************************************************************************************
  * Common properties :before(10) for inline elements
  ******************************************************************************************/
-*[class~="termentry/domain"]:before(10),
+*[class~="termentry/concept-domain"]:before(10),
 *[class~="termentry/sourceName"]:before(10),
 *[class~='termentry/sourceReference']:before(10),
+*[class~="termentry/term-domain"]:before(10),
 *[class~='termentry/termCommitteeMember']:before(10),
 *[class~="termentry/termRelation"]:before(10),
 *[class~="termentry/termVariant"]:before(10),
@@ -226,6 +231,7 @@
             label, '${i18n(term.conceptLevel)}',
             transparent, 'true',
             fontInherit, 'true',
+            actionStyle, 'both',
             actions,
             oxy_action_list(
                 oxy_action(id, 'term.definition.add'),
@@ -235,7 +241,7 @@
                 oxy_action(id, 'term.note.add'),
                 oxy_action(id, 'term.fig.add'),
                 oxy_action(id, 'term.annotation.add'),
-                oxy_action(id, 'term.domains.add')
+                oxy_action(id, 'term.concept-domains.add')
             )
         );
 }
@@ -278,6 +284,7 @@
             label, '${i18n(term.definition)}',
             transparent, true,
             fontInherit, true,
+            actionStyle, both,
             actions,
             oxy_action_list(
                 oxy_action(id, 'term.definitionSource.add'),
@@ -670,66 +677,88 @@
 }
 
 /*********************************************
- * DOMAINS
+ * CONCEPT DOMAINS
  *********************************************/
-*[class~="termentry/domains"]:before(10) {
+*[class~="termentry/concept-domains"]:before(10) {
     content:
         oxy_buttonGroup(
-            label, '${i18n(term.domains)}',
+            label, '${i18n(term.concept-domains)}',
             transparent, 'true',
             fontInherit, 'true',
             actions,
             oxy_action_list(
-                oxy_action(id, 'term.domain.add'),
-                oxy_action(id, 'term.domains.delete')
+                oxy_action(id, 'term.concept-domain.add'),
+                oxy_action(id, 'term.concept-domains.delete')
             )
         );
 }
 
 /*********************************************
- * DOMAIN
+ * TERM DOMAINS
  *********************************************/
-*[class~="termentry/domain"]:before(10) {
+*[class~="termentry/term-domains"]:before(10) {
     content:
         oxy_buttonGroup(
-            label, '${i18n(term.domain)}',
+            label, '${i18n(term.term-domains)}',
             transparent, 'true',
             fontInherit, 'true',
             actions,
             oxy_action_list(
-                oxy_action(id, 'term.domain.add'),
-                oxy_action(id, 'term.domain.delete')
+                oxy_action(id, 'term.term-domain.add'),
+                oxy_action(id, 'term.term-domains.delete')
             )
         );
 }
-*[class~="termentry/domain"][class~="termentry/concept-domain"]:before(10) {
+
+/*********************************************
+ * CONCEPT DOMAIN
+ *********************************************/
+*[class~="termentry/concept-domain"]:before(10) {
     content:
         oxy_buttonGroup(
-            label, '${i18n(term.domain)}',
+            label, '${i18n(term.concept-domain)}',
             transparent, 'true',
             fontInherit, 'true',
             actions,
             oxy_action_list(
-                oxy_action(id, 'term.domain.add'),
-                oxy_action(id, 'term.domain.delete')
+                oxy_action(id, 'term.concept-domain.add'),
+                oxy_action(id, 'term.concept-domain.delete')
             )
         );
 }
-*[class~="termentry/domain"][class~="termentry/concept-domain"] {
+*[class~="termentry/concept-domain"] {
     content:
         oxy_popup(
             edit, '@concept-domain'
         );
     -oxy-display-tags: none;
     -oxy-show-placeholder: no !important; 
     padding-bottom: 5px;
-    /*visibility: -oxy-collapse-text;*/
 }
-*[class~="termentry/domain"][class~="termentry/term-domain"] {
+
+/*********************************************
+ * TERM DOMAIN
+ *********************************************/
+*[class~="termentry/term-domain"]:before(10) {
+    content:
+        oxy_buttonGroup(
+            label, '${i18n(term.term-domain)}',
+            transparent, 'true',
+            fontInherit, 'true',
+            actions,
+            oxy_action_list(
+                oxy_action(id, 'term.term-domain.add'),
+                oxy_action(id, 'term.term-domain.delete')
+            )
+        );
+}
+*[class~="termentry/term-domain"] {
     content:
         oxy_popup(
             edit, '@term-domain'
         );
+    -oxy-display-tags: none;
+    -oxy-show-placeholder: no !important; 
     padding-bottom: 5px;
 }
 

diff --git a/frameworks/termentry/i18n/translation.xml b/frameworks/termentry/i18n/translation.xml
@@ -151,7 +151,7 @@
         <val lang="de_DE">Definition einfügen</val>
     </key>
     <key value="term.definition.delete">
-        <val lang="en_US">Delete definitiony</val>
+        <val lang="en_US">Delete definition</val>
         <val lang="de_DE">Definition löschen</val>
     </key>
     <key value="term.definition.delete_description">
@@ -495,46 +495,90 @@
         <val lang="de_DE">Geben Sie einen alternativen Text für das Bild ein. Der Text wird angezeigt, wenn das Bild nicht dargestellt werden kann.</val>
     </key>
 
-    <!-- domains -->
-    <key value="term.domains">
-        <val lang="en_US">Domains</val>
-        <val lang="de_DE">Domänen</val>
+    <!-- concept-domains -->
+    <key value="term.concept-domains">
+        <val lang="en_US">Concept Domains</val>
+        <val lang="de_DE">Konzept-Domänen</val>
+    </key>
+    <key value="term.concept-domains.add">
+        <val lang="en_US">Add Domains</val>
+        <val lang="de_DE">Domänen einfügen</val>
+    </key>
+    <key value="term.concept-domains.add_description">
+        <val lang="en_US">Add Domains</val>
+        <val lang="de_DE">Domänen einfügen</val>
+    </key>
+    <key value="term.concept-domains.delete">
+        <val lang="en_US">Delete Domains</val>
+        <val lang="de_DE">Domänen löschen</val>
+    </key>
+    <key value="term.concept-domains.delete_description">
+        <val lang="en_US">Delete Domains</val>
+        <val lang="de_DE">Domänen löschen</val>
+    </key>
+
+    <!-- term-domains -->
+    <key value="term.term-domains">
+        <val lang="en_US">Term Domains</val>
+        <val lang="de_DE">Term-Domänen</val>
     </key>
-    <key value="term.domains.add">
+    <key value="term.term-domains.add">
         <val lang="en_US">Add Domains</val>
         <val lang="de_DE">Domänen einfügen</val>
     </key>
-    <key value="term.domains.add_description">
+    <key value="term.term-domains.add_description">
         <val lang="en_US">Add Domains</val>
         <val lang="de_DE">Domänen einfügen</val>
     </key>
-    <key value="term.domains.delete">
+    <key value="term.term-domains.delete">
         <val lang="en_US">Delete Domains</val>
         <val lang="de_DE">Domänen löschen</val>
     </key>
-    <key value="term.domains.delete_description">
+    <key value="term.term-domains.delete_description">
         <val lang="en_US">Delete Domains</val>
         <val lang="de_DE">Domänen löschen</val>
     </key>
 
-    <!-- domain -->
-    <key value="term.domain">
+    <!-- concept-domain -->
+    <key value="term.concept-domain">
+        <val lang="en_US">Domain</val>
+        <val lang="de_DE">Domäne</val>
+    </key>
+    <key value="term.concept-domain.placeholder">
+        <val lang="en_US">Specify the domain here.</val>
+        <val lang="de_DE">Geben Sie hier die Domäne an.</val>
+    </key>
+    <key value="term.concept-domain.add">
+        <val lang="en_US">Add Domain</val>
+        <val lang="de_DE">Domäne einfügen</val>
+    </key>
+    <key value="term.concept-domain.add_description">
+        <val lang="en_US">Add Domain</val>
+        <val lang="de_DE">Domäne einfügen</val>
+    </key>
+    <key value="term.concept-domain.delete">
+        <val lang="en_US">Delete Domain</val>
+        <val lang="de_DE">Domäne löschen</val>
+    </key>
+
+    <!-- term-domain -->
+    <key value="term.term-domain">
         <val lang="en_US">Domain</val>
         <val lang="de_DE">Domäne</val>
     </key>
-    <key value="term.domain.placeholder">
-        <val lang="en_US">Give a textual description of the term field.</val>
-        <val lang="de_DE">Beschreiben Sie das Fachgebiet des Begriffs.</val>
+    <key value="term.term-domain.placeholder">
+        <val lang="en_US">Specify the domain here.</val>
+        <val lang="de_DE">Geben Sie hier die Domäne an.</val>
     </key>
-    <key value="term.domain.add">
+    <key value="term.term-domain.add">
         <val lang="en_US">Add Domain</val>
         <val lang="de_DE">Domäne einfügen</val>
     </key>
-    <key value="term.domain.add_description">
+    <key value="term.term-domain.add_description">
         <val lang="en_US">Add Domain</val>
         <val lang="de_DE">Domäne einfügen</val>
     </key>
-    <key value="term.domain.delete">
+    <key value="term.term-domain.delete">
         <val lang="en_US">Delete Domain</val>
         <val lang="de_DE">Domäne löschen</val>
     </key>

diff --git a/frameworks/termentry/icons/add_12.png b/frameworks/termentry/icons/add_12.png
diff --git a/frameworks/termentry/icons/add_20.png → frameworks/termentry/icons/add_24.png b/frameworks/termentry/icons/add_20.png → frameworks/termentry/icons/add_24.png
diff --git a/frameworks/termentry/icons/delete_12.png b/frameworks/termentry/icons/delete_12.png
diff --git a/frameworks/termentry/icons/delete_20.png → frameworks/termentry/icons/delete_24.png b/frameworks/termentry/icons/delete_20.png → frameworks/termentry/icons/delete_24.png
diff --git a/frameworks/termentry/rng/termentryMod.rng b/frameworks/termentry/rng/termentryMod.rng
@@ -758,8 +758,8 @@
         </optional>
       </define>
       <define name="concept-domains.element">
-        <element name="domains" dita:longName="Domains">
-          <a:documentation>The &lt;domains> element contains at least one domain of the term.
+        <element name="concept-domains" dita:longName="Domains">
+          <a:documentation>The &lt;concept-domains> element contains at least domain of the terminology concept.
             Category: Termentry elements</a:documentation>
           <ref name="concept-domains.attlist"/>
           <ref name="concept-domains.content"/>
@@ -782,8 +782,8 @@
         </optional>
       </define>
       <define name="concept-domain.element">
-        <element name="domain" dita:longName="Domain">
-          <a:documentation>The &lt;domain> element contains the domain of the term.
+        <element name="concept-domain" dita:longName="Domain">
+          <a:documentation>The &lt;concept-domain> element represents a single domain of a terminology concept.
             Category: Termentry elements</a:documentation>
           <ref name="concept-domain.attlist"/>
           <ref name="concept-domain.content"/>
@@ -807,8 +807,8 @@
         </optional>
       </define>
       <define name="term-domains.element">
-        <element name="domains" dita:longName="Domains">
-          <a:documentation>The &lt;domains> element contains at least one domain of the term.
+        <element name="term-domains" dita:longName="Domains">
+          <a:documentation>The &lt;term-domains> element contains at least one domain of the term.
             Category: Termentry elements</a:documentation>
           <ref name="term-domains.attlist"/>
           <ref name="term-domains.content"/>
@@ -831,8 +831,8 @@
         </optional>
       </define>
       <define name="term-domain.element">
-        <element name="domain" dita:longName="Domain">
-          <a:documentation>The &lt;domain> element contains the domain of the term.
+        <element name="term-domain" dita:longName="Term Domain">
+          <a:documentation>The &lt;term-domain> element contains the domain of the term.
             Category: Termentry elements</a:documentation>
           <ref name="term-domain.attlist"/>
           <ref name="term-domain.content"/>

diff --git a/samples/beetle.dita b/samples/beetle.dita
@@ -11,9 +11,6 @@
     </definitionSource>
   </definition>
  <termBody>
-  <domains>
-   <domain concept-domain="VW"/>
-  </domains>
   <agreedWith>
    <termCommitteeMember>Martin Winterkorn</termCommitteeMember>
   </agreedWith>

diff --git a/samples/car.dita b/samples/car.dita
@@ -17,9 +17,9 @@
     <alt>By OSX (Own work) [Public domain], via Wikimedia Commons</alt>
    </image>
   </fig>
-  <domains>
-   <domain concept-domain="Car"/>
-  </domains>
+  <concept-domains>
+   <concept-domain concept-domain="marketing"/>
+  </concept-domains>
   <partOfSpeech/>
   <fullForm usage="preferred" language="en-GB">
    <termVariant xml:lang="en-GB">car</termVariant>