diff --git a/src/java/org/thdl/lex/component/LexComponent.hbm.xml b/src/java/org/thdl/lex/component/LexComponent.hbm.xml index 1982ecf..043158c 100644 --- a/src/java/org/thdl/lex/component/LexComponent.hbm.xml +++ b/src/java/org/thdl/lex/component/LexComponent.hbm.xml @@ -430,6 +430,7 @@ + \ No newline at end of file diff --git a/src/java/org/thdl/lex/component/child/TransitionalDataLabel.java b/src/java/org/thdl/lex/component/child/TransitionalDataLabel.java index b31570d..1c9f145 100644 --- a/src/java/org/thdl/lex/component/child/TransitionalDataLabel.java +++ b/src/java/org/thdl/lex/component/child/TransitionalDataLabel.java @@ -14,6 +14,7 @@ public class TransitionalDataLabel implements Serializable { /** nullable persistent field */ private String transitionalDataLabel; + private String transitionalDataLabelShort; private Integer priority; @@ -65,4 +66,12 @@ public class TransitionalDataLabel implements Serializable { public void setPriority(Integer priority) { this.priority = priority; } + + public String getTransitionalDataLabelShort() { + return transitionalDataLabelShort; + } + + public void setTransitionalDataLabelShort(String transitionalDataLabelShort) { + this.transitionalDataLabelShort = transitionalDataLabelShort; + } } \ No newline at end of file diff --git a/webroot/css/lex.css b/webroot/css/lex.css index 62ed059..db73b12 100644 --- a/webroot/css/lex.css +++ b/webroot/css/lex.css @@ -6,7 +6,7 @@ #main input, #main textarea, #main p, #main li { /*--------- '*' = everything -------------*/ -font-family: 'Times Ext Roman', 'Arial Unicode MS', 'Lucida Grande', sans-serif !important; +font-family: 'Arial Unicode MS', 'Lucida Grande', sans-serif !important; } h1 diff --git a/webroot/images/edit.gif b/webroot/images/edit.gif index a8e6ea7..de70f49 100644 Binary files a/webroot/images/edit.gif and b/webroot/images/edit.gif differ diff --git a/webroot/images/etym.gif b/webroot/images/etym.gif index d5ca321..cbf313d 100644 Binary files a/webroot/images/etym.gif and b/webroot/images/etym.gif differ diff --git a/webroot/images/key.gif b/webroot/images/key.gif index 17649a3..0b25a77 100644 Binary files a/webroot/images/key.gif and b/webroot/images/key.gif differ diff --git a/webroot/images/meta.gif b/webroot/images/meta.gif index cdcb3ca..af57cc0 100644 Binary files a/webroot/images/meta.gif and b/webroot/images/meta.gif differ diff --git a/webroot/images/metadata.gif b/webroot/images/metadata.gif index b4c9a8f..a382ab0 100644 Binary files a/webroot/images/metadata.gif and b/webroot/images/metadata.gif differ diff --git a/webroot/images/note.gif b/webroot/images/note.gif index b1317b6..f53067b 100644 Binary files a/webroot/images/note.gif and b/webroot/images/note.gif differ diff --git a/webroot/images/pass.gif b/webroot/images/pass.gif index 044a903..14f003b 100644 Binary files a/webroot/images/pass.gif and b/webroot/images/pass.gif differ diff --git a/webroot/images/pron.gif b/webroot/images/pron.gif index a1197c6..136ee72 100644 Binary files a/webroot/images/pron.gif and b/webroot/images/pron.gif differ diff --git a/webroot/images/reg.gif b/webroot/images/reg.gif index 03baab1..1cb90ae 100644 Binary files a/webroot/images/reg.gif and b/webroot/images/reg.gif differ diff --git a/webroot/images/sent.gif b/webroot/images/sent.gif index 126075b..e45958e 100644 Binary files a/webroot/images/sent.gif and b/webroot/images/sent.gif differ diff --git a/webroot/images/trans.gif b/webroot/images/trans.gif index 948f1fe..76d6604 100644 Binary files a/webroot/images/trans.gif and b/webroot/images/trans.gif differ diff --git a/webroot/jsp/displayTransitionalData.jsf b/webroot/jsp/displayTransitionalData.jsf index cd10f56..9dda3c8 100644 --- a/webroot/jsp/displayTransitionalData.jsf +++ b/webroot/jsp/displayTransitionalData.jsf @@ -18,7 +18,7 @@ -
+
diff --git a/webroot/jsp/displayTreeToc.jsf b/webroot/jsp/displayTreeToc.jsf index f8536d1..574af4a 100644 --- a/webroot/jsp/displayTreeToc.jsf +++ b/webroot/jsp/displayTreeToc.jsf @@ -130,12 +130,14 @@ +