thdltools/Dictionary
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Made many small layout tweaks like list-style-types, etc.

Browse source
This commit is contained in:
dubtraxis 2003-10-23 22:11:50 +00:00
parent c28d29fc58
commit 81a2b8ede5
23 changed files with 248 additions and 232 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/css/lex-advanced.css
View file

@ -37,7 +37,7 @@ margin-top: 2px;
#termChildren, #defChildren, #subdefChildren
{
}
#columnLeft select, #columnLeft input
#columnLeft select, #columnLeft input, #columnRight select, #columnRight input
{
width: 120px;
}
@ -62,7 +62,7 @@ margin: 5px 5px 5px 5px;
ul.navLinks
{
list-style-type: none;
margin: 0 0 0 0 !important;
margin: 0 0 0 6px !important;
padding: 0 0 0 0;
}
ul.navLinks li
@ -103,9 +103,10 @@ margin-right: 0;
margin-bottom: 0;
}
.data img
a.meta img, .data img
{
margin-right: 2px;
vertical-align: middle;
}
.metadata

157
src/css/lex.css
View file

@ -15,77 +15,75 @@ h1
text-transform: none;
}
li, ol, ul
{
padding: 0 1em 0 1em;
margin-top: 0;
border-width: 0px;
}
li
{
border-color: green;
}
ol
{
border-color: red;
}
ul
{
border-color: blue;
}
li
{
margin-left: 1em !important;
padding: 0;
}
ol
{
list-style-type: upper-roman;
list-style-type: none;
}
ol ol
{
list-style-type: decimal;
}
#entry ol, #entry ul, #entry li
ol ol ol
{
clear: right;
margin-right: 0 !important;
padding-right: 0 !important;
}
list-style-type: lower-alpha;
}
ol ol ol ol
{
list-style-type: none;
}
#results ol
{
list-style-type: decimal;
list-style-type: decimal;
}
ol.notes
{
list-style-type: lower-roman;
}
ol ol
{
list-style-type: upper-alpha;
margin-left: 0 !important;
}
ol ol ol
{
list-style-type: decimal;
margin-left: 0 !important;
}
ol ul, ol ol ul, ol ol ol ul
ul
{
list-style-type: disc;
margin-left: 0 !important;
}
ol ul li, ol ol ul li, ol ol ol ul li
ol, ul, li
{
margin-left: 0 !important;
clear: right;
margin-right: 0 !important;
padding-right: 0 !important;
margin-left: 2px !important;
padding-left: 0 !important;
}
#results ol
{
margin-left: 30px !important;
}
li
{
margin-left: 0 !important;
}
/* #entry ol
{
border: solid 2px black;
}
#entry li ol
{
border: solid 2px yellow;
}
#entry li
{
border: solid 2px red;
} */
li li
{
margin-left: 25px !important;
/* border: solid 2px blue; */
}
div.tmw-block, h1.tmw-block, p.tmw-block
{
@ -116,6 +114,17 @@ span.tmw7 {font: 24pt TibetanMachineWeb7 !important; text-transform: none; }
span.tmw8 {font: 24pt TibetanMachineWeb8 !important; text-transform: none; }
span.tmw9 {font: 24pt TibetanMachineWeb9 !important; text-transform: none; }
h1 span.tmw {font-size: 32pt !important; }
h1 span.tmw1 {font-size: 32pt !important; }
h1 span.tmw2 {font-size: 32pt !important; }
h1 span.tmw3 {font-size: 32pt !important; }
h1 span.tmw4 {font-size: 32pt !important; }
h1 span.tmw5 {font-size: 32pt !important; }
h1 span.tmw6 {font-size: 32pt !important; }
h1 span.tmw7 {font-size: 32pt !important; }
h1 span.tmw8 {font-size: 32pt !important; }
h1 span.tmw9 {font-size: 32pt !important; }
/* The following child selectors hide this css from IE 6 and lower which can't re-position without screwing up the drawing of the fonts*/
.tmw-block>span.tmw-roman, a>span.tmw-roman
{
@ -127,51 +136,3 @@ a.tmw-link:hover
background-color: inherit;
}
/*
span.tmw-roman {position: relative; top: 0pt; padding-left: .25em;}
span.tmw {font: 24pt TibetanMachineWeb !important; text-transform: none; }
span.tmw1 {font: 24pt TibetanMachineWeb1 !important; text-transform: none; }
span.tmw2 {font: 24pt TibetanMachineWeb2 !important; text-transform: none; }
span.tmw3 {font: 24pt TibetanMachineWeb3 !important; text-transform: none; }
span.tmw4 {font: 24pt TibetanMachineWeb4 !important; text-transform: none; }
span.tmw5 {font: 24pt TibetanMachineWeb5 !important; text-transform: none; }
span.tmw6 {font: 24pt TibetanMachineWeb6 !important; text-transform: none; }
span.tmw7 {font: 24pt TibetanMachineWeb7 !important; text-transform: none; }
span.tmw8 {font: 24pt TibetanMachineWeb8 !important; text-transform: none; }
span.tmw9 {font: 24pt TibetanMachineWeb9 !important; text-transform: none; }
h1 span.tmw-roman { top: 0pt; }
h1 span.tmw {font-size: 32pt !important; top: -8pt;}
h1 span.tmw1 {font-size: 32pt !important; top: -8pt;}
h1 span.tmw2 {font-size: 32pt !important; top: -8pt;}
h1 span.tmw3 {font-size: 32pt !important; top: -8pt;}
h1 span.tmw4 {font-size: 32pt !important; top: -8pt;}
h1 span.tmw5 {font-size: 32pt !important; top: -8pt;}
h1 span.tmw6 {font-size: 32pt !important; top: -8pt;}
h1 span.tmw7 {font-size: 32pt !important; top: -8pt;}
h1 span.tmw8 {font-size: 32pt !important; top: -8pt;}
h1 span.tmw9 {font-size: 32pt !important; top: -8pt;}
p span.tmw {font-size: 20pt !important; }
p span.tmw1 {font-size: 20pt !important; }
p span.tmw2 {font-size: 20pt !important; }
p span.tmw3 {font-size: 20pt !important; }
p span.tmw4 {font-size: 20pt !important; }
p span.tmw5 {font-size: 20pt !important; }
p span.tmw6 {font-size: 20pt !important; }
p span.tmw7 {font-size: 20pt !important; }
p span.tmw8 {font-size: 20pt !important; }
p span.tmw9 {font-size: 20pt !important; }
li span.tmw {font-size: 20pt !important; }
li span.tmw1 {font-size: 20pt !important; }
li span.tmw2 {font-size: 20pt !important; }
li span.tmw3 {font-size: 20pt !important; }
li span.tmw4 {font-size: 20pt !important; }
li span.tmw5 {font-size: 20pt !important; }
li span.tmw6 {font-size: 20pt !important; }
li span.tmw7 {font-size: 20pt !important; }
li span.tmw8 {font-size: 20pt !important; }
li span.tmw9 {font-size: 20pt !important; } */

22
src/java/org/thdl/lex/DisplayHelper.java
View file

@ -314,6 +314,28 @@ public class DisplayHelper
}
/**
* Gets the hashCode attribute of the DisplayHelper object
*
* @return The hashCode value
*/
public int getHashCodeForComponent()
{
return getComponent().hashCode();
}
/**
* Gets the hashCodeForCollection attribute of the DisplayHelper object
*
* @return The hashCodeForCollection value
*/
public int getHashCodeForCollection()
{
return getCollection().hashCode();
}
/**
*Constructor for the DisplayHelper object
*/

10
src/jsp/jsp/displayDefinition.jsf
View file

@ -7,7 +7,7 @@
<!--DEFINITION LOOP-->
<c:set var="defintion" value="${ sessionScope.visit.helper.component }"/>
<p class="data">
<c:out value='<a name="${ definition }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=definition&amp;metaId=${ definition.metaId }" title="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
@ -22,13 +22,13 @@
<!--metadata-->
<jsp:include page="displayMeta.jsf" />
<!--translation-->
<c:if test="${sessionScope.visit.helper.showTranslations }">
<!--translation-->
<c:forEach var="translation" items="${ definition.translations }" >
<c:set var='href' value='#'/>
<c:if test="${ editMode }">
@ -39,13 +39,13 @@
<!--<span class="label">Definition ${translation.precedence}:</span>-->
<c:out value="${ translation.definition }" escapeXml="false" />
</span></a>
<!--metadata-->
<c:set target="${ sessionScope.visit.helper }" property="component" value="${ translation }" />
<jsp:include page="displayMeta.jsf" />
</c:forEach>
</c:if>
<!--notes-->
<jsp:include page="displayNotes.jsf" />

6
src/jsp/jsp/displayEncyclopediaArticle.jsf
View file

@ -3,7 +3,7 @@
<c:set var="encyclopediaArticle" value="${ sessionScope.visit.helper.component }"/>
<p class="data">
<c:out value='<a name="${ encyclopediaArticle }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
@ -14,11 +14,11 @@
<!--<span class="label">Encyclopedia Article:</span>-->
<c:out value="${ encyclopediaArticle.articleTitle }" escapeXml="false"/>
<!--metadata-->
<jsp:include page="displayMeta.jsf" />
<!--notes-->
<jsp:include page="displayNotes.jsf" />
</p>

38
src/jsp/jsp/displayEntry.jsp
View file

@ -10,6 +10,30 @@
</c:if>
<div id="columnRight">
<div class="highlightBox">
<form action="/lex/action" method="get">
<h2>Quick Search</h2>
<p>
<input type="hidden" name="cmd" value="find"/>
<input type="hidden" name="comp" value="term"/>
Term:
<input type="text" name="term" id="term" size="20" value=""/>
<br/>
Find:
<select name="findMode">
<option value="exact">Exact match</option>
<option value="startsWith">At beginning of term</option>
<option value="anywhere">Anywhere in term</option>
</select>
</p>
<p>
<input type="submit" value="Find Term"/>
</p>
</form>
</div>
<div id="results" class="highlightBox">
<h2> Search Results </h2>
<ol>
@ -60,29 +84,29 @@
<c:set var="ckd" value="checked='checked'"/>
</c:if>
<c:out value="<input name='showMeta' type='checkbox' value='true' ${ckd}/> credits |" escapeXml="false"/>
<c:set var="ckd" value=""/>
<c:if test="${ sessionScope.visit.helper.showNotes }">
<c:set var="ckd" value="checked='checked'"/>
</c:if>
<c:out value="<input name='showNotes' type='checkbox' value='true' ${ckd}/> analysis |" escapeXml="false"/>
<c:set var="ckd" value=""/>
<c:if test="${ sessionScope.visit.helper.showTranslations }">
<c:set var="ckd" value="checked='checked'"/>
</c:if>
<c:out value="<input name='showTranslations' type='checkbox' value='true' ${ckd}/> translations" escapeXml="false"/>
<c:if test="${ ! sessionScope.visit.user.guest }">
<c:set var="ckd" value=""/>
<c:if test="${ sessionScope.visit.helper.showEditOptions }">
<c:set var="ckd" value="checked='checked'"/>
</c:if>
<c:out value="| <input name='showEditOptions' type='checkbox' value='true' ${ckd}/> edit options" escapeXml="false"/>
</c:if>
<c:out value="<input type='hidden' name='metaId' value='${ sessionScope.visit.query.entry.metaId }'/>" escapeXml="false"/>

18
src/jsp/jsp/displayEtymology.jsf
View file

@ -7,7 +7,7 @@
<!--ETYMOLOGY-->
<c:set var="etymology" value="${ sessionScope.visit.helper.component }"/>
<p class="data">
<c:out value='<a name="${ etymology }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=etymology&amp;metaId=${etymology.metaId}" title="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
@ -17,14 +17,15 @@
</c:if>
<!--<span class="label">Etymology:</span>-->
<c:out value="${ etymology.etymologyDescription }" escapeXml="false" /> <br />
<!--<span class="label">Etymology Type:</span>-->
<c:out value="${ applicationScope.flatData.etymologyTypes[ etymology.etymologyType ] }" escapeXml="false" /> <br />
<em><c:out value="${ applicationScope.flatData.etymologyTypes[ etymology.etymologyType ] }" /></em>;
<c:if test="${ ! empty etymology.loanLanguage }">
<!--<span class="label">Loan Language:</span>-->
<c:out value="${ applicationScope.flatData.languages[ etymology.loanLanguage ] }" escapeXml="false" /> <br />
<c:out value="${ applicationScope.flatData.languages[ etymology.loanLanguage ] }" escapeXml="false" />;
</c:if>
<c:out value="${ etymology.etymologyDescription }" escapeXml="false" />
<c:if test="${ empty etymology.derivation != 'none' }">
<%-- <span class="label">Derivation</span>: --%>
@ -32,14 +33,11 @@
</span>
</c:if>
<!--metadata-->
<jsp:include page="displayMeta.jsf" />
<!--translation-->
<c:if test="${sessionScope.visit.helper.showTranslations }">
<!--translation-->
<c:set value="${etymology.translations}" target="${sessionScope.visit.helper}" property="collection"/>
<c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
<h3>Translations</h3>
@ -62,7 +60,7 @@
<c:out value="${ applicationScope.flatData.languages[ translation.loanLanguage ] }" escapeXml="false" /> <br />
<!--<span class="label">Derivation:</span>-->
<c:out value="${ translation.derivation }" escapeXml="false" />
<!--metadata-->
</span>
<c:set var="originalComponent" value="${ etymology }" />
<c:set target="${ sessionScope.visit.helper }" property="component" value="${ translation }" />
@ -74,7 +72,7 @@
</c:if>
</c:if>
<!--notes-->
<jsp:include page="displayNotes.jsf" />
</p>

6
src/jsp/jsp/displayFunction.jsf
View file

@ -9,17 +9,17 @@
<c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=grammaticalFunction&amp;metaId=${ function.metaId }" title="Edit this component"><img alt="Edit this component" src="/lex/images/edit.gif"/></a>' escapeXml="false" />
</span>
</c:if>
<c:out value='<a name="${ function }" ></a>' escapeXml="false" />
<!--<span class="label">Grammatical Function:</span>-->
<c:out value="${ applicationScope.flatData.functionsGeneral[function.function] }" escapeXml="false" />
<!--metadata-->
<jsp:include page="displayMeta.jsf" />
<!--notes-->
<jsp:include page="displayNotes.jsf" />
</p>

6
src/jsp/jsp/displayKeyword.jsf
View file

@ -6,7 +6,7 @@
<c:set var="keyword" value="${ sessionScope.visit.helper.component }"/>
<p class="data">
<c:out value='<a name="${ keyword }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=keyword&amp;metaId=${ keyword.metaId }" title="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
@ -17,12 +17,12 @@
<!--<span class="label">Keyword:</span>-->
<c:out value="${ keyword.keyword }" escapeXml="false" />
<!--metadata-->
<jsp:include page="displayMeta.jsf" />
<!--notes-->
<jsp:include page="displayNotes.jsf" />

2
src/jsp/jsp/displayMeta.jsf
View file

@ -6,7 +6,7 @@
<c:if test='${ sessionScope.visit.helper.showMeta }'>
<br/>
<%-- <br/> --%>
<c:if test='${ !( isNote || isTranslation ) }'>
<a class="meta" href="#"><img src="/lex/images/meta.gif" alt=" view metadata" />

10
src/jsp/jsp/displayModelSentence.jsf
View file

@ -6,7 +6,7 @@
<c:set var="modelSentence" value="${ sessionScope.visit.helper.component }"/>
<p class="data">
<c:out value='<a name="${ modelSentence }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=modelSentence&amp;metaId=${ modelSentence.metaId }" title="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
@ -20,13 +20,13 @@
<!--metadata-->
<jsp:include page="displayMeta.jsf" />
<!--translation-->
<c:if test="${sessionScope.visit.helper.showTranslations }">
<!--translation-->
<c:set value="${modelSentence.translations}" target="${sessionScope.visit.helper}" property="collection"/>
<c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
@ -45,7 +45,7 @@
<!--<span class="label">Model Sentence:</span>-->
<c:out value="${ translation.modelSentence }" escapeXml="false" />
</span>
<!--metadata-->
<c:set var="originalComponent" value="${ modelSentence }" />
<c:set target="${ sessionScope.visit.helper }" property="component" value="${ translation }" />
@ -57,7 +57,7 @@
</c:if>
</c:if>
<!--notes-->
<jsp:include page="displayNotes.jsf" />

5
src/jsp/jsp/displayNotes.jsf
View file

@ -1,9 +1,10 @@
<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<!--displayNotes.jsf-->
<c:if test="${ sessionScope.visit.helper.showNotes }">
<!--displayNotes.jsf-->
<c:set value="${sessionScope.visit.helper.component.analyticalNotes}" target="${sessionScope.visit.helper}" property="collection"/>
<c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
<h3>Notes</h3>
@ -13,7 +14,7 @@
<span class="analysis">
<c:out value="${ note.analyticalNote }" escapeXml="false" />
<!--metadata-->
<c:set var="parent" value="${ sessionScope.visit.helper.component }" />
<c:set target="${ sessionScope.visit.helper }" property="component" value="${ note }" />

21
src/jsp/jsp/displayPassage.jsf
View file

@ -6,7 +6,7 @@
<c:set var="passage" value="${ sessionScope.visit.helper.component }"/>
<p class="data">
<c:out value='<a name="${ passage }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=passage&amp;metaId=${ passage.metaId }" title="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
@ -36,21 +36,26 @@
<c:set target="${ sessionScope.visit.helper}" property="wylie" value="${ passage.passage }"/>
<c:catch var="exception">
<c:set var="tib" value="${ sessionScope.visit.helper.tibetan } " />
<div class="tmw-block"><c:out value="${ tib }" escapeXml="false" /></div>
<c:if test="${ ! empty tib }">
<div class="tmw-block"><c:out value="${ tib }" escapeXml="false" /></div>
</c:if>
</c:catch>
<c:if test="${ ! empty exception }">
<span class="error-info">Wylie conversion error: <c:out value="${ exception }"/></span>
<span class="error-info">Wylie conversion error (view source for details)</span>
<!-- <c:out value="${ exception }"/> -->
<!--Here was the wylie: <c:out value="${ passage.passage }" /> -->
</c:if>
<div class="tmw-block"><c:out value="${ passage.passage }" /></div>
<div><c:out value="${ passage.passage }" /></div>
<!--metadata-->
<jsp:include page="displayMeta.jsf" />
<!--translation-->
<c:if test="${sessionScope.visit.helper.showTranslations }">
<!--translation-->
<c:set value="${passage.translations}" target="${sessionScope.visit.helper}" property="collection"/>
<c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
<h3>Translations</h3>
@ -81,7 +86,7 @@
<c:out value="${ translation.passage }" />
<%-- </span> --%>
<!--metadata-->
<c:set var="originalComponent" value="${ passage }" />
<c:set target="${ sessionScope.visit.helper }" property="component" value="${ translation }" />
<jsp:include page="displayMeta.jsf" />
@ -94,7 +99,7 @@
</c:if>
</c:if>
<!--notes-->
<jsp:include page="displayNotes.jsf" />

12
src/jsp/jsp/displayPronunciation.jsf
View file

@ -7,7 +7,7 @@
<!--PRONUNCIATION-->
<c:set var="pronunciation" value="${ sessionScope.visit.helper.component }"/>
<p class="data">
<c:out value='<a name="${ pronunciation }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=pronunciation&amp;metaId=${ pronunciation.metaId }" title="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
@ -15,17 +15,17 @@
</span>
</c:if>
<!--<span class="label">Phonetic Rendering:</span>-->
<c:out value="${ pronunciation.phonetics }" escapeXml="false"/> <br />
<!--<span class="label">Type of Phonetics:</span> -->
<c:out value="${ applicationScope.flatData.phoneticsTypes[ pronunciation.phoneticsType ] }" escapeXml="false"/>
<em><c:out value="${ applicationScope.flatData.phoneticsTypes[ pronunciation.phoneticsType ] }" escapeXml="false"/></em>;
<!--<span class="label">Phonetic Rendering:</span>-->
<strong><c:out value="${ pronunciation.phonetics }" escapeXml="false"/></strong>
<!--metadata-->
<jsp:include page="displayMeta.jsf" />
<!--notes-->
<jsp:include page="displayNotes.jsf" />
</p>

6
src/jsp/jsp/displayRegister.jsf
View file

@ -6,7 +6,7 @@
<c:set var="register" value="${ sessionScope.visit.helper.component }"/>
<p class="data">
<c:out value='<a name="${ register }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=speechRegister&amp;metaId=${ register.metaId }" title="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
@ -18,11 +18,11 @@
<!--metadata-->
<jsp:include page="displayMeta.jsf" />
<!--notes-->
<jsp:include page="displayNotes.jsf" />
</p>

6
src/jsp/jsp/displayRelatedTerm.jsf
View file

@ -5,7 +5,7 @@
<c:set var="relatedTerm" value="${ sessionScope.visit.helper.component }"/>
<p class="data">
<c:out value='<a name="${ relatedTerm }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=relatedTerm&amp;metaId=${ relatedTerm.metaId }" title="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
@ -19,12 +19,12 @@
<c:out value="${ applicationScope.flatData.relatedTermTypes[relatedTerm.relatedTermType] }" escapeXml="false" />
<!--metadata-->
<jsp:include page="displayMeta.jsf" />
<!--notes-->
<jsp:include page="displayNotes.jsf" />

8
src/jsp/jsp/displaySpelling.jsf
View file

@ -10,18 +10,18 @@
</span>
</c:if>
<c:out value='<a name="${ spelling }" ></a>' escapeXml="false" />
<!--<span class="label">Spelling:</span> -->
<c:out value="${ spelling.spelling }" escapeXml="false" /> <br />
<c:out value="${ spelling.spelling }" escapeXml="false" />
<!--<span class="label">Spelling Type:</span> -->
<c:out value="${ applicationScope.flatData.spellingTypes[ spelling.spellingType ] }" escapeXml="false" />
<!--metadata-->
<jsp:include page="displayMeta.jsf" />
<!--notes-->
<jsp:include page="displayNotes.jsf" />
</p>

10
src/jsp/jsp/displaySubdefinition.jsf
View file

@ -7,7 +7,7 @@
<!--SUBDEFINITION-->
<c:set var="subdefinition" value="${ sessionScope.visit.helper.component }"/>
<p class="data">
<c:out value='<a name="${ subdefinition }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
@ -28,12 +28,12 @@
<c:out value="${ subdefinition.subdefinition }" escapeXml="false" />
<!--metadata-->
<jsp:include page="displayMeta.jsf" />
<!--translation-->
<c:if test="${sessionScope.visit.helper.showTranslations }">
<!--translation-->
<c:forEach var="translation" items="${ subdefinition.translations }">
<c:set var='href' value='#'/>
<c:if test="${ editMode }">
@ -45,13 +45,13 @@
<c:out value="${ translation.subdefinition }" escapeXml="false" />
</span>
</a>
<!--metadata-->
<c:set target="${ sessionScope.visit.helper }" property="component" value="${ translation }" />
<jsp:include page="displayMeta.jsf" />
</c:forEach>
</c:if>
<!--notes-->
<jsp:include page="displayNotes.jsf" />

11
src/jsp/jsp/displayTerm.jsf
View file

@ -15,11 +15,13 @@
<c:if test="${ ! empty exception }">
<span class="error-info">Wylie conversion error: <c:out value="${ exception }"/></span>
</c:if>
<span class="tmw-roman"><c:out value="${ sessionScope.visit.query.entry.term }" /></span>
</h1>
<p class="data" >
<c:out value='<a name="${ sessionScope.visit.query.entry }" ></a>' escapeXml="false" />
<strong><c:out value="${ sessionScope.visit.query.entry.term }" /></strong>
<c:set target="${ sessionScope.visit.helper }" property="component" value="${ sessionScope.visit.query.entry }" />
<jsp:include page="displayMeta.jsf" />
<c:if test="${ editMode }">
<span class="compEditOptions">
@ -34,11 +36,6 @@
</span>
</c:if>
<!--metadata-->
<c:set target="${ sessionScope.visit.helper }" property="component" value="${ sessionScope.visit.query.entry }" />
<jsp:include page="displayMeta.jsf" />
<!--notes-->
<jsp:include page="displayNotes.jsf" />
</p>

8
src/jsp/jsp/displayTransitionalData.jsf
View file

@ -7,7 +7,7 @@
<!--TRANSITIONAL DATA-->
<c:set var="transitionalData" value="${ sessionScope.visit.helper.component }"/>
<p class="data">
<c:out value='<a name="${ transitionalData }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
@ -21,11 +21,11 @@
<!--metadata-->
<jsp:include page="displayMeta.jsf" />
<!--notes-->
<!--notes-->
<jsp:include page="displayNotes.jsf" />
</p>

6
src/jsp/jsp/displayTranslationEquivalent.jsf
View file

@ -6,7 +6,7 @@
<c:set var="translationEquivalent" value="${ sessionScope.visit.helper.component }"/>
<p class="data">
<c:out value='<a name="${ translationEquivalent }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=translationEquivalent&amp;metaId=${ translationEquivalent.metaId }" title="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
@ -19,12 +19,12 @@
<!--metadata-->
<jsp:include page="displayMeta.jsf" />
<!--notes-->
<jsp:include page="displayNotes.jsf" />

98
src/jsp/jsp/displayTree.jsf
View file

@ -14,17 +14,17 @@
<ol> <!--TERM CHILDREN-->
<!--PRONUNCIATION-->
<c:set target="${sessionScope.visit.helper}" property="collection" value="${sessionScope.visit.query.entry.pronunciations}"/>
<c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
<!--PRONUNCIATION-->
<li>
<c:out value="<a name='${ sessionScope.visit.helper.collection }'></a>" escapeXml="false"/>
<c:out value="<a name='${ sessionScope.visit.helper.hashCodeForCollection }'></a>" escapeXml="false"/>
<h2>Pronunciations</h2>
<ul>
<c:forEach var="pronunciation" items="${ sessionScope.visit.query.entry.pronunciations }">
<c:set target="${ sessionScope.visit.helper }" property="component" value="${pronunciation}"/>
<li>
<c:out value="<a name='${ sessionScope.visit.helper.component }'></a>" escapeXml="false"/>
<c:out value="<a name='${ sessionScope.visit.helper.hashCodeForComponent }'></a>" escapeXml="false"/>
<jsp:include page="displayPronunciation.jsf" flush="false"/>
</li>
</c:forEach>
@ -32,17 +32,17 @@
</li>
</c:if>
<!--ETYMOLOGY-->
<c:set target="${sessionScope.visit.helper}" property="collection" value="${sessionScope.visit.query.entry.etymologies}"/>
<c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
<!--ETYMOLOGY-->
<li>
<c:out value="<a name='${ sessionScope.visit.helper.collection }'></a>" escapeXml="false"/>
<c:out value="<a name='${ sessionScope.visit.helper.hashCodeForCollection }'></a>" escapeXml="false"/>
<h2>Etymologies</h2>
<ul>
<c:forEach var="etymology" items="${ sessionScope.visit.query.entry.etymologies }">
<c:set target="${ sessionScope.visit.helper }" property="component" value="${etymology}"/>
<li>
<c:out value="<a name='${ sessionScope.visit.helper.component }'></a>" escapeXml="false"/>
<c:out value="<a name='${ sessionScope.visit.helper.hashCodeForComponent }'></a>" escapeXml="false"/>
<jsp:include page="displayEtymology.jsf" flush="false"/>
</li>
</c:forEach>
@ -50,17 +50,17 @@
</li>
</c:if>
<!--SPELLINGS-->
<c:set target="${sessionScope.visit.helper}" property="collection" value="${sessionScope.visit.query.entry.spellings}"/>
<c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
<!--SPELLINGS-->
<li>
<c:out value="<a name='${ sessionScope.visit.helper.collection }'></a>" escapeXml="false"/>
<c:out value="<a name='${ sessionScope.visit.helper.hashCodeForCollection }'></a>" escapeXml="false"/>
<h2>Spellings</h2>
<ul>
<c:forEach var="spelling" items="${ sessionScope.visit.query.entry.spellings }">
<c:set target="${ sessionScope.visit.helper }" property="component" value="${spelling}"/>
<li>
<c:out value="<a name='${ sessionScope.visit.helper.component }'></a>" escapeXml="false"/>
<c:out value="<a name='${ sessionScope.visit.helper.hashCodeForComponent }'></a>" escapeXml="false"/>
<jsp:include page="displaySpelling.jsf" flush="false"/>
</li>
</c:forEach>
@ -68,17 +68,17 @@
</li>
</c:if>
<!--FUNCTIONS-->
<c:set target="${sessionScope.visit.helper}" property="collection" value="${sessionScope.visit.query.entry.functions}"/>
<c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
<!--FUNCTIONS-->
<li>
<c:out value="<a name='${ sessionScope.visit.helper.collection }'></a>" escapeXml="false"/>
<c:out value="<a name='${ sessionScope.visit.helper.hashCodeForCollection }'></a>" escapeXml="false"/>
<h2>Functions</h2>
<ul>
<c:forEach var="function" items="${ sessionScope.visit.query.entry.functions }">
<c:set target="${ sessionScope.visit.helper }" property="component" value="${function}"/>
<li>
<c:out value="<a name='${ sessionScope.visit.helper.component }'></a>" escapeXml="false"/>
<c:out value="<a name='${ sessionScope.visit.helper.hashCodeForComponent }'></a>" escapeXml="false"/>
<jsp:include page="displayFunction.jsf" flush="false"/>
</li>
</c:forEach>
@ -86,17 +86,17 @@
</li>
</c:if>
<!--ENCYCLOPEDIA ARTICLES-->
<c:set target="${sessionScope.visit.helper}" property="collection" value="${sessionScope.visit.query.entry.encyclopediaArticles}"/>
<c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
<!--ENCYCLOPEDIA ARTICLES-->
<li>
<c:out value="<a name='${ sessionScope.visit.helper.collection }'></a>" escapeXml="false"/>
<c:out value="<a name='${ sessionScope.visit.helper.hashCodeForCollection }'></a>" escapeXml="false"/>
<h2>Encyclopedia Articles</h2>
<ul>
<c:forEach var="encyclopediaArticle" items="${ sessionScope.visit.query.entry.encyclopediaArticles }">
<c:set target="${ sessionScope.visit.helper }" property="component" value="${encyclopediaArticle}"/>
<li>
<c:out value="<a name='${ sessionScope.visit.helper.component }'></a>" escapeXml="false"/>
<c:out value="<a name='${ sessionScope.visit.helper.hashCodeForComponent }'></a>" escapeXml="false"/>
<jsp:include page="displayEncyclopediaArticle.jsf" flush="false"/>
</li>
</c:forEach>
@ -104,42 +104,43 @@
</li>
</c:if>
<!--DEFINITION LOOP-->
<c:set target="${sessionScope.visit.helper}" property="collection" value="${sessionScope.visit.query.entry.definitions}"/>
<c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
<li>
<c:out value="<a name='${ sessionScope.visit.helper.collection }'></a>" escapeXml="false"/>
<h2>Definitions</h2>
<c:forEach var="definition" items="${sessionScope.visit.query.entry.definitions}">
<li>
<h2>Definitions</h2>
<!--DEFINITION LOOP-->
<ol>
<c:forEach var="definition" items="${sessionScope.visit.query.entry.definitions}">
<li>
<%-- <h2><c:out value='Definition ${ definition.precedence + 1}' /></h2> --%>
<c:set target="${ sessionScope.visit.helper }" property="component" value="${definition}"/>
<c:out value="<a name='${ sessionScope.visit.helper.component }'></a>" escapeXml="false"/>
<c:out value="<a name='${ sessionScope.visit.helper.hashCodeForComponent }'></a>" escapeXml="false"/>
<jsp:include page="displayDefinition.jsf" flush="false"/>
<!--SUBDEFINITION-->
<c:set target="${sessionScope.visit.helper}" property="collection" value="${definition.subdefinitions}"/>
<c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
<!--SUBDEFINITION-->
<ol><!--subdefinition list-->
<c:forEach var="subdefinition" items="${ definition.subdefinitions }">
<c:set target="${ sessionScope.visit.helper }" property="component" value="${subdefinition}"/>
<li>
<c:out value="<a name='${ sessionScope.visit.helper.component }'></a>" escapeXml="false"/>
<c:out value="<a name='${ sessionScope.visit.helper.hashCodeForComponent }'></a>" escapeXml="false"/>
<jsp:include page="displaySubdefinition.jsf" flush="false"/>
<ol><!--subdefinition children list-->
<!--KEYWORD-->
<c:set target="${sessionScope.visit.helper}" property="collection" value="${subdefinition.keywords}"/>
<c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
<!--KEYWORD-->
<li>
<c:out value="<a name='${ sessionScope.visit.helper.collection }'></a>" escapeXml="false"/>
<c:out value="<a name='${ sessionScope.visit.helper.hashCodeForCollection }'></a>" escapeXml="false"/>
<h2>Keywords</h2>
<ul>
<c:forEach var="keyword" items="${ subdefinition.keywords }">
<c:set target="${ sessionScope.visit.helper }" property="component" value="${keyword}"/>
<li>
<c:out value="<a name='${ sessionScope.visit.helper.component }'></a>" escapeXml="false"/>
<c:out value="<a name='${ sessionScope.visit.helper.hashCodeForComponent }'></a>" escapeXml="false"/>
<jsp:include page="displayKeyword.jsf" flush="false"/>
</li>
</c:forEach>
@ -147,17 +148,17 @@
</li>
</c:if>
<!--MODEL SENTENCE-->
<c:set target="${sessionScope.visit.helper}" property="collection" value="${subdefinition.modelSentences}"/>
<c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
<!--MODEL SENTENCE-->
<li>
<c:out value="<a name='${ sessionScope.visit.helper.collection }'></a>" escapeXml="false"/>
<c:out value="<a name='${ sessionScope.visit.helper.hashCodeForCollection }'></a>" escapeXml="false"/>
<h2>Model Sentences</h2>
<ul>
<c:forEach var="modelSentence" items="${ subdefinition.modelSentences }">
<c:set target="${ sessionScope.visit.helper }" property="component" value="${modelSentence}"/>
<li>
<c:out value="<a name='${ sessionScope.visit.helper.component }'></a>" escapeXml="false"/>
<c:out value="<a name='${ sessionScope.visit.helper.hashCodeForComponent }'></a>" escapeXml="false"/>
<jsp:include page="displayModelSentence.jsf" flush="false"/>
</li>
</c:forEach>
@ -165,17 +166,17 @@
</li>
</c:if>
<!--TRANSLATION EQUIVALENT-->
<c:set target="${sessionScope.visit.helper}" property="collection" value="${subdefinition.translationEquivalents}"/>
<c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
<!--TRANSLATION EQUIVALENT-->
<li>
<c:out value="<a name='${ sessionScope.visit.helper.collection }'></a>" escapeXml="false"/>
<c:out value="<a name='${ sessionScope.visit.helper.hashCodeForCollection }'></a>" escapeXml="false"/>
<h2>Translation Equivalents</h2>
<ul>
<c:forEach var="translationEquivalent" items="${ subdefinition.translationEquivalents }">
<c:set target="${ sessionScope.visit.helper }" property="component" value="${translationEquivalent}"/>
<li>
<c:out value="<a name='${ sessionScope.visit.helper.component }'></a>" escapeXml="false"/>
<c:out value="<a name='${ sessionScope.visit.helper.hashCodeForComponent }'></a>" escapeXml="false"/>
<jsp:include page="displayTranslationEquivalent.jsf" flush="false"/>
</li>
</c:forEach>
@ -183,17 +184,17 @@
</li>
</c:if>
<!--RELATED TERM-->
<c:set target="${sessionScope.visit.helper}" property="collection" value="${subdefinition.relatedTerms}"/>
<c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
<!--RELATED TERM-->
<li>
<c:out value="<a name='${ sessionScope.visit.helper.collection }'></a>" escapeXml="false"/>
<c:out value="<a name='${ sessionScope.visit.helper.hashCodeForCollection }'></a>" escapeXml="false"/>
<h2>RelatedTerm</h2>
<ul>
<c:forEach var="relatedTerm" items="${ subdefinition.relatedTerms }">
<c:set target="${ sessionScope.visit.helper }" property="component" value="${relatedTerm}"/>
<li>
<c:out value="<a name='${ sessionScope.visit.helper.component }'></a>" escapeXml="false"/>
<c:out value="<a name='${ sessionScope.visit.helper.hashCodeForComponent }'></a>" escapeXml="false"/>
<jsp:include page="displayRelatedTerm.jsf" flush="false"/>
</li>
</c:forEach>
@ -201,17 +202,17 @@
</li>
</c:if>
<!--PASSAGE-->
<c:set target="${sessionScope.visit.helper}" property="collection" value="${subdefinition.passages}"/>
<c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
<!--PASSAGE-->
<li>
<c:out value="<a name='${ sessionScope.visit.helper.collection }'></a>" escapeXml="false"/>
<c:out value="<a name='${ sessionScope.visit.helper.hashCodeForCollection }'></a>" escapeXml="false"/>
<h2>Passages</h2>
<ul>
<c:forEach var="passage" items="${ subdefinition.passages }">
<c:set target="${ sessionScope.visit.helper }" property="component" value="${passage}"/>
<li>
<c:out value="<a name='${ sessionScope.visit.helper.component }'></a>" escapeXml="false"/>
<c:out value="<a name='${ sessionScope.visit.helper.hashCodeForComponent }'></a>" escapeXml="false"/>
<jsp:include page="displayPassage.jsf" flush="false"/>
</li>
</c:forEach>
@ -219,18 +220,18 @@
</li>
</c:if>
<!--REGISTER-->
<c:set target="${sessionScope.visit.helper}" property="collection" value="${subdefinition.registers}"/>
<c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
<!--REGISTER-->
<li>
<c:out value="<a name='${ sessionScope.visit.helper.collection }'></a>" escapeXml="false"/>
<c:out value="<a name='${ sessionScope.visit.helper.hashCodeForCollection }'></a>" escapeXml="false"/>
<h2>Registers</h2>
<ul>
<c:forEach var="register" items="${ subdefinition.registers }">
<c:set target="${ sessionScope.visit.helper }" property="component" value="${register}"/>
<li>
<c:out value="<a name='${ sessionScope.visit.helper.component }'></a>" escapeXml="false"/>
<c:out value="<a name='${ sessionScope.visit.helper.hashCodeForComponent }'></a>" escapeXml="false"/>
<jsp:include page="displayRegister.jsf" flush="false"/>
</li>
</c:forEach>
@ -245,22 +246,23 @@
</ol><!--end subdefinition list-->
</c:if>
</c:forEach><!--END DEFINITION LOOP-->
</li>
</c:forEach><!--END DEFINITION LOOP-->
</ol>
</li>
</c:if>
<!--TRANSITIONAL DATA-->
<c:set target="${sessionScope.visit.helper}" property="collection" value="${sessionScope.visit.query.entry.transitionalData}"/>
<c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
<!--TRANSITIONAL DATA-->
<li>
<c:out value="<a name='${ sessionScope.visit.helper.collection }'></a>" escapeXml="false"/>
<c:out value="<a name='${ sessionScope.visit.helper.hashCodeForCollection }'></a>" escapeXml="false"/>
<h2>Other Dictionaries</h2>
<ul>
<c:forEach var="transitionalData" items="${ sessionScope.visit.query.entry.transitionalData }">
<c:set target="${ sessionScope.visit.helper }" property="component" value="${transitionalData}"/>
<li>
<c:out value="<a name='${ sessionScope.visit.helper.component }'></a>" escapeXml="false"/>
<c:out value="<a name='${ sessionScope.visit.helper.hashCodeForComponent }'></a>" escapeXml="false"/>
<jsp:include page="displayTransitionalData.jsf" flush="false"/>
</li>
</c:forEach>

7
src/jsp/jsp/displayTreeToc.jsf
View file

@ -48,6 +48,9 @@
<!--DEFINITION LOOP-->
<c:set value="${sessionScope.visit.query.entry.definitions}" target="${sessionScope.visit.helper}" property="collection"/>
<c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
<li>
<c:out value='<a href="#${sessionScope.visit.query.entry.definitions}">Definitions</a>' escapeXml='false' />
<ol>
<c:forEach var="definition" items="${sessionScope.visit.query.entry.definitions}">
<li>
<c:out value='<a href="#${definition}">Definition ${ definition.precedence + 1}</a>' escapeXml='false' />
@ -80,7 +83,7 @@
<!--TRANSLATION EQUIVALENT-->
<c:set value="${subdefinition.translationEquivalents}" target="${sessionScope.visit.helper}" property="collection"/>
<c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
<c:out value='<li><a href="#${subdefinition.translationEquivalents}">Translation Equivalents</a></li>' escapeXml='false' />
<c:out value='<li><a href="#${subdefinition.translationEquivalents}">Translations</a></li>' escapeXml='false' />
<c:forEach var="translationEquivalent" items="${ subdefinition.translationEquivalents }"></c:forEach>
</c:if>
@ -115,6 +118,8 @@
</li>
</c:forEach><!--END DEFINITIONS-->
</ol>
</li>
</c:if>
<!--TRANSITIONAL DATA-->