fixes for steve's list
|
@ -430,6 +430,7 @@
|
||||||
<generator class="native" />
|
<generator class="native" />
|
||||||
</id>
|
</id>
|
||||||
<property name="transitionalDataLabel" type="java.lang.String" column="transitionalDataLabel" length="65535"/>
|
<property name="transitionalDataLabel" type="java.lang.String" column="transitionalDataLabel" length="65535"/>
|
||||||
|
<property name="transitionalDataLabelShort" type="java.lang.String" column="transitionalDataLabelShort" length="65535"/>
|
||||||
<property name="priority" type="java.lang.Integer" column="priority"/>
|
<property name="priority" type="java.lang.Integer" column="priority"/>
|
||||||
</class>
|
</class>
|
||||||
</hibernate-mapping>
|
</hibernate-mapping>
|
|
@ -14,6 +14,7 @@ public class TransitionalDataLabel implements Serializable {
|
||||||
|
|
||||||
/** nullable persistent field */
|
/** nullable persistent field */
|
||||||
private String transitionalDataLabel;
|
private String transitionalDataLabel;
|
||||||
|
private String transitionalDataLabelShort;
|
||||||
|
|
||||||
private Integer priority;
|
private Integer priority;
|
||||||
|
|
||||||
|
@ -65,4 +66,12 @@ public class TransitionalDataLabel implements Serializable {
|
||||||
public void setPriority(Integer priority) {
|
public void setPriority(Integer priority) {
|
||||||
this.priority = priority;
|
this.priority = priority;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getTransitionalDataLabelShort() {
|
||||||
|
return transitionalDataLabelShort;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTransitionalDataLabelShort(String transitionalDataLabelShort) {
|
||||||
|
this.transitionalDataLabelShort = transitionalDataLabelShort;
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
#main input, #main textarea, #main p, #main li
|
#main input, #main textarea, #main p, #main li
|
||||||
{ /*--------- '*' = everything -------------*/
|
{ /*--------- '*' = 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
|
h1
|
||||||
|
|
Before Width: | Height: | Size: 128 B After Width: | Height: | Size: 127 B |
Before Width: | Height: | Size: 140 B After Width: | Height: | Size: 139 B |
Before Width: | Height: | Size: 125 B After Width: | Height: | Size: 124 B |
Before Width: | Height: | Size: 140 B After Width: | Height: | Size: 139 B |
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 133 B After Width: | Height: | Size: 132 B |
Before Width: | Height: | Size: 136 B After Width: | Height: | Size: 135 B |
Before Width: | Height: | Size: 138 B After Width: | Height: | Size: 137 B |
Before Width: | Height: | Size: 115 B After Width: | Height: | Size: 113 B |
Before Width: | Height: | Size: 132 B After Width: | Height: | Size: 131 B |
Before Width: | Height: | Size: 138 B After Width: | Height: | Size: 137 B |
|
@ -18,7 +18,7 @@
|
||||||
</span>
|
</span>
|
||||||
</c:if>
|
</c:if>
|
||||||
|
|
||||||
<span><c:out value="${ transitionalData.transitionalDataLabel.transitionalDataLabel }" /></span> <c:out value="${ pronunciation.phonetics }" escapeXml="false"/> <br />
|
<span><b><c:out value="${ transitionalData.transitionalDataLabel.transitionalDataLabel }" /></b></span> <c:out value="${ pronunciation.phonetics }" escapeXml="false"/> <br />
|
||||||
<c:out value="${ transitionalData.transitionalDataText }" escapeXml="false"/>
|
<c:out value="${ transitionalData.transitionalDataText }" escapeXml="false"/>
|
||||||
|
|
||||||
<jsp:include page="displayMeta.jsf" />
|
<jsp:include page="displayMeta.jsf" />
|
||||||
|
|
|
@ -130,12 +130,14 @@
|
||||||
<c:set value="${sessionScope.visit.query.entry.transitionalData}" target="${sessionScope.visit.helper}" property="collection"/>
|
<c:set value="${sessionScope.visit.query.entry.transitionalData}" target="${sessionScope.visit.helper}" property="collection"/>
|
||||||
<c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
|
<c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
|
||||||
<c:out value='<li><a href="#${sessionScope.visit.helper.hashCodeForCollection}">Other Dictionaries</a></li>' escapeXml='false' />
|
<c:out value='<li><a href="#${sessionScope.visit.helper.hashCodeForCollection}">Other Dictionaries</a></li>' escapeXml='false' />
|
||||||
|
<ul>
|
||||||
<c:forEach var="transitionalData" items="${ sessionScope.visit.query.entry.transitionalData }">
|
<c:forEach var="transitionalData" items="${ sessionScope.visit.query.entry.transitionalData }">
|
||||||
<c:set target="${ sessionScope.visit.helper }" property="component" value="${transitionalData}"/>
|
<c:set target="${ sessionScope.visit.helper }" property="component" value="${transitionalData}"/>
|
||||||
<c:if test="${ transitionalData.forPublicConsumption == 'true' || ! sessionScope.visit.user.guest }">
|
<c:if test="${ transitionalData.forPublicConsumption == 'true' || ! sessionScope.visit.user.guest }">
|
||||||
<a href="#<c:out value="${ sessionScope.visit.helper.hashCodeForComponent }" />"><li>-- <c:out value="${ transitionalData.transitionalDataLabel.transitionalDataLabel }" /></li></a>
|
<c:out value='<li><small><a href="#${sessionScope.visit.helper.hashCodeForComponent}">${transitionalData.transitionalDataLabel.transitionalDataLabelShort}</a></small></li>' escapeXml='false' />
|
||||||
</c:if>
|
</c:if>
|
||||||
</c:forEach>
|
</c:forEach>
|
||||||
|
</ul>
|
||||||
</c:if>
|
</c:if>
|
||||||
|
|
||||||
|
|
||||||
|
|