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

Added display of terms and passages in Tibetan Script using Jskad.TibetanHTML. This breaks thexhtml validity of the page so a valid getHTML output would be very nice.

Browse source
This commit is contained in:
dubtraxis 2003-10-22 21:00:00 +00:00
parent ded733a200
commit 15815f20c8
31 changed files with 574 additions and 425 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build.xml
View file

@ -108,6 +108,9 @@
</fileset> </fileset>
<fileset dir="${basedir}/lib/hibernate"> <fileset dir="${basedir}/lib/hibernate">
<include name="*.jar"/> <include name="*.jar"/>
</fileset>
<fileset dir="${basedir}/lib/thdl">
<include name="*.jar"/>
</fileset> </fileset>
</copy> </copy>

BIN
lib/thdl/Jskad.jar Normal file
View file

Binary file not shown.

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

@ -4,6 +4,7 @@
{ {
} }
#message #message
{ {
} }
@ -36,7 +37,10 @@ margin-top: 2px;
#termChildren, #defChildren, #subdefChildren #termChildren, #defChildren, #subdefChildren
{ {
} }
#columnLeft select, #columnLeft input
{
width: 120px;
}
#columnCenter p #columnCenter p
{ {
text-align: justify; text-align: justify;

70
src/css/lex.css
View file

@ -4,7 +4,7 @@
@import url( "lex-advanced.css" ); @import url( "lex-advanced.css" );
#main * #main input, #main textarea, #main p, #main li
{ /*--------- '*' = everything -------------*/ { /*--------- '*' = everything -------------*/
font-family: 'Arial Unicode MS', 'Lucida Grande', sans-serif !important; font-family: 'Arial Unicode MS', 'Lucida Grande', sans-serif !important;
} }
@ -12,6 +12,7 @@ font-family: 'Arial Unicode MS', 'Lucida Grande', sans-serif !important;
h1 h1
{ {
font-size: 1.5em; font-size: 1.5em;
text-transform: none;
} }
li, ol, ul li, ol, ul
@ -19,7 +20,6 @@ li, ol, ul
padding: 0 1em 0 1em; padding: 0 1em 0 1em;
margin-top: 0; margin-top: 0;
border-width: 0px; border-width: 0px;
} }
li li
{ {
@ -46,7 +46,15 @@ li
ol ol
{ {
list-style-type: upper-roman; list-style-type: upper-roman;
}
#entry ol, #entry ul, #entry li
{
clear: right;
margin-right: 0 !important;
padding-right: 0 !important;
} }
#results ol #results ol
{ {
list-style-type: decimal; list-style-type: decimal;
@ -79,4 +87,62 @@ margin-left: 0 !important;
padding-left: 0 !important; padding-left: 0 !important;
} }
div.tmw-block
{
margin-top: 1ex !important;
}
span
{
/* border: solid 1px red; */
}
a.tmw-link:hover
{
background-color: inherit;
}
span.tmw-roman {position: relative; top: 0pt; padding-left: .25em;}
span.tmw {font: 20pt TibetanMachineWeb !important; text-transform: none; position: relative; top: -5pt;}
span.tmw1 {font: 20pt TibetanMachineWeb1 !important; text-transform: none; position: relative; top: -5pt;}
span.tmw2 {font: 20pt TibetanMachineWeb2 !important; text-transform: none; position: relative; top: -5pt;}
span.tmw3 {font: 20pt TibetanMachineWeb3 !important; text-transform: none; position: relative; top: -5pt;}
span.tmw4 {font: 20pt TibetanMachineWeb4 !important; text-transform: none; position: relative; top: -5pt;}
span.tmw5 {font: 20pt TibetanMachineWeb5 !important; text-transform: none; position: relative; top: -5pt;}
span.tmw6 {font: 20pt TibetanMachineWeb6 !important; text-transform: none; position: relative; top: -5pt;}
span.tmw7 {font: 20pt TibetanMachineWeb7 !important; text-transform: none; position: relative; top: -5pt;}
span.tmw8 {font: 20pt TibetanMachineWeb8 !important; text-transform: none; position: relative; top: -5pt;}
span.tmw9 {font: 20pt TibetanMachineWeb9 !important; text-transform: none; position: relative; top: -5pt;}
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; }

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

@ -4,6 +4,7 @@ import java.text.DateFormat;
import java.util.*; import java.util.*;
import org.apache.commons.beanutils.*; import org.apache.commons.beanutils.*;
import org.thdl.lex.component.*; import org.thdl.lex.component.*;
import org.thdl.tib.text.TibetanHTML;
/** /**
@ -19,11 +20,36 @@ public class DisplayHelper
private ILexComponent note; private ILexComponent note;
private Date date; private Date date;
private final static DateFormat DATE_FORMAT = DateFormat.getDateInstance( DateFormat.LONG ); private final static DateFormat DATE_FORMAT = DateFormat.getDateInstance( DateFormat.LONG );
private boolean showNotes; private boolean showNotes;
private boolean showMeta; private boolean showMeta;
private boolean showEditOptions; private boolean showEditOptions;
private boolean showTranslations; private boolean showTranslations;
private String wylie;
/**
* Sets the wylie attribute of the DisplayHelper object
*
* @param wylie The new wylie value
*/
public void setWylie( String wylie )
{
this.wylie = wylie;
}
/**
* Gets the wylie attribute of the DisplayHelper object
*
* @return The wylie value
*/
public String getWylie()
{
return wylie;
}
/** /**
* Sets the date attribute of the DisplayHelper object * Sets the date attribute of the DisplayHelper object
@ -236,6 +262,17 @@ public class DisplayHelper
} }
/**
* Gets the tibetan attribute of the DisplayHelper object
*
* @return The tibetan value
*/
public String getTibetan()
{
return TibetanHTML.getHTMLX( getWylie() );
}
/** /**
* Gets the formattedDate attribute of the DisplayHelper object * Gets the formattedDate attribute of the DisplayHelper object
* *

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

@ -25,8 +25,6 @@ public class LexActionServlet extends HttpServlet
{ {
//attributes //attributes
private HashMap commands; private HashMap commands;
private String cmd;
//accessors //accessors
@ -42,17 +40,6 @@ public class LexActionServlet extends HttpServlet
} }
/**
* Sets the cmd attribute of the LexActionServlet object
*
* @param cmd The new cmd value
* @since
*/
public void setCmd( String cmd )
{
this.cmd = cmd;
}
/** /**
* Gets the commands attribute of the LexActionServlet object * Gets the commands attribute of the LexActionServlet object
@ -66,17 +53,6 @@ public class LexActionServlet extends HttpServlet
} }
/**
* Gets the cmd attribute of the LexActionServlet object
*
* @return The cmd value
* @since
*/
public String getCmd()
{
return cmd;
}
//helper methods //helper methods
@ -122,8 +98,8 @@ public class LexActionServlet extends HttpServlet
String next; String next;
try try
{ {
setCmd( req.getParameter( LexConstants.COMMAND_REQ_PARAM ) ); String cmd = req.getParameter( LexConstants.COMMAND_REQ_PARAM );
Command command = lookupCommand( getCmd() ); Command command = lookupCommand( cmd );
LexComponent component = (LexComponent) req.getAttribute( LexConstants.COMPONENT_REQ_ATTR ); LexComponent component = (LexComponent) req.getAttribute( LexConstants.COMPONENT_REQ_ATTR );
next = command.execute( req, component ); next = command.execute( req, component );
CommandToken.set( req ); CommandToken.set( req );
@ -187,7 +163,7 @@ public class LexActionServlet extends HttpServlet
} }
else else
{ {
throw new CommandException( "Invalid Command Identifier: '" + getCmd() + "'" ); throw new CommandException( "Invalid Command Identifier: '" + cmdKey + "'" );
} }
} }

23
src/java/org/thdl/lex/Visit.java
View file

@ -17,6 +17,7 @@ public class Visit
{ {
//attributes //attributes
HttpSession session; HttpSession session;
String token;
DisplayHelper helper; DisplayHelper helper;
Preferences preferences; Preferences preferences;
LexQuery query; LexQuery query;
@ -24,6 +25,28 @@ public class Visit
String displayMode; String displayMode;
/**
* Sets the token attribute of the Visit object
*
* @param token The new token value
*/
public void setToken( String token )
{
this.token = token;
}
/**
* Gets the token attribute of the Visit object
*
* @return The token value
*/
public String getToken()
{
return token;
}
/** /**
* Sets the session attribute of the Visit object * Sets the session attribute of the Visit object
* *

85
src/java/org/thdl/lex/commands/CommandToken.java
View file

@ -1,49 +1,88 @@
package org.thdl.lex.commands; package org.thdl.lex.commands;
import org.thdl.lex.*;
import org.thdl.lex.component.*;
import java.security.MessageDigest; import java.security.MessageDigest;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.thdl.lex.*;
import org.thdl.lex.component.*;
/**
* Description of the Class
*
* @author travis
* @created October 22, 2003
*/
public class CommandToken public class CommandToken
{ {
public static void set(HttpServletRequest req) /**
* Description of the Method
*
* @param req Description of the Parameter
*/
public static void set( HttpServletRequest req )
{ {
HttpSession session = req.getSession(true); HttpSession session = req.getSession( true );
Visit visit = UserSessionManager.getInstance().getVisit( session );
long systime = System.currentTimeMillis(); long systime = System.currentTimeMillis();
byte[] time = new Long(systime).toString().getBytes(); byte[] time = new Long( systime ).toString().getBytes();
byte[] id = session.getId().getBytes(); byte[] id = session.getId().getBytes();
try try
{ {
MessageDigest md5 = MessageDigest.getInstance("MD5"); MessageDigest md5 = MessageDigest.getInstance( "MD5" );
md5.update(id); md5.update( id );
md5.update(time); md5.update( time );
String token = toHex( md5.digest() ); String token = toHex( md5.digest() );
req.setAttribute("token", token); req.setAttribute( "token", token );
session.setAttribute("token", token); visit.setToken( token );
} }
catch (Exception e) catch ( Exception e )
{ {
System.err.println("Unable to calculate MD5 Digests.\nCould not create unique token"); System.err.println( "Unable to calculate MD5 Digests.\nCould not create unique token" );
} }
} }
public static boolean isValid(HttpServletRequest req)
/**
* Gets the valid attribute of the CommandToken class
*
* @param req Description of the Parameter
* @return The valid value
*/
public static boolean isValid( HttpServletRequest req )
{ {
HttpSession session = req.getSession(true); boolean valid;
String requestToken = req.getParameter("token"); HttpSession session = req.getSession( true );
String sessionToken = (String) session.getAttribute("token"); Visit visit = UserSessionManager.getInstance().getVisit( session );
if (requestToken == null && sessionToken == null) String requestToken = req.getParameter( "token" );
return false; String sessionToken = visit.getToken();
if ( requestToken == null && sessionToken == null )
{
valid = false;
}
else else
return requestToken.equals(sessionToken);//this is a boolean {
valid = requestToken.equals( sessionToken );
}
return valid;
} }
public static String toHex(byte[] digest)
/**
* Description of the Method
*
* @param digest Description of the Parameter
* @return Description of the Return Value
*/
public static String toHex( byte[] digest )
{ {
StringBuffer buf = new StringBuffer(); StringBuffer buf = new StringBuffer();
for (int i = 0; i < digest.length; i++) for ( int i = 0; i < digest.length; i++ )
buf.append( Integer.toHexString( (int)digest[i] & 0x00ff ) );//param=BITWISE operation {
buf.append( Integer.toHexString( (int) digest[i] & 0x00ff ) );
}//param=BITWISE operation
return buf.toString(); return buf.toString();
} }
} }

2
src/java/org/thdl/lex/commands/DisplayCommand.java
View file

@ -86,7 +86,7 @@ public class DisplayCommand extends LexCommand implements Command
} }
else else
{ {
setNext( "menu.jsp" ); next = "menu.jsp";
msg = "The component set for display was not a term."; msg = "The component set for display was not a term.";
LexLogger.error( msg ); LexLogger.error( msg );
} }

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

@ -10,10 +10,10 @@
<c:out value='<a name="${ definition }" ></a>' escapeXml="false" /> <c:out value='<a name="${ definition }" ></a>' escapeXml="false" />
<c:if test="${ editMode }"> <c:if test="${ editMode }">
<span class="compEditOptions"> <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" /> <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" />
<c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=definition&amp;metaId=${ definition.metaId }" label="Edit this Definition"><img alt="Edit this Definition" src="/lex/images/edit.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=definition&amp;metaId=${ definition.metaId }" title="Edit this Definition"><img alt="Edit this Definition" src="/lex/images/edit.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getTranslationForm&amp;comp=definition&amp;parentId=${definition.parentId}&amp;translationOf=${definition.metaId}" label="Translate this Definition"><img alt="Translate this Definition" src="/lex/images/trans.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getTranslationForm&amp;comp=definition&amp;parentId=${definition.parentId}&amp;translationOf=${definition.metaId}" title="Translate this Definition"><img alt="Translate this Definition" src="/lex/images/trans.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=subdefinition&amp;parentId=${definition.metaId}" label="Add a Subdefinition"><img alt="Add a Subdefinition" src="/lex/images/subdef.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=subdefinition&amp;parentId=${definition.metaId}" title="Add a Subdefinition"><img alt="Add a Subdefinition" src="/lex/images/subdef.gif"/></a>' escapeXml="false" />
</span> </span>
</c:if> </c:if>

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

@ -7,8 +7,8 @@
<c:if test="${ editMode }"> <c:if test="${ editMode }">
<span class="compEditOptions"> <span class="compEditOptions">
<c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=encyclopediaArticle&amp;metaId=${ encyclopediaArticle.metaId }" label="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=encyclopediaArticle&amp;metaId=${ encyclopediaArticle.metaId }" title="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=encyclopediaArticle&amp;metaId=${ encyclopediaArticle.metaId }" label="Edit this encyclopediaArticle"><img alt="Edit this encyclopediaArticle" src="/lex/images/edit.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=encyclopediaArticle&amp;metaId=${ encyclopediaArticle.metaId }" title="Edit this encyclopediaArticle"><img alt="Edit this encyclopediaArticle" src="/lex/images/edit.gif"/></a>' escapeXml="false" />
</span> </span>
</c:if> </c:if>
<!--<span class="label">Encyclopedia Article:</span>--> <!--<span class="label">Encyclopedia Article:</span>-->

156
src/jsp/jsp/displayEntry.jsp
View file

@ -1,121 +1,109 @@
<%@ page buffer="512kb" autoFlush="false" import="org.thdl.lex.*,org.thdl.lex.component.*" errorPage="/jsp/error.jsp" contentType="text/html; charset=UTF-8"%> <%@ 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" %> <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
<jsp:include page="header.jsf" flush="false" /> <jsp:include page="header.jsf" flush="false"/>
<!--displayEntry.jsp--> <!--displayEntry.jsp-->
<c:set var="editMode" value="${ false }" scope="request" /> <c:set var="editMode" value="${ false }" scope="request"/>
<c:if test="${ ! sessionScope.visit.user.guest && sessionScope.visit.helper.showEditOptions }"> <c:if test="${ ! sessionScope.visit.user.guest && sessionScope.visit.helper.showEditOptions }">
<c:set var="editMode" value="${ true }" scope="request"/> <c:set var="editMode" value="${ true }" scope="request"/>
</c:if> </c:if>
<%--
<c:set var="showNotes" value="${ false }" scope="request" />
<c:if test="${ sessionScope.visit.helper.showNotes }">
<c:set var="showNotes" value="${ true }" scope="request"/>
</c:if>
<c:set var="showMeta" value="${ false }" scope="request" />
<c:if test="${ sessionScope.visit.helper.showMeta }">
<c:set var="showMeta" value="${ true }" scope="request"/>
</c:if>
<c:set var="showTranslations" value="${ false }" scope="request" />
<c:if test="${ sessionScope.visit.helper.showTranslations }">
<c:set var="showTranslations" value="${ true }" scope="request"/>
</c:if> --%>
<div id="columnRight"> <div id="columnRight">
<div id="results" class="highlightBox"> <div id="results" class="highlightBox">
<h2> Search Results </h2> <h2> Search Results </h2>
<ol> <ol>
<c:forEach var="resultsMapItem" items="${sessionScope.visit.query.results}"> <c:forEach var="resultsMapItem" items="${sessionScope.visit.query.results}">
<c:set var="cls" value="" /> <c:set var="cls" value=""/>
<c:if test="${ resultsMapItem.key == sessionScope.visit.query.entry.metaId }"> <c:if test="${ resultsMapItem.key == sessionScope.visit.query.entry.metaId }">
<c:set var="cls" value="class='selected'" /> <c:set var="cls" value="class='selected'"/>
</c:if> </c:if>
<li> <li>
<c:out value='<a ${cls} href="/lex/action?cmd=displayFull&comp=term&metaId=${resultsMapItem.key}">${ resultsMapItem.value}</a>' escapeXml='false' /><br /> <c:out value="<a ${cls} href='/lex/action?cmd=displayFull&amp;comp=term&amp;metaId=${resultsMapItem.key}'>${ resultsMapItem.value}</a>" escapeXml="false"/>
</li> <br/>
</c:forEach> </li>
</c:forEach>
</ol> </ol>
</div><!--END MENU--> </div><!--END MENU-->
</div> </div>
<div id="columnLeft"> <div id="columnLeft">
<div id="toc" class="highlightBox"> <div id="toc" class="highlightBox">
<jsp:include page="displayTreeToc.jsf"/> <jsp:include page="displayTreeToc.jsf"/>
</div><!--END TOC--> </div><!--END TOC-->
</div><!--END COLUMN LEFT--> </div><!--END COLUMN LEFT-->
<div id="columnCenter"> <div id="columnCenter">
<p id="navLinks"><jsp:include page="navLinks.jsf" /></p>
<jsp:include page="navLinks.jsf"/>
<p id="message">
<c:choose>
<c:when test="${ ! empty message }">
<c:out value="${ message }"/>. <br/>
</c:when>
<c:when test="${ empty message }"></c:when>
</c:choose>
</p>
<form action="/lex/action">
<p id="helper">
<span class="label">Display</span>:
<p id="message"> <c:set var="ckd" value=""/>
<c:choose> <c:if test="${ sessionScope.visit.helper.showMeta }">
<c:when test="${ ! empty message }"> <c:set var="ckd" value="checked='checked'"/>
<c:out value="${ message }"/>. <br/> </c:if>
</c:when> <c:out value="<input name='showMeta' type='checkbox' value='true' ${ckd}/> credits |" escapeXml="false"/>
<c:when test="${ empty message }">
</c:when>
</c:choose>
</p>
<form action="/lex/action">
<p id="helper">
<span class="label">Display</span>: <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.showMeta }">
<c:set var="ckd" value='checked="checked"'/>
</c:if>
<c:out value='<input name="showMeta" type="checkbox" value="true" ${ckd}/>' escapeXml='false'/>
credits |
<c:set var="ckd" value=""/> <c:set var="ckd" value=""/>
<c:if test="${ sessionScope.visit.helper.showNotes }"> <c:if test="${ sessionScope.visit.helper.showTranslations }">
<c:set var="ckd" value='checked="checked"'/> <c:set var="ckd" value="checked='checked'"/>
</c:if> </c:if>
<c:out value='<input name="showNotes" type="checkbox" value="true" ${ckd}/>' escapeXml='false'/> <c:out value="<input name='showTranslations' type='checkbox' value='true' ${ckd}/> translations" escapeXml="false"/>
analysis |
<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}/>' escapeXml='false'/>
translations
<c:if test="${ ! sessionScope.visit.user.guest }"> <c:if test="${ ! sessionScope.visit.user.guest }">
<c:set var="ckd" value=""/> <c:set var="ckd" value=""/>
<c:if test="${ sessionScope.visit.helper.showEditOptions }"> <c:if test="${ sessionScope.visit.helper.showEditOptions }">
<c:set var="ckd" value='checked="checked"'/> <c:set var="ckd" value="checked='checked'"/>
</c:if> </c:if>
| <c:out value='<input name="showEditOptions" type="checkbox" value="true" ${ckd}/>' escapeXml='false'/> <c:out value="| <input name='showEditOptions' type='checkbox' value='true' ${ckd}/> edit options" escapeXml="false"/>
edit options
</c:if>
<input type="hidden" name="cmd" value="displayFull"/> </c:if>
<input type="submit" value="Redisplay"/>
</p> <c:out value="<input type='hidden' name='metaId' value='${ sessionScope.visit.query.entry.metaId }'/>" escapeXml="false"/>
</form> <input type="hidden" name="cmd" value="displayFull"/>
<input type="hidden" name="comp" value="term"/>
<div id="entry"> <input type="submit" value="Redisplay"/>
<c:choose> </p>
<c:when test="${ param.comp == 'encyclopediaArticle' && param.cmd == 'display' }"> </form>
<jsp:include page="encyclopedia.jsf" flush="false"/>
</c:when> <div id="entry">
<c:otherwise> <c:choose>
<jsp:include page="displayTree.jsf" flush="false"/> <c:when test="${ param.comp == 'encyclopediaArticle' && param.cmd == 'display' }">
</c:otherwise> <jsp:include page="encyclopedia.jsf" flush="false"/>
</c:choose> </c:when>
</div><!--END ENTRY--> <c:otherwise>
<jsp:include page="displayTree.jsf" flush="false"/>
</c:otherwise>
</c:choose>
</div><!--END ENTRY-->
</div><!--END columnMain--> </div><!--END columnMain-->
<jsp:include page="footer.jsf" flush="false" /> <jsp:include page="footer.jsf" flush="false"/>

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

@ -10,9 +10,9 @@
<c:out value='<a name="${ etymology }" ></a>' escapeXml="false" /> <c:out value='<a name="${ etymology }" ></a>' escapeXml="false" />
<c:if test="${ editMode }"> <c:if test="${ editMode }">
<span class="compEditOptions"> <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" /> <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" />
<c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=etymology&amp;metaId=${ etymology.metaId }&amp;parentId=${etymology.parentId}" label="Edit this Etymology"><img alt="Edit this component" src="/lex/images/edit.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=etymology&amp;metaId=${ etymology.metaId }&amp;parentId=${etymology.parentId}" title="Edit this Etymology"><img alt="Edit this component" src="/lex/images/edit.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getTranslationForm&amp;comp=etymology&amp;parentId=${etymology.parentId}&amp;translationOf=${etymology.metaId}" label="Translate this Etymology"><img alt="Translate this Etymology" src="/lex/images/trans.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getTranslationForm&amp;comp=etymology&amp;parentId=${etymology.parentId}&amp;translationOf=${etymology.metaId}" title="Translate this Etymology"><img alt="Translate this Etymology" src="/lex/images/trans.gif"/></a>' escapeXml="false" />
</span> </span>
</c:if> </c:if>

2
src/jsp/jsp/displayForm.jsp
View file

@ -19,7 +19,7 @@
<c:if test="${ ! empty termEntry }"> <c:if test="${ ! empty termEntry }">
<div id="backButton"> <div id="backButton">
Back to: Back to:
<c:out value='<a href="/lex/action?cmd=displayFull&comp=term&id=${ termEntry.term.id }">${ termEntry.term.term }</a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=displayFull&amp;comp=term&id=${ termEntry.term.id }">${ termEntry.term.term }</a>' escapeXml="false" />
</div> </div>
</c:if> </c:if>

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

@ -5,8 +5,8 @@
<p class="data"> <p class="data">
<c:if test="${ editMode }"> <c:if test="${ editMode }">
<span class="compEditOptions"> <span class="compEditOptions">
<c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=grammaticalFunction&amp;metaId=${ function.metaId }" label="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=grammaticalFunction&amp;metaId=${ function.metaId }" title="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
<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" /> <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> </span>
</c:if> </c:if>
<c:out value='<a name="${ function }" ></a>' escapeXml="false" /> <c:out value='<a name="${ function }" ></a>' escapeXml="false" />

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

@ -9,8 +9,8 @@
<c:out value='<a name="${ keyword }" ></a>' escapeXml="false" /> <c:out value='<a name="${ keyword }" ></a>' escapeXml="false" />
<c:if test="${ editMode }"> <c:if test="${ editMode }">
<span class="compEditOptions"> <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" /> <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" />
<c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=keyword&amp;metaId=${ keyword.metaId }" label="Edit this keyword"><img alt="Edit this keyword" src="/lex/images/edit.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=keyword&amp;metaId=${ keyword.metaId }" title="Edit this keyword"><img alt="Edit this keyword" src="/lex/images/edit.gif"/></a>' escapeXml="false" />
</span> </span>
</c:if> </c:if>

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

@ -9,9 +9,9 @@
<c:out value='<a name="${ modelSentence }" ></a>' escapeXml="false" /> <c:out value='<a name="${ modelSentence }" ></a>' escapeXml="false" />
<c:if test="${ editMode }"> <c:if test="${ editMode }">
<span class="compEditOptions"> <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" /> <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" />
<c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=modelSentence&amp;metaId=${ modelSentence.metaId }" label="Edit this modelSentence"><img alt="Edit this modelSentence" src="/lex/images/edit.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=modelSentence&amp;metaId=${ modelSentence.metaId }" title="Edit this modelSentence"><img alt="Edit this modelSentence" src="/lex/images/edit.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getTranslationForm&amp;comp=modelSentence&amp;parentId=${modelSentence.parentId}&amp;translationOf=${modelSentence.metaId}" label="Translate this modelSentence"><img alt="Translate this modelSentence" src="/lex/images/trans.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getTranslationForm&amp;comp=modelSentence&amp;parentId=${modelSentence.parentId}&amp;translationOf=${modelSentence.metaId}" title="Translate this modelSentence"><img alt="Translate this modelSentence" src="/lex/images/trans.gif"/></a>' escapeXml="false" />
</span> </span>
</c:if> </c:if>

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

@ -9,9 +9,9 @@
<c:out value='<a name="${ passage }" ></a>' escapeXml="false" /> <c:out value='<a name="${ passage }" ></a>' escapeXml="false" />
<c:if test="${ editMode }"> <c:if test="${ editMode }">
<span class="compEditOptions"> <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" /> <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" />
<c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=passage&amp;metaId=${ passage.metaId }" label="Edit this passage"><img alt="Edit this passage" src="/lex/images/edit.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=passage&amp;metaId=${ passage.metaId }" title="Edit this passage"><img alt="Edit this passage" src="/lex/images/edit.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getTranslationForm&amp;comp=passage&amp;parentId=${passage.parentId}&amp;translationOf=${passage.metaId}" label="Translate this passage"><img alt="Translate this passage" src="/lex/images/trans.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getTranslationForm&amp;comp=passage&amp;parentId=${passage.parentId}&amp;translationOf=${passage.metaId}" title="Translate this passage"><img alt="Translate this passage" src="/lex/images/trans.gif"/></a>' escapeXml="false" />
</span> </span>
</c:if> </c:if>
@ -33,7 +33,9 @@
</c:if> </c:if>
<!--<span class="label">Passage:</span>--> <!--<span class="label">Passage:</span>-->
<c:out value="${ passage.passage }" escapeXml="false" /> <c:set target="${ sessionScope.visit.helper}" property="wylie" value="${ passage.passage }"/>
<c:set var="tib" value="${ sessionScope.visit.helper.tibetan } " />
<div class="tmw-block"><c:out value="${ tib }" escapeXml="false" /></div>
<!--metadata--> <!--metadata-->

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

@ -10,8 +10,8 @@
<c:out value='<a name="${ pronunciation }" ></a>' escapeXml="false" /> <c:out value='<a name="${ pronunciation }" ></a>' escapeXml="false" />
<c:if test="${ editMode }"> <c:if test="${ editMode }">
<span class="compEditOptions"> <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" /> <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" />
<c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=pronunciation&amp;metaId=${ pronunciation.metaId }" label="Edit this component"><img alt="Edit this component" src="/lex/images/edit.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=pronunciation&amp;metaId=${ pronunciation.metaId }" title="Edit this component"><img alt="Edit this component" src="/lex/images/edit.gif"/></a>' escapeXml="false" />
</span> </span>
</c:if> </c:if>

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

@ -9,8 +9,8 @@
<c:out value='<a name="${ register }" ></a>' escapeXml="false" /> <c:out value='<a name="${ register }" ></a>' escapeXml="false" />
<c:if test="${ editMode }"> <c:if test="${ editMode }">
<span class="compEditOptions"> <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" /> <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" />
<c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=speechRegister&amp;metaId=${ register.metaId }" label="Edit this speechRegister"><img alt="Edit this speechRegister" src="/lex/images/edit.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=speechRegister&amp;metaId=${ register.metaId }" title="Edit this speechRegister"><img alt="Edit this speechRegister" src="/lex/images/edit.gif"/></a>' escapeXml="false" />
</span> </span>
</c:if> </c:if>
<!--<span class="label">Speech Register:</span>--> <!--<span class="label">Speech Register:</span>-->

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

@ -8,8 +8,8 @@
<c:out value='<a name="${ relatedTerm }" ></a>' escapeXml="false" /> <c:out value='<a name="${ relatedTerm }" ></a>' escapeXml="false" />
<c:if test="${ editMode }"> <c:if test="${ editMode }">
<span class="compEditOptions"> <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" /> <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" />
<c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=relatedTerm&amp;metaId=${ relatedTerm.metaId }" label="Edit this relatedTerm"><img alt="Edit this relatedTerm" src="/lex/images/edit.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=relatedTerm&amp;metaId=${ relatedTerm.metaId }" title="Edit this relatedTerm"><img alt="Edit this relatedTerm" src="/lex/images/edit.gif"/></a>' escapeXml="false" />
</span> </span>
</c:if> </c:if>

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

@ -5,8 +5,8 @@
<p class="data"> <p class="data">
<c:if test="${ editMode }"> <c:if test="${ editMode }">
<span class="compEditOptions"> <span class="compEditOptions">
<c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=spelling&amp;metaId=${ spelling.metaId }" label="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=spelling&amp;metaId=${ spelling.metaId }" title="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=spelling&amp;metaId=${ spelling.metaId }" label="Edit this component"><img alt="Edit this component" src="/lex/images/edit.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=spelling&amp;metaId=${ spelling.metaId }" title="Edit this component"><img alt="Edit this component" src="/lex/images/edit.gif"/></a>' escapeXml="false" />
</span> </span>
</c:if> </c:if>

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

@ -11,15 +11,15 @@
<c:if test="${ editMode }"> <c:if test="${ editMode }">
<span class="compEditOptions"> <span class="compEditOptions">
<c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=subdefinition&amp;metaId=${ subdefinition.metaId }" label="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=subdefinition&amp;metaId=${ subdefinition.metaId }" title="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=subdefinition&amp;metaId=${ subdefinition.metaId }" label="Edit this subdefinition"><img alt="Edit this subdefinition" src="/lex/images/edit.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=subdefinition&amp;metaId=${ subdefinition.metaId }" title="Edit this subdefinition"><img alt="Edit this subdefinition" src="/lex/images/edit.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getTranslationForm&amp;comp=subdefinition&amp;parentId=${subdefinition.parentId}&amp;translationOf=${subdefinition.metaId}" label="Translate this subdefinition"><img alt="Translate this subdefinition" src="/lex/images/trans.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getTranslationForm&amp;comp=subdefinition&amp;parentId=${subdefinition.parentId}&amp;translationOf=${subdefinition.metaId}" title="Translate this subdefinition"><img alt="Translate this subdefinition" src="/lex/images/trans.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=keyword&amp;parentId=${subdefinition.metaId}" label="Add a Keyword"><img alt="Add a Keyword" src="/lex/images/key.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=keyword&amp;parentId=${subdefinition.metaId}" title="Add a Keyword"><img alt="Add a Keyword" src="/lex/images/key.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=modelSentence&amp;parentId=${subdefinition.metaId}" label="Add a Model Sentence"><img alt="Add a Model Sentence" src="/lex/images/sent.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=modelSentence&amp;parentId=${subdefinition.metaId}" title="Add a Model Sentence"><img alt="Add a Model Sentence" src="/lex/images/sent.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=translationEquivalent&amp;parentId=${subdefinition.metaId}" label="Add a Translation Equivalent"><img alt="Add a Translation Equivalent" src="/lex/images/trans-eqv.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=translationEquivalent&amp;parentId=${subdefinition.metaId}" title="Add a Translation Equivalent"><img alt="Add a Translation Equivalent" src="/lex/images/trans-eqv.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=relatedTerm&amp;parentId=${subdefinition.metaId}" label="Add a Related Term"><img alt="Add a Related Term" src="/lex/images/rel-term.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=relatedTerm&amp;parentId=${subdefinition.metaId}" title="Add a Related Term"><img alt="Add a Related Term" src="/lex/images/rel-term.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=passage&amp;parentId=${subdefinition.metaId}" label="Add a Passage"><img alt="Add a Passage" src="/lex/images/pass.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=passage&amp;parentId=${subdefinition.metaId}" title="Add a Passage"><img alt="Add a Passage" src="/lex/images/pass.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=speechRegister&amp;parentId=${subdefinition.metaId}" label="Add a Speech Register"><img alt="Add a Speech Register" src="/lex/images/reg.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=speechRegister&amp;parentId=${subdefinition.metaId}" title="Add a Speech Register"><img alt="Add a Speech Register" src="/lex/images/reg.gif"/></a>' escapeXml="false" />
</span> </span>
</c:if> </c:if>

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

@ -7,19 +7,25 @@
<!--TERM--> <!--TERM-->
<h1><c:out value="${ sessionScope.visit.query.entry.term }" /></h1> <h1 class="tmw-block">
<c:set target="${ sessionScope.visit.helper}" property="wylie" value="${ sessionScope.visit.query.entry.term }"/>
<c:out value="${ sessionScope.visit.helper.tibetan }" escapeXml="false"/>
<span class="tmw-roman"><c:out value="${ sessionScope.visit.query.entry.term }" /></span>
</h1>
<p class="data" > <p class="data" >
<c:out value='<a name="${ sessionScope.visit.query.entry }" ></a>' escapeXml="false" /> <c:out value='<a name="${ sessionScope.visit.query.entry }" ></a>' escapeXml="false" />
<c:if test="${ editMode }"> <c:if test="${ editMode }">
<span class="compEditOptions"> <span class="compEditOptions">
<c:out value='<a href="/lex/action?cmd=getUpdateTermForm&amp;comp=term&amp;metaId=${ sessionScope.visit.query.entry.metaId }" label="Edit Term"><img alt="Edit Term" src="/lex/images/edit.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getUpdateTermForm&amp;comp=term&amp;metaId=${ sessionScope.visit.query.entry.metaId }" title="Edit Term"><img alt="Edit Term" src="/lex/images/edit.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=term&amp;metaId=${sessionScope.visit.query.entry.metaId}" label="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=term&amp;metaId=${sessionScope.visit.query.entry.metaId}" title="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=pronunciation&amp;parentId=${sessionScope.visit.query.entry.metaId}" label="Add Pronunciation"><img alt="Add Pronunciation" src="/lex/images/pron.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=pronunciation&amp;parentId=${sessionScope.visit.query.entry.metaId}" title="Add Pronunciation"><img alt="Add Pronunciation" src="/lex/images/pron.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=etymology&amp;parentId=${sessionScope.visit.query.entry.metaId}" label="Add Etymology"><img alt="Add Etymology" src="/lex/images/etym.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=etymology&amp;parentId=${sessionScope.visit.query.entry.metaId}" title="Add Etymology"><img alt="Add Etymology" src="/lex/images/etym.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=spelling&amp;parentId=${sessionScope.visit.query.entry.metaId}" label="Add Spelling"><img alt="Add Spelling" src="/lex/images/spell.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=spelling&amp;parentId=${sessionScope.visit.query.entry.metaId}" title="Add Spelling"><img alt="Add Spelling" src="/lex/images/spell.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=grammaticalFunction&amp;parentId=${sessionScope.visit.query.entry.metaId}" label="Add Grammatical Function"><img alt="Add a Grammatical Function" src="/lex/images/gram.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=grammaticalFunction&amp;parentId=${sessionScope.visit.query.entry.metaId}" title="Add Grammatical Function"><img alt="Add a Grammatical Function" src="/lex/images/gram.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=encyclopediaArticle&amp;parentId=${sessionScope.visit.query.entry.metaId}" label="Add Encyclopedia Article"><img alt="Add Encyclopedia Article" src="/lex/images/ency.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=encyclopediaArticle&amp;parentId=${sessionScope.visit.query.entry.metaId}" title="Add Encyclopedia Article"><img alt="Add Encyclopedia Article" src="/lex/images/ency.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=definition&amp;parentId=${sessionScope.visit.query.entry.metaId}" label="Add Definition"><img alt="Add Definition" src="/lex/images/def.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getInsertForm&amp;comp=definition&amp;parentId=${sessionScope.visit.query.entry.metaId}" title="Add Definition"><img alt="Add Definition" src="/lex/images/def.gif"/></a>' escapeXml="false" />
</span> </span>
</c:if> </c:if>

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

@ -11,8 +11,8 @@
<c:if test="${ editMode }"> <c:if test="${ editMode }">
<span class="compEditOptions"> <span class="compEditOptions">
<c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=transitionalData&amp;metaId=${ transitionalData.metaId }" label="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getAnnotationForm&amp;comp=transitionalData&amp;metaId=${ transitionalData.metaId }" title="Add Analytical Note"><img alt="Add Analytical Note" src="/lex/images/note.gif"/></a>' escapeXml="false" />
<c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=transitionalData&amp;metaId=${ transitionalData.metaId }" label="Edit this component"><img alt="Edit this component" src="/lex/images/edit.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=transitionalData&amp;metaId=${ transitionalData.metaId }" title="Edit this component"><img alt="Edit this component" src="/lex/images/edit.gif"/></a>' escapeXml="false" />
</span> </span>
</c:if> </c:if>

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

@ -9,8 +9,8 @@
<c:out value='<a name="${ translationEquivalent }" ></a>' escapeXml="false" /> <c:out value='<a name="${ translationEquivalent }" ></a>' escapeXml="false" />
<c:if test="${ editMode }"> <c:if test="${ editMode }">
<span class="compEditOptions"> <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" /> <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" />
<c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=translationEquivalent&amp;metaId=${ translationEquivalent.metaId }" label="Edit this translationEquivalent"><img alt="Edit this translationEquivalent" src="/lex/images/edit.gif"/></a>' escapeXml="false" /> <c:out value='<a href="/lex/action?cmd=getUpdateForm&amp;comp=translationEquivalent&amp;metaId=${ translationEquivalent.metaId }" title="Edit this translationEquivalent"><img alt="Edit this translationEquivalent" src="/lex/images/edit.gif"/></a>' escapeXml="false" />
</span> </span>
</c:if> </c:if>

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

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

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

@ -124,8 +124,8 @@
</c:forEach><!--END DEFINITIONS--> </c:forEach><!--END DEFINITIONS-->
</c:if> </c:if>
</ol> <%-- </ol>
</li> </li> --%>
</ol> </ol>

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

@ -18,6 +18,7 @@ p.data
border: none; border: none;
} }
</c:if> </c:if>
/* <%= org.thdl.tib.text.TibetanHTML.getStyles( "20" ) %> */
</style> </style>
</head> </head>
<body> <body>

7
src/jsp/jsp/menu.jsp
View file

@ -88,8 +88,11 @@
<div id="recentTerms"> <div id="recentTerms">
<c:forEach var="term" items="${applicationScope.global.recentTerms }"> <c:forEach var="term" items="${applicationScope.global.recentTerms }">
<p> <p>
<c:out value='<a href="/lex/action?cmd=displayFull&comp=term&metaId=${term.metaId}">${ term.term}</a>' escapeXml='false' /><br/> <c:set target="${ sessionScope.visit.helper}" property="wylie" value="${ term.term }"/>
Modified by <c:out value="${ applicationScope.flatData.users[ term.meta.modifiedBy ] }" /><br/> <c:set var="tib" value="${ sessionScope.visit.helper.tibetan } " />
<c:set var="wylie" value=" <span class='tmw-roman'>${ term.term }</span>" />
<c:out value='<a class="tmw-link" href="/lex/action?cmd=displayFull&comp=term&metaId=${term.metaId}">${ tib } ${ wylie }</a>' escapeXml='false' />
Modified by <c:out value="${ applicationScope.flatData.users[ term.meta.modifiedBy ] }" />
<c:set target="${ sessionScope.visit.helper }" property="date" value="${ term.meta.modifiedOn }"/> <c:set target="${ sessionScope.visit.helper }" property="date" value="${ term.meta.modifiedOn }"/>
<c:out value="${ sessionScope.visit.helper.formattedDate }" /> <c:out value="${ sessionScope.visit.helper.formattedDate }" />
</p> </p>

4
src/jsp/jsp/navLinks.jsf
View file

@ -4,10 +4,10 @@
<a href="http://iris.lib.virginia.edu/tibet/reference/dictionary.html">Dictionary Home</a> | <a href="http://iris.lib.virginia.edu/tibet/reference/dictionary.html">Dictionary Home</a> |
</li> </li>
<li> <li>
<a href="/lex/action?cmd=menu" label="Main Menu">Main Menu</a> | <a href="/lex/action?cmd=menu" title="Main Menu">Main Menu</a> |
</li> </li>
<li> <li>
<a href="/lex/action?cmd=search" label="Advanced Search">Advanced Search</a> <a href="/lex/action?cmd=search" title="Advanced Search">Advanced Search</a>
</li> </li>
<c:choose> <c:choose>