From 546224709e1caa62be9c9d177e42504e2edea8a2 Mon Sep 17 00:00:00 2001 From: Marcel Schaeben Date: Mon, 19 Oct 2015 15:56:39 +0200 Subject: [PATCH] update oxygen author view for old id and trismegistos id --- css/epidoc_c.css | 17 ++++++++++++----- epidoc_c.framework | 6 ++++++ templates/epidoc_c.xml | 6 ++++++ 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/css/epidoc_c.css b/css/epidoc_c.css index aa29826..d76344e 100755 --- a/css/epidoc_c.css +++ b/css/epidoc_c.css @@ -66,8 +66,7 @@ width, height, depth, desc, note[type=topic], note[type=status] { display: block; } /* keinen Text anzeigen */ -msIdentifier idno, -altIdentifier idno, +idno, note[type=text_type], note[type=status], locus, ab[type=custody], note[type=writing_direction], objectType, width, height, depth, note[type=preparation], desc, acquisition note[type=acquisition_type], acquisition note[type=seller], acquisition note[type=selling_date], acquisition note[type=folder], @@ -262,7 +261,7 @@ msPart { } /* sourceDesc */ -msIdentifier idno { +msIdentifier > idno { margin-top: 1em; content: oxy_label(text, "Inventarnummer: ", width, 10em, text-align, right) oxy_editor(type, text, edit, "#text", columns, 30) @@ -277,9 +276,17 @@ msIdentifier collection { visibility: -oxy-collapse-text; } -altIdentifier idno { +altIdentifier[type="trismegistos"] > idno { margin-top: 1em; - content: oxy_label(text, "Alte Inventarnummer: ", width, 10em, text-align, right) + content: oxy_label(text, "Trismegistos-Nummer: ", width, 12em, text-align, right) + oxy_editor(type, text, edit, "#text", columns, 30) + " " attr("rend"); +} + + +altIdentifier[type="old"] > idno { + margin-top: 1em; + content: oxy_label(text, "Alte Inventarnummer: ", width, 12em, text-align, right) oxy_editor(type, text, edit, "#text", columns, 30) oxy_editor(type, button, actionID, insert_info_altIdentifier_idno, transparent, true, color, #FFFFFF) " " attr("rend"); diff --git a/epidoc_c.framework b/epidoc_c.framework index cca4a0b..87fb6cf 100644 --- a/epidoc_c.framework +++ b/epidoc_c.framework @@ -402,6 +402,12 @@ <msIdentifier> <idno></idno> <collection>Köln, Papyrussammlung</collection> + <altIdentifier type="trismegistos"> + <idno></idno> + </altIdentifier> + <altIdentifier type="old"> + <idno></idno> + </altIdentifier> </msIdentifier> <msContents> </msContents> diff --git a/templates/epidoc_c.xml b/templates/epidoc_c.xml index 47a878b..d76b6dc 100755 --- a/templates/epidoc_c.xml +++ b/templates/epidoc_c.xml @@ -16,6 +16,12 @@ Köln, Papyrussammlung + + + + + +