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

Made layout changes in displayTree.jsf and CSS adjustments.

Browse source
This commit is contained in:
dubtraxis 2003-10-20 18:16:33 +00:00
parent 6e69448ab9
commit 948352a7fb
26 changed files with 481 additions and 450 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,6 +17,13 @@
{
padding: 0;
}
#helper
{
background-color: #99ccff;
border: solid 1px gray;
padding: 2px 0 2px 2px;
}
#entry
{
}
@ -25,8 +32,9 @@
{
}
#columnMain textarea
#columnCenter p
{
text-align: justify;
}
#newCompForm, #preferencesForm
@ -78,7 +86,7 @@ margin-bottom: 0;
margin-right: 2px;
}
.metadata, .translation, .analysis
.metadata
{
display: none;
margin-left: 1.5em;
@ -102,17 +110,17 @@ background-color: white;
color: #003366;
}
p.data a:link span.metadata, p.data a:link span.translation, p.data a:link span.analysis
p.data a:link span.metadata
{
display: none;
}
p.data a:visited span.metadata, p.data a:visited span.translation, p.data a:visited span.analysis
p.data a:visited span.metadata
{
display: none;
}
p.data a:hover span.metadata, p.data a:hover span.translation, p.data a:hover span.analysis
p.data a:hover span.metadata
{
text-decoration: none !important;
position: absolute;
@ -125,10 +133,10 @@ text-align:left;
display: block;
}
p.data a:hover span.translation span.metadata, p.data a:hover span.analysis span.metadata
/* p.data a:hover span.translation span.metadata, p.data a:hover span.analysis span.metadata
{
width: 300px;
}
} */
/* END OF CSS*/

237
src/css/lex-full-advanced.css
View file

@ -1,237 +0,0 @@
/* ID Selectors */
#header
{
position: absolute;
top: 80px;
left: 0px;
width: 98%;
height: 25px;
margin-top: 10px;
margin-left: 5px;
background-color: #ffffff;
color:gray;
font-size:.9em;
border-left:1px solid #000;
border-right:1px solid #000;
border-top:1px solid #000;
padding: 3px 0 0 3px;
}
#label p
{
color:white;
}
#label
{
position: absolute;
top: 115px;
left: 0px;
margin-left: 5px;
width: 98%;
height: 25px;
background-color: #666666;
color:white;
font-size:.9em;
border-left:1px solid #000;
border-right:1px solid #000;
border-top:1px solid #000;
padding: 3px 0 0 3px;
}
#message
{
position: absolute;
top: 140px;
left: 0px;
margin-left: 5px;
width: 98%;
height: 25px;
font-size:.9em;
background-color: #999999;
border-left:1px solid #000;
border-right:1px solid #000;
border-top:1px solid #000;
padding: 3px 0 0 3px;
}
#columnSingle
{
position:absolute;
top:166px;
left: 0;
margin-left: 5px;
padding-bottom:10px;
width: 98%;
background-color: white;
border:1px solid #000;
padding: 3px 0 0 3px;
}
#columnSingle #menu
{
float:right;
border-left:1px solid #000;
border-bottom:1px solid #000;
width: 230px;
background:#eee;
margin:0px 0px 10px 10px;
padding-top: 5px;
padding-bottom: 5px;
}
#columnSingle form, #columnSingle h1
{
margin:5px 5px 5px 5px;
}
#menu > form
{
border-left: 0;
border-bottom: 0;
margin-left:10px;
}
#termChildren, #defChildren, #subdefChildren
{
margin-left: 35px;
margin-right: 0;
}
#columnMain textarea
{
border: black solid 1px;
}
#debug
{
display: none;
position: absolute;
top: 0;
margin-left: 105%;
font-size:.8em;
width: 60%;
height: auto;
z-index: 4;
background-color: white;
}
#debug table
{
position:absolute;
top: 0px;
left: 0px;
width: 100%;
border: black solid 2px;
color: black;
background-color: cyan;
margin: 0 0 15px 0;}
#debug th, #debug td
{
border-collapse: collapse;
border-spacing: 0;
background-color: cyan;
font-size: .9em;
text-align: left;
vertical-align: top;
margin: 0;
}
#debug h3
{
background-color: #99ccff;
}
#backButton
{
float:right;
margin-right: 25px;
margin-top: 25px;
}
#newCompForm, #preferencesForm
{
background-color: #99ccff;
border: black solid 1px;
margin: 8px 8px 8px 8px !important;
}
#newCompForm input, select, textarea
{
margin: 5px 5px 5px 5px;
}
/* Class Selectors.*/
.label
{
font-weight: bold;
}
.compEditOptions
{
padding: 0;
}
.data
{
border-top: 1px solid silver;
padding-top: 6px;
margin-left: 0;
margin-right: 0;
margin-top: 0;
margin-bottom: 0;
}
#columnSingle > p.data
{
margin-left: 3px;
}
.data img
{
margin-right: 2px;
}
.metadata, .translation, .analysis
{
display: block;
/* font-size: .75em; */
margin-left: 1.5em;
/* margin-top: .5em; */
color: black;
}
.data input
{
font-size: .9em;
padding: 0px;
}
/* CSS Rollovers */
p.data a:hover
{
/*
Don't Remove bgcolor and color or rollover will not work on IE Windows
These CSS Rollovers do not work on IE Mac. but they do work on Mozilla Mac
*/
text-decoration: none;
background-color: white;
/* color: #003366; */
}
p.data img
{
display: none;
}
.translation, .analysis
{
color: black;
}
/* TEMP WORK/TESTING AREA */
/* END OF CSS*/

11
src/css/lex-full.css
View file

@ -1,11 +0,0 @@
@import url( "http://iris.lib.virginia.edu/tibet/style/thdl-styles.css" );
@import url( "lex-full-advanced.css" );
/* Element Selectors */
#main *
{ /*--------- '*' = everything -------------*/
font-family: 'Arial Unicode MS', 'TITUS Cyberbit Basic', 'Lucida Grande', sans-serif !important;
}

71
src/css/lex.css
View file

@ -9,3 +9,74 @@
font-family: 'Arial Unicode MS', 'Lucida Grande', sans-serif !important;
}
h1
{
font-size: 1.5em;
}
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;
}
#results ol
{
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
{
list-style-type: disc;
margin-left: 0 !important;
}
ol ul li, ol ol ul li, ol ol ol ul li
{
margin-left: 0 !important;
padding-left: 0 !important;
}

1
src/java/org/thdl/lex/LexActionServlet.java
View file

@ -106,6 +106,7 @@ public class LexActionServlet extends HttpServlet
*/
public void service( HttpServletRequest req, HttpServletResponse res ) throws ServletException, IOException
{
res.setContentType( "text/html; charset=UTF-8" );
/*
LexLogger.debug( "Checking Request state at start of LexActionServlet.service()" );
LexLogger.logRequestState( req );

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

@ -1,12 +1,13 @@
<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<!--displayTree.jsf-->
<!--DEFINITION LOOP-->
<c:set var="defintion" value="${ sessionScope.helper.component }"/>
<p class="data">
<c:out value='<a name="${ definition.label }" ></a>' escapeXml="false" />
<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 }" label="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
@ -22,7 +23,7 @@
<!--metadata-->
<c:set target="${ sessionScope.helper }" property="component" value="${definition}" />
<jsp:include page="displayMeta.jsf" />

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

@ -1,14 +1,9 @@
<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<!--displayTree.jsf-->
<!--ENCYCLOPEDIA ARTICLES-->
<c:forEach var="encyclopediaArticle" items="${ query.entry.encyclopediaArticles }">
<c:set var="encyclopediaArticle" value="${ sessionScope.helper.component }"/>
<p class="data">
<c:out value='<a name="${ encyclopediaArticle.label }" ></a>' escapeXml="false" />
<c:out value='<a name="${ encyclopediaArticle }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
@ -19,17 +14,12 @@
<!--<span class="label">Encyclopedia Article:</span>-->
<c:out value="${ encyclopediaArticle.articleTitle }" escapeXml="false"/> <br />
<!--metadata-->
<c:set target="${ sessionScope.helper }" property="component" value="${encyclopediaArticle}" />
<jsp:include page="displayMeta.jsf" />
<jsp:include page="displayMeta.jsf" />
<!--notes-->
<jsp:include page="displayNotes.jsf" />
</p>
</c:forEach><!--END ENCYCLOPEDIA ARTICLES-->

15
src/jsp/jsp/displayEntry.jsp
View file

@ -1,4 +1,4 @@
<%@ page buffer="512kb" autoFlush="false" import="org.thdl.lex.*,org.thdl.lex.component.*" errorPage="/jsp/error.jsp" %>
<%@ page buffer="512kb" autoFlush="false" import="org.thdl.lex.*,org.thdl.lex.component.*" errorPage="/jsp/error.jsp" contentType="text/html; charset=UTF-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<jsp:include page="header.jsf" flush="false" />
@ -8,7 +8,7 @@
<c:if test="${ ! sessionScope.user.guest && sessionScope.helper.showEditOptions }">
<c:set var="editMode" value="${ true }" scope="request"/>
</c:if>
<%--
<c:set var="showNotes" value="${ false }" scope="request" />
<c:if test="${ sessionScope.helper.showNotes }">
<c:set var="showNotes" value="${ true }" scope="request"/>
@ -22,9 +22,9 @@
<c:set var="showTranslations" value="${ false }" scope="request" />
<c:if test="${ sessionScope.helper.showTranslations }">
<c:set var="showTranslations" value="${ true }" scope="request"/>
</c:if>
</c:if> --%>
<div id="columnLeft">
<div id="columnRight">
<div id="results" class="highlightBox">
<h2> Search Results </h2>
<ol>
@ -40,13 +40,18 @@
</ol>
</div><!--END MENU-->
</div>
<div id="columnLeft">
<div id="toc" class="highlightBox">
<jsp:include page="displayTreeToc.jsf"/>
</div><!--END TOC-->
</div><!--END COLUMN LEFT-->
<div id="columnMain">
<div id="columnCenter">
<p id="navLinks"><jsp:include page="navLinks.jsf" /></p>
<p id="message">

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

@ -1,13 +1,13 @@
<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<!--displayTree.jsf-->
<!--ETYMOLOGY-->
<c:forEach var="etymology" items="${ query.entry.etymologies }">
<c:set var="etymology" value="${ sessionScope.helper.component }"/>
<p class="data">
<c:out value='<a name="${ etymology.label }" ></a>' escapeXml="false" />
<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}" label="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
@ -20,26 +20,39 @@
<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 />
<c:if test="${ ! empty etymology.loanLanguage }">
<!--<span class="label">Loan Language:</span>-->
<c:out value="${ applicationScope.flatData.languages[ etymology.loanLanguage ] }" escapeXml="false" /> <br />
<!--<span class="label">Derivation:</span>-->
</c:if>
<c:if test="${ empty etymology.derivation != 'none' }">
<%-- <span class="label">Derivation</span>: --%>
<c:out value="${ etymology.derivation }" escapeXml="false" /> <br />
</span>
</a>
</c:if>
<!--metadata-->
<c:set target="${ sessionScope.helper }" property="component" value="${etymology}" />
<jsp:include page="displayMeta.jsf" />
<!--translation-->
<c:if test="${sessionScope.helper.showTranslations }">
<c:set value="${etymology.translations}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<h3>Translations</h3>
<ul>
<c:forEach var="translation" items="${ etymology.translations }" >
<c:set var='href' value='#'/>
<li>
<%-- <c:set var='href' value='#'/>
<c:if test="${ editMode }">
<c:set var='href' value='/lex/action?cmd=getUpdateForm&amp;comp=etymology&amp;metaId=${ translation.metaId }' />
</c:if>
<c:out value='<a class="meta" href="${href} ">'escapeXml="false" /><img src="/lex/images/trans.gif" alt="view/edit translation" />
<c:out value='<a class="meta" href="${href} ">'escapeXml="false" /><img src="/lex/images/trans.gif" alt="view/edit translation" />--%>
<span class="translation">
<!--<span class="label">Etymology:</span>-->
<c:out value="${ translation.etymologyDescription }" escapeXml="false" /> <br />
@ -50,16 +63,19 @@
<!--<span class="label">Derivation:</span>-->
<c:out value="${ translation.derivation }" escapeXml="false" /> <br />
<!--metadata-->
</span></a>
</span>
<c:set var="originalComponent" value="${ etymology }" />
<c:set target="${ sessionScope.helper }" property="component" value="${ translation }" />
<jsp:include page="displayMeta.jsf" />
<c:set target="${ sessionScope.helper }" property="component" value="${ originalComponent }" />
</li>
</c:forEach>
</ul>
</c:if>
</c:if>
<!--notes-->
<jsp:include page="displayNotes.jsf" />
</p>
</c:forEach>
<!--END ETYMOLOGY-->

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

@ -1,11 +1,7 @@
<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<!--displayTree.jsf-->
<!--FUNCTIONS-->
<c:forEach var="function" items="${ query.entry.functions }">
<c:set var="function" value="${ sessionScope.helper.component }"/>
<p class="data">
<c:if test="${ editMode }">
<span class="compEditOptions">
@ -13,13 +9,13 @@
<c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=grammaticalFunction&amp;metaId=${ function.metaId }" label="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.label }" ></a>' escapeXml="false" />
<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" /> <br />
<!--metadata-->
<c:set target="${ sessionScope.helper }" property="component" value="${function}" />
<jsp:include page="displayMeta.jsf" />
@ -27,6 +23,5 @@
<jsp:include page="displayNotes.jsf" />
</p>
</c:forEach><!--END FUNCTIONS-->

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

@ -1,11 +1,12 @@
<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<!--displayTree.jsf-->
<c:set var="keyword" value="${ sessionScope.helper.component }"/>
<p class="data">
<c:out value='<a name="${ keyword.label }" ></a>' escapeXml="false" />
<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 }" label="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
@ -18,7 +19,7 @@
<br />
<!--metadata-->
<c:set target="${ sessionScope.helper }" property="component" value="${keyword}" />
<jsp:include page="displayMeta.jsf" />

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

@ -1,11 +1,12 @@
<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<!--displayTree.jsf-->
<c:set var="modelSentence" value="${ sessionScope.helper.component }"/>
<p class="data">
<c:out value='<a name="${ modelSentence.label }" ></a>' escapeXml="false" />
<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 }" label="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
@ -20,26 +21,40 @@
<!--metadata-->
<c:set target="${ sessionScope.helper }" property="component" value="${modelSentence}" />
<jsp:include page="displayMeta.jsf" />
<!--translation-->
<c:if test="${sessionScope.helper.showTranslations }">
<c:set value="${modelSentence.translations}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<h3>Translations</h3>
<ul>
<c:forEach var="translation" items="${ modelSentence.translations }" >
<li>
<%--
<c:set var='href' value='#'/>
<c:if test="${ editMode }">
<c:set var='href' value='/lex/action?cmd=getUpdateForm&amp;comp=modelSentence&amp;metaId=${ translation.metaId }' />
</c:if>
<c:out value='<a class="meta" href="${href} ">'escapeXml="false" /><img src="/lex/images/trans.gif" alt="view/edit translation" />
<c:out value='<a class="meta" href="${href} ">'escapeXml="false" /><img src="/lex/images/trans.gif" alt="view/edit translation" /> --%>
<span class="translation">
<!--<span class="label">Model Sentence:</span>-->
<c:out value="${ translation.modelSentence }" escapeXml="false" /> <br />
</span> </a>
</span>
<!--metadata-->
<c:set var="originalComponent" value="${ modelSentence }" />
<c:set target="${ sessionScope.helper }" property="component" value="${ translation }" />
<jsp:include page="displayMeta.jsf" />
<c:set target="${ sessionScope.helper }" property="component" value="${ originalComponent }" />
</li>
</c:forEach>
</ul>
</c:if>
</c:if>
<!--notes-->

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

@ -3,8 +3,13 @@
<!--displayNotes.jsf-->
<c:if test="${ sessionScope.helper.showNotes }">
<c:set value="${sessionScope.helper.component.analyticalNotes}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<h3>Notes</h3>
<ol class="notes">
<c:forEach var="note" items="${ sessionScope.helper.component.analyticalNotes }">
<a class="meta" href="#"><img src="/lex/images/note.gif" alt="analysis" />
<li>
<span class="analysis">
<c:out value="${ note.analyticalNote }" escapeXml="false" /><br />
@ -17,6 +22,9 @@
<c:set target="${ sessionScope.helper }" property="component" value="${ parent }" />
</span>
</a>
</li>
</c:forEach>
</ol>
</c:if>
</c:if>

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

@ -1,11 +1,12 @@
<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<!--displayTree.jsf-->
<c:set var="passage" value="${ sessionScope.helper.component }"/>
<p class="data">
<c:out value='<a name="${ passage.label }" ></a>' escapeXml="false" />
<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 }" label="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
@ -14,43 +15,75 @@
</span>
</c:if>
<c:set var="source" value="${ LexFlatDataRepository.literarySources[ passage.literarySource ] }"/>
<c:if test="${ ! empty source }">
<!--<span class="label">Literary Source:</span>-->
<c:out value="${ passage.literarySource }" escapeXml="false" /> <br />
<!--<span class="label">Spelling:</span>-->
<c:out value="${ source }" escapeXml="false" /> <br />
</c:if>
<c:if test="${ ! empty passage.spelling }">
<span class="label">Spelling:</span>
<c:out value="${ passage.spelling }" escapeXml="false" /> <br />
<!--<span class="label">Pagination:</span> -->
<c:out value="${ passage.pagination }" escapeXml="false" /> <br />
</c:if>
<c:if test="${ ! empty passage.pagination && ! passage.pagination == ' ' }">
<span class="label">Pagination:</span>
'<c:out value="${ passage.pagination }" escapeXml="false" />' <br />
</c:if>
<!--<span class="label">Passage:</span>-->
<c:out value="${ passage.passage }" escapeXml="false" /> <br />
<!--metadata-->
<c:set target="${ sessionScope.helper }" property="component" value="${passage}" />
<jsp:include page="displayMeta.jsf" />
<!--translation-->
<c:if test="${sessionScope.helper.showTranslations }">
<c:set value="${passage.translations}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<h3>Translations</h3>
<ul>
<c:forEach var="translation" items="${ passage.translations }" >
<c:set var='href' value='#'/>
<li>
<%-- <c:set var='href' value='#'/>
<c:if test="${ editMode }">
<c:set var='href' value='/lex/action?cmd=getUpdateForm&amp;comp=passage&amp;metaId=${ translation.metaId }' />
</c:if>
<c:out value='<a class="meta" href="${href} ">'escapeXml="false" /><img src="/lex/images/trans.gif" alt="view/edit translation" />
<span class="translation">
</c:if> --%>
<%-- <span class="translation"> --%>
<c:set var="source" value="${ LexFlatDataRepository.literarySources[ translation.literarySource ] }"/>
<c:if test="${ ! empty source }">
<!--<span class="label">Literary Source:</span>-->
<c:out value="${ translation.literarySource }" escapeXml="false" /> <br />
<!--<span class="label">Spelling:</span>-->
<c:out value="${ translation.spelling }" escapeXml="false" /> <br />
<!--<span class="label">Pagination:</span>-->
<c:out value="${ translation.pagination }" escapeXml="false" /> <br />
<!--<span class="label">Passage:</span>-->
<c:out value="${ translation.passage }" escapeXml="false" /> <br />
</span></a>
<c:out value="${ source }" /> <br />
</c:if>
<c:if test="${ ! empty translation.spelling }">
<span class="label">Spelling:</span>
<c:out value="${ translation.spelling }" /> <br />
</c:if>
<c:if test="${ ! empty translation.pagination && ! translation.pagination == ' ' }">
<span class="label">Pagination:</span>
<c:out value="${ translation.pagination }" /> <br />
</c:if>
<c:out value="${ translation.passage }" /> <br />
<%-- </span> --%>
<!--metadata-->
<c:set var="originalComponent" value="${ passage }" />
<c:set target="${ sessionScope.helper }" property="component" value="${ translation }" />
<jsp:include page="displayMeta.jsf" />
<c:set target="${ sessionScope.helper }" property="component" value="${ originalComponent }" />
</li>
</c:forEach>
</ul>
</c:if>
</c:if>
<!--notes-->

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

@ -1,13 +1,13 @@
<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<!--displayTree.jsf-->
<!--PRONUNCIATION-->
<c:forEach var="pronunciation" items="${ query.entry.pronunciations }">
<c:set var="pronunciation" value="${ sessionScope.helper.component }"/>
<p class="data">
<c:out value='<a name="${ pronunciation.label }" ></a>' escapeXml="false" />
<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 }" label="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
@ -22,12 +22,11 @@
<!--metadata-->
<c:set target="${ sessionScope.helper }" property="component" value="${pronunciation}" />
<jsp:include page="displayMeta.jsf" />
<!--notes-->
<jsp:include page="displayNotes.jsf" />
</p>
</c:forEach><!--END PRONUNCIATION-->

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

@ -1,11 +1,12 @@
<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<!--displayTree.jsf-->
<c:set var="register" value="${ sessionScope.helper.component }"/>
<p class="data">
<c:out value='<a name="${ register.label }" ></a>' escapeXml="false" />
<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 }" label="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
@ -18,14 +19,11 @@
<!--metadata-->
<c:set target="${ sessionScope.helper }" property="component" value="${register}" />
<jsp:include page="displayMeta.jsf" />
<jsp:include page="displayMeta.jsf" />
<!--notes-->
<jsp:include page="displayNotes.jsf" />
</p>

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

@ -1,11 +1,11 @@
<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<!--displayTree.jsf-->
<c:set var="relatedTerm" value="${ sessionScope.helper.component }"/>
<p class="data">
<c:out value='<a name="${ relatedTerm.label }" ></a>' escapeXml="false" />
<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 }" label="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
@ -21,7 +21,7 @@
<!--metadata-->
<c:set target="${ sessionScope.helper }" property="component" value="${relatedTerm}" />
<jsp:include page="displayMeta.jsf" />

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

@ -1,11 +1,7 @@
<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<!--displayTree.jsf-->
<!--SPELLINGS-->
<c:forEach var="spelling" items="${ query.entry.spellings }">
<c:set var="spelling" value="${ sessionScope.helper.component }"/>
<p class="data">
<c:if test="${ editMode }">
<span class="compEditOptions">
@ -14,13 +10,14 @@
</span>
</c:if>
<c:out value='<a name="${ spelling.label }" ></a>' escapeXml="false" />
<!--<span class="label">Spelling:</span> --> <c:out value="${ spelling.spelling }" escapeXml="false" /> <br />
<!--<span class="label">Spelling Type:</span> --> <c:out value="${ applicationScope.flatData.spellingTypes[ spelling.spellingType ] }" escapeXml="false" /> <br />
<c:out value='<a name="${ spelling }" ></a>' escapeXml="false" />
<!--<span class="label">Spelling:</span> -->
<c:out value="${ spelling.spelling }" escapeXml="false" /> <br />
<!--<span class="label">Spelling Type:</span> -->
<c:out value="${ applicationScope.flatData.spellingTypes[ spelling.spellingType ] }" escapeXml="false" /> <br />
<!--metadata-->
<c:set target="${ sessionScope.helper }" property="component" value="${spelling}" />
<jsp:include page="displayMeta.jsf" />
@ -28,7 +25,3 @@
<jsp:include page="displayNotes.jsf" />
</p>
</c:forEach>
<!--END SPELLINGS-->

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

@ -1,12 +1,13 @@
<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<!--displayTree.jsf-->
<!--SUBDEFINITION-->
<c:set var="subdefinition" value="${ sessionScope.helper.component }"/>
<p class="data">
<c:out value='<a name="${ subdefinition.label }" ></a>' escapeXml="false" />
<c:out value='<a name="${ subdefinition }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
@ -28,7 +29,7 @@
<br />
<!--metadata-->
<c:set target="${ sessionScope.helper }" property="component" value="${subdefinition}" />
<jsp:include page="displayMeta.jsf" />
<!--translation-->

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

@ -9,7 +9,7 @@
<!--TERM-->
<h1><c:out value="${ query.entry.term }" /></h1>
<p class="data" >
<c:out value='<a name="${ query.entry.label }" ></a>' escapeXml="false" />
<c:out value='<a name="${ query.entry }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
<c:out value='<a href="/lex/action?cmd=getUpdateTermForm&amp;comp=term&amp;metaId=${ query.entry.metaId }" label="Edit Term"><img alt="Edit Term" src="/lex/images/edit.gif"/></a>' escapeXml="false" />

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

@ -6,8 +6,9 @@
<!--TRANSITIONAL DATA-->
<c:forEach var="transitionalData" items="${ query.entry.transitionalData }">
<c:set var="transitionalData" value="${ sessionScope.helper.component }"/>
<p class="data">
<c:out value='<a name="${ transitionalData.label }" ></a>' escapeXml="false" />
<c:out value='<a name="${ transitionalData }" ></a>' escapeXml="false" />
<c:if test="${ editMode }">
<span class="compEditOptions">
@ -22,7 +23,7 @@
<!--metadata-->
<c:set target="${ sessionScope.helper }" property="component" value="${transitionalData}" />
<jsp:include page="displayMeta.jsf" />
<!--notes-->
<!--notes-->

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

@ -1,11 +1,12 @@
<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<!--displayTree.jsf-->
<c:set var="translationEquivalent" value="${ sessionScope.helper.component }"/>
<p class="data">
<c:out value='<a name="${ translationEquivalent.label }" ></a>' escapeXml="false" />
<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 }" label="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
@ -19,7 +20,7 @@
<!--metadata-->
<c:set target="${ sessionScope.helper }" property="component" value="${translationEquivalent}" />
<jsp:include page="displayMeta.jsf" />

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

@ -1,7 +1,7 @@
<%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<!--displayTreeToc.jsf-->
<!--displayTree.jsf-->
<c:set var="editMode" value="${ false }" />
<c:if test="${ ! sessionScope.user.guest }">
@ -12,141 +12,260 @@
<jsp:include page="displayTerm.jsf" flush="false"/>
<ol>
<!--TRANSITIONAL DATA-->
<c:set value="${query.entry.transitionalData}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<h1>Special Guests</h1>
<li>
<c:out value='<a name="${ sessionScope.helper.collection }"></a>' escapeXml='false'/>
<h2>Special Guests</h2>
<ul>
<c:forEach var="transitionalData" items="${ query.entry.transitionalData }">
<c:set target="${ sessionScope.helper }" property="component" value="${transitionalData}"/>
<li>
<c:out value='<a name="${ sessionScope.helper.component }"></a>' escapeXml='false'/>
<jsp:include page="displayTransitionalData.jsf" flush="false"/>
</li>
</c:forEach>
</ul>
</li>
</c:if>
<!--PRONUNCIATION-->
<c:set value="${query.entry.pronunciations}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<h1>Pronunciations</h1>
<li>
<c:out value='<a name="${ sessionScope.helper.collection }"></a>' escapeXml='false'/>
<h2>Pronunciations</h2>
<ul>
<c:forEach var="pronunciation" items="${ query.entry.pronunciations }">
<c:set target="${ sessionScope.helper }" property="component" value="${pronunciation}"/>
<li>
<c:out value='<a name="${ sessionScope.helper.component }"></a>' escapeXml='false'/>
<jsp:include page="displayPronunciation.jsf" flush="false"/>
</li>
</c:forEach>
</ul>
</li>
</c:if>
<!--ETYMOLOGY-->
<c:set value="${query.entry.etymologies}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<h1>Etymologies</h1>
<li>
<c:out value='<a name="${ sessionScope.helper.collection }"></a>' escapeXml='false'/>
<h2>Etymologies</h2>
<ul>
<c:forEach var="etymology" items="${ query.entry.etymologies }">
<c:set target="${ sessionScope.helper }" property="component" value="${etymology}"/>
<li>
<c:out value='<a name="${ sessionScope.helper.component }"></a>' escapeXml='false'/>
<jsp:include page="displayEtymology.jsf" flush="false"/>
</li>
</c:forEach>
</ul>
</li>
</c:if>
<!--SPELLINGS-->
<c:set value="${query.entry.spellings}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<h1>Spellings</h1>
<li>
<c:out value='<a name="${ sessionScope.helper.collection }"></a>' escapeXml='false'/>
<h2>Spellings</h2>
<ul>
<c:forEach var="spelling" items="${ query.entry.spellings }">
<c:set target="${ sessionScope.helper }" property="component" value="${spelling}"/>
<li>
<c:out value='<a name="${ sessionScope.helper.component }"></a>' escapeXml='false'/>
<jsp:include page="displaySpelling.jsf" flush="false"/>
</li>
</c:forEach>
</ul>
</li>
</c:if>
<!--FUNCTIONS-->
<c:set value="${query.entry.functions}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<h1>Functions</h1>
<li>
<c:out value='<a name="${ sessionScope.helper.collection }"></a>' escapeXml='false'/>
<h2>Functions</h2>
<ul>
<c:forEach var="function" items="${ query.entry.functions }">
<c:set target="${ sessionScope.helper }" property="component" value="${function}"/>
<li>
<c:out value='<a name="${ sessionScope.helper.component }"></a>' escapeXml='false'/>
<jsp:include page="displayFunction.jsf" flush="false"/>
</li>
</c:forEach>
</ul>
</li>
</c:if>
<!--ENCYCLOPEDIA ARTICLES-->
<c:set value="${query.entry.encyclopediaArticles}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<h1>Encyclopedia Articles</h1>
<li>
<c:out value='<a name="${ sessionScope.helper.collection }"></a>' escapeXml='false'/>
<h2>Encyclopedia Articles</h2>
<ul>
<c:forEach var="encyclopediaArticle" items="${ query.entry.encyclopediaArticles }">
<c:set target="${ sessionScope.helper }" property="component" value="${encyclopediaArticle}"/>
<li>
<c:out value='<a name="${ sessionScope.helper.component }"></a>' escapeXml='false'/>
<jsp:include page="displayEncyclopediaArticle.jsf" flush="false"/>
</li>
</c:forEach>
</ul>
</li>
</c:if>
<!--DEFINITION LOOP-->
<c:set value="${query.entry.definitions}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<h1>Definitions</h1>
<c:forEach var="definition" items="${query.entry.definitions}">
<c:set var="definition" scope="request" value="${definition}"/>
<jsp:include page="displayDefinition.jsf" flush="false"/>
<li>
<c:out value='<a name="${ sessionScope.helper.collection }"></a>' escapeXml='false'/>
<h2>Definitions</h2>
<c:forEach var="definition" items="${query.entry.definitions}">
<c:set target="${ sessionScope.helper }" property="component" value="${definition}"/>
<c:out value='<a name="${ sessionScope.helper.component }"></a>' escapeXml='false'/>
<jsp:include page="displayDefinition.jsf" flush="false"/>
<!--SUBDEFINITION-->
<c:set value="${definition.subdefinitions}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<h1>Subdefinitions</h1>
<ol>
<c:forEach var="subdefinition" items="${ definition.subdefinitions }">
<c:set var="subdefinition" scope="request" value="${subdefinition}"/>
<c:set target="${ sessionScope.helper }" property="component" value="${subdefinition}"/>
<li>
<c:out value='<a name="${ sessionScope.helper.component }"></a>' escapeXml='false'/>
<jsp:include page="displaySubdefinition.jsf" flush="false"/>
<ol>
<!--KEYWORD-->
<c:set value="${subdefinition.keywords}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<h1>Keywords</h1>
<li>
<c:out value='<a name="${ sessionScope.helper.collection }"></a>' escapeXml='false'/>
<h2>Keywords</h2>
<ul>
<c:forEach var="keyword" items="${ subdefinition.keywords }">
<c:set var="keyword" scope="request" value="${keyword}"/>
<c:set target="${ sessionScope.helper }" property="component" value="${keyword}"/>
<li>
<c:out value='<a name="${ sessionScope.helper.component }"></a>' escapeXml='false'/>
<jsp:include page="displayKeyword.jsf" flush="false"/>
</li>
</c:forEach>
</ul>
</li>
</c:if>
<!--MODEL SENTENCE-->
<c:set value="${subdefinition.modelSentences}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<h1>Model Sentences</h1>
<li>
<c:out value='<a name="${ sessionScope.helper.collection }"></a>' escapeXml='false'/>
<h2>Model Sentences</h2>
<ul>
<c:forEach var="modelSentence" items="${ subdefinition.modelSentences }">
<c:set var="modelSentence" scope="request" value="${modelSentence}"/>
<c:set target="${ sessionScope.helper }" property="component" value="${modelSentence}"/>
<li>
<c:out value='<a name="${ sessionScope.helper.component }"></a>' escapeXml='false'/>
<jsp:include page="displayModelSentence.jsf" flush="false"/>
</li>
</c:forEach>
</ul>
</li>
</c:if>
<!--TRANSLATION EQUIVALENT-->
<c:set value="${subdefinition.translationEquivalents}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<h1>Translation Equivalents</h1>
<li>
<c:out value='<a name="${ sessionScope.helper.collection }"></a>' escapeXml='false'/>
<h2>Translation Equivalents</h2>
<ul>
<c:forEach var="translationEquivalent" items="${ subdefinition.translationEquivalents }">
<c:set var="translationEquivalent" scope="request" value="${translationEquivalent}"/>
<c:set target="${ sessionScope.helper }" property="component" value="${translationEquivalent}"/>
<li>
<c:out value='<a name="${ sessionScope.helper.component }"></a>' escapeXml='false'/>
<jsp:include page="displayTranslationEquivalent.jsf" flush="false"/>
</li>
</c:forEach>
</ul>
</li>
</c:if>
<!--RELATED TERM-->
<c:set value="${subdefinition.relatedTerms}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<h1>RelatedTerm</h1>
<li>
<c:out value='<a name="${ sessionScope.helper.collection }"></a>' escapeXml='false'/>
<h2>RelatedTerm</h2>
<ul>
<c:forEach var="relatedTerm" items="${ subdefinition.relatedTerms }">
<c:set var="relatedTerm" scope="request" value="${relatedTerm}"/>
<c:set target="${ sessionScope.helper }" property="component" value="${relatedTerm}"/>
<li>
<c:out value='<a name="${ sessionScope.helper.component }"></a>' escapeXml='false'/>
<jsp:include page="displayRelatedTerm.jsf" flush="false"/>
</li>
</c:forEach>
</ul>
</li>
</c:if>
<!--PASSAGE-->
<c:set value="${subdefinition.passages}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<h1>Passages</h1>
<li>
<c:out value='<a name="${ sessionScope.helper.collection }"></a>' escapeXml='false'/>
<h2>Passages</h2>
<ul>
<c:forEach var="passage" items="${ subdefinition.passages }">
<c:set var="passage" scope="request" value="${passage}"/>
<c:set target="${ sessionScope.helper }" property="component" value="${passage}"/>
<li>
<c:out value='<a name="${ sessionScope.helper.component }"></a>' escapeXml='false'/>
<jsp:include page="displayPassage.jsf" flush="false"/>
</li>
</c:forEach>
</ul>
</li>
</c:if>
<!--REGISTER-->
<c:set value="${subdefinition.registers}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<h1>Registers</h1>
<li>
<c:out value='<a name="${ sessionScope.helper.collection }"></a>' escapeXml='false'/>
<h2>Registers</h2>
<ul>
<c:forEach var="register" items="${ subdefinition.registers }">
<c:set target="${ sessionScope.helper }" property="component" value="${register}"/>
<li>
<c:out value='<a name="${ sessionScope.helper.component }"></a>' escapeXml='false'/>
<jsp:include page="displayRegister.jsf" flush="false"/>
</li>
</c:forEach>
</ul>
</li>
</c:if>
</c:forEach>
</ol>
</li>
</c:forEach><!--END SUBDEFINITION LOOP-->
</ol>
</c:if>
</c:forEach>
</c:forEach><!--END DEFINITION LOOP-->
</li>
</c:if>
</c:if>

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

@ -55,16 +55,20 @@
<!--DEFINITION LOOP-->
<c:set value="${query.entry.definitions}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<c:out value='<li><a href="#${query.entry.definitions}">Definitions</a></li>' escapeXml='false' />
<c:forEach var="definition" items="${query.entry.definitions}">
<li>
<c:out value='<a href="#${definition}">Definition ${ definition.precedence + 1}</a>' escapeXml='false' />
<ol>
<!--SUBDEFINITION-->
<c:set value="${definition.subdefinitions}" target="${sessionScope.helper}" property="collection"/>
<c:if test="${ sessionScope.helper.collectionSize > 0 }">
<c:out value='<li><a href="#${definition.subdefinitions}">Subdefinitions</a></li>' escapeXml='false' />
<c:forEach var="subdefinition" items="${ definition.subdefinitions }">
<li>
<c:out value='<a href="#${subdefinition}">Subdefinition ${ subdefinition.precedence + 1 }</a>' escapeXml='false' />
<ol>
<!--KEYWORD-->
<c:set value="${subdefinition.keywords}" target="${sessionScope.helper}" property="collection"/>
@ -108,9 +112,20 @@
<c:forEach var="register" items="${ subdefinition.registers }"></c:forEach>
</c:if>
</c:forEach>
</ol>
</li>
</c:forEach><!--END SUB-DEFINITIONS-->
</c:if>
</c:forEach>
</ol>
</li>
</c:forEach><!--END DEFINITIONS-->
</c:if>
</ol>
</li>
</ol>

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

@ -11,6 +11,14 @@
<link rel="stylesheet" type="text/css" media="screen" href="/lex/css/lex.css" />
<title>THDL Tibetan Collaborative Dictionaries</title>
<style type="text/css">
<c:if test="${ ! sessionScope.helper.showEditOptions }">
p.data
{
border: none;
}
</c:if>
</style>
</head>
<body>