From 5c143e30674bcdd8eed29727ef21ab9e8e5ab2cf Mon Sep 17 00:00:00 2001 From: Thomas Jung Date: Tue, 28 Jun 2022 14:44:32 +0200 Subject: [PATCH 1/3] Overhaul HTML markup for entity facts results --- Resources/Private/Layouts/Default.html | 15 +- .../Private/Templates/EntityFact/Show.html | 560 +++++++++--------- 2 files changed, 281 insertions(+), 294 deletions(-) diff --git a/Resources/Private/Layouts/Default.html b/Resources/Private/Layouts/Default.html index 8060856..3d714b1 100644 --- a/Resources/Private/Layouts/Default.html +++ b/Resources/Private/Layouts/Default.html @@ -1,14 +1,7 @@ - - - +
- +
+ + diff --git a/Resources/Private/Templates/EntityFact/Show.html b/Resources/Private/Templates/EntityFact/Show.html index ab48b18..fe6e00d 100644 --- a/Resources/Private/Templates/EntityFact/Show.html +++ b/Resources/Private/Templates/EntityFact/Show.html @@ -1,318 +1,312 @@ - - + -This Template is responsible for displaying a single view for a domain object - -If you modify this template, do not forget to change the overwrite settings -in /Configuration/ExtensionBuilder/settings.yaml: - Resources: - Private: - Templates: - Show.html: keep - -Otherwise your changes will be overwritten the next time you save the extension in the extension builder + - - - - - -
-

- -

{relationship}

+

SLUB Entity Facts.

+
+ + + + + +
+ +
+ +
{relationship}
 -
- - - -
- -

- -

{viewArray.context}

-
- - - -
- -

- -

{viewArray.id}

-
- - - -
- -

- -

-
- - - -
- -

- -

- - <f:translate id='slubentityfacts.depiction' /> {viewArray.preferredName} - -

-
- - - -
-

- -

- {newRelatedPerson.preferredName} ({newRelatedPerson.relationship}) -

- -
- - - -
-

- -

{variantName}

+ + + +
+ +
+
{viewArray.context}
+ + + +
+ +
+
{viewArray.id}
+ + + +
+ +
+
+ +
+ + + +
+ +
+
+ + <f:translate id='slubentityfacts.depiction' /> {viewArray.preferredName} + +
+ + + +
+ +
+ +
+ {newRelatedPerson.preferredName} ({newRelatedPerson.relationship}) +
-
- - - -
-

- - + + + +
+ +
+ +
{variantName}
+ + + + +
+ +
+ + -

{placeOfBusinessArray}

+
{placeOfBusinessArray}
 -

{placeOfBusinessArray}

+
{placeOfBusinessArray}
 -
- - - -
-

- - + + + +
+ +
+ + -

{predecessorArray}

+
{predecessorArray}
 -

{predecessorArray}

+
{predecessorArray}
 -
- - - -
- -

- - - - - -

{isAArray}

- - -

{isAArray}

- - + + + +
+ +
+ + + + +
{isAArray}
+ + +
{isAArray}
+ + + - -
- - - -
-

- -

{dateOfEstablishment}

+ + + +
+ +
+ +
{dateOfEstablishment}
 -
- + - + - -
-

- -

{associatedPlace.preferredName}

+ +
+ +
+ +
{associatedPlace.preferredName}
 -
- - - -
-

-

{viewArray.gender.label}

-
- - - -
-

- -

{member.preferredName} ({member.relationship})

- -
- - - -
-

- -

{profession.preferredName}

- -
- - - -
-

- -

{number.preferredName}

- -
- - - -
-

- -

{number.preferredName}

- -
- - - -
-

- -

{place.preferredName}

- -
- - - -
-

- -

{place.preferredName}

- -
- - - -
-

- -

{place.preferredName}

- -
- - - -
-

-

* {viewArrayValue} ‐ - - † {viewArray.dateOfDeath} - -

-
- - - - - - -
- -

- -

{viewArray.preferredName}

-
- - - - - - -
- -

- -

{viewArrayValue}

-
- - - - - - -

-

- - - - + + + +
+ + + +
+
{viewArray.gender.label}
+ + + +
+ +
+ +
{member.preferredName} ({member.relationship})
+ + + + +
+ +
+ +
{profession.preferredName}
+ + + + +
+ +
+ +
{number.preferredName}
+ + + + +
+ +
+ +
{number.preferredName}
+ + + + +
+ +
+ +
{place.preferredName}
+ + + + +
+ +
+ +
{place.preferredName}
+ + + + +
+ +
+ +
{place.preferredName}
+ + - - -
+ +
+ + + +
+
* {viewArrayValue} ‐ + + † {viewArray.dateOfDeath} + +
+ + + + + + +
+ +
+

{viewArray.preferredName}

+ + + + + + +
+ +
+
{viewArrayValue}
+ + + + + + +
+ +
+
+ +
+ + + + + + + + -

+

+ +

    - -
  • - - - - icon of {item.collection.name}{item.collection.name} - - - {item.collection.name} - - - -
    • -     + +
  • + + + + icon of {item.collection.name}{item.collection.name} + + + {item.collection.name} + + + +
    • +
-
- - - - -
-

-

{viewArray.describedBy.atid}

-

: {viewArray.describedBy.license}

-

: {viewArray.describedBy.valid -> f:format.date(format:'d.m.Y H:m:s')}

-
- + + + + +

+ +

+
{viewArray.describedBy.atid}
+

+ {f:translate(id:'slubentityfacts.license')}: {viewArray.describedBy.license}

+

+ {f:translate(id:'slubentityfacts.timestamp')}: {viewArray.describedBy.valid -> f:format.date(format:'d.m.Y H:m:s')} +

+ + + From f2d721f20ff255497a5da7327a1869884c5a8cd2 Mon Sep 17 00:00:00 2001 From: Thomas Jung Date: Tue, 28 Jun 2022 14:50:36 +0200 Subject: [PATCH 2/3] Minor adjustments to extension CSS --- Resources/Public/Css/SlubEntityfacts.css | 30 ++++++++++-------------- 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/Resources/Public/Css/SlubEntityfacts.css b/Resources/Public/Css/SlubEntityfacts.css index 9f51776..c0514f7 100644 --- a/Resources/Public/Css/SlubEntityfacts.css +++ b/Resources/Public/Css/SlubEntityfacts.css @@ -1,31 +1,25 @@ -div.tx-slub-entityfacts div.sameAs ul { - list-style-type: none; +div.tx-slub-entityfacts ul { + list-style-type: none; } -div.tx-slub-entityfacts div.sameAs img.icon { - width: 24px; - margin: 0 10px; +div.tx-slub-entityfacts dl dd h3 { + font-size: 150%; + font-weight: bold; } -div.tx-slub-entityfacts div.sameAs span.icon { - margin: 0 22px; +div.tx-slub-entityfacts img.icon { + width: 24px; + margin: 0 10px; } -div.tx-slub-entityfacts div.preferredName p.value { - font-size: 150%; - font-weight: bold; -} - -div.tx-slub-entityfacts div.sameAs li.facts-content { - white-space: nowrap; - overflow: hidden; - width: 100%; - text-overflow: ellipsis; +div.tx-slub-entityfacts span.icon { + margin: 0 22px; } +div.tx-slub-entityfacts ul li.facts-content, div.tx-slub-entityfacts div.describedBy p.facts-content { white-space: nowrap; overflow: hidden; width: 100%; text-overflow: ellipsis; -} +} \ No newline at end of file From 007848498eea19f972229f4d6aed29b0f150face Mon Sep 17 00:00:00 2001 From: Thomas Jung Date: Tue, 28 Jun 2022 15:50:38 +0200 Subject: [PATCH 3/3] Adjustments to markup of the link listing and some random elements --- .../Private/Templates/EntityFact/Show.html | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/Resources/Private/Templates/EntityFact/Show.html b/Resources/Private/Templates/EntityFact/Show.html index fe6e00d..1266f55 100644 --- a/Resources/Private/Templates/EntityFact/Show.html +++ b/Resources/Private/Templates/EntityFact/Show.html @@ -20,21 +20,21 @@

SLUB Entity Facts.

-
+
{viewArray.context}
 -
+
{viewArray.id}
 -
+
@@ -43,10 +43,10 @@

SLUB Entity Facts.

-
+
-
+
<f:translate id='slubentityfacts.depiction' /> {viewArray.preferredName} @@ -110,7 +110,7 @@

SLUB Entity Facts.

-
+
@@ -232,21 +232,22 @@

SLUB Entity Facts.

 - - - -
+

{viewArray.preferredName}

 - - + +
+ +
+
{viewArrayValue}
+ -
+
{viewArrayValue}
@@ -274,16 +275,17 @@

SLUB Entity Facts.

-