Made changes to css to prevent IE 6 from redrawing tibetan script and ruining it.

This commit is contained in:
dubtraxis 2003-10-23 16:52:02 +00:00
parent 26f03259cf
commit 23e84f4c89
9 changed files with 106 additions and 39 deletions

View file

@ -87,30 +87,60 @@ margin-left: 0 !important;
padding-left: 0 !important;
}
div.tmw-block
div.tmw-block, h1.tmw-block, p.tmw-block
{
margin-top: 1ex !important;
text-align: left !important;
/* border: solid 2px red; */
}
span
.tmw-block span
{
/* border: solid 1px red; */
/* vertical-align: middle; */
}
span.tmw-roman
{
/* margin-top: 1ex;
padding-top: 1ex; */
}
span.tmw {font: 24pt TibetanMachineWeb !important; text-transform: none; }
span.tmw1 {font: 24pt TibetanMachineWeb1 !important; text-transform: none; }
span.tmw2 {font: 24pt TibetanMachineWeb2 !important; text-transform: none; }
span.tmw3 {font: 24pt TibetanMachineWeb3 !important; text-transform: none; }
span.tmw4 {font: 24pt TibetanMachineWeb4 !important; text-transform: none; }
span.tmw5 {font: 24pt TibetanMachineWeb5 !important; text-transform: none; }
span.tmw6 {font: 24pt TibetanMachineWeb6 !important; text-transform: none; }
span.tmw7 {font: 24pt TibetanMachineWeb7 !important; text-transform: none; }
span.tmw8 {font: 24pt TibetanMachineWeb8 !important; text-transform: none; }
span.tmw9 {font: 24pt TibetanMachineWeb9 !important; text-transform: none; }
/* The following child selectors hide this css from IE 6 and lower which can't re-position without screwing up the drawing of the fonts*/
.tmw-block>span.tmw-roman
{
vertical-align: sub;
color: green;
}
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;}
span.tmw {font: 24pt TibetanMachineWeb !important; text-transform: none; }
span.tmw1 {font: 24pt TibetanMachineWeb1 !important; text-transform: none; }
span.tmw2 {font: 24pt TibetanMachineWeb2 !important; text-transform: none; }
span.tmw3 {font: 24pt TibetanMachineWeb3 !important; text-transform: none; }
span.tmw4 {font: 24pt TibetanMachineWeb4 !important; text-transform: none; }
span.tmw5 {font: 24pt TibetanMachineWeb5 !important; text-transform: none; }
span.tmw6 {font: 24pt TibetanMachineWeb6 !important; text-transform: none; }
span.tmw7 {font: 24pt TibetanMachineWeb7 !important; text-transform: none; }
span.tmw8 {font: 24pt TibetanMachineWeb8 !important; text-transform: none; }
span.tmw9 {font: 24pt TibetanMachineWeb9 !important; text-transform: none; }
h1 span.tmw-roman { top: 0pt; }
h1 span.tmw {font-size: 32pt !important; top: -8pt;}
@ -145,4 +175,4 @@ 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; }
li span.tmw9 {font-size: 20pt !important; } */

View file

@ -121,11 +121,19 @@ border-bottom: solid 1px silver;
border-right: solid 1px silver;
}
#main {
width: 96%;
margin: 2px 1% 10px 1%;
background-color : #ffffff;
}
#main {
/* width: 800px; */
margin: 2px 0 10px 0;
/*background-color : #ffffff; */
}
body>#main {
margin-top: 6px;
@ -139,9 +147,10 @@ width:200px;
}
#columnCenter {
background:#fff;
font-size: 1em;
margin-left: 216px;
margin-right:210px;
margin-right:216px;
}
#columnRight {
@ -149,7 +158,7 @@ position: absolute;
right:10px;
top:82px;
width:200px;
margin-right: 10px;
margin-right: 0;
margin-top: 0px;
}
@ -163,7 +172,7 @@ margin-right: 10px;
max-width: 700px;
min-width: 10px;
text-align: justify;
}
}
#main p.illustratedBlurb
{
@ -184,6 +193,20 @@ text-align: justify;
text-align: left;
}
.low-emph, .low-emph * {
color: gray;
text-decoration: none !important;
@ -283,7 +306,6 @@ color: #FFFFFF;
.selected {
margin: 0px;
font-size: 1em;
/*font-style: italic;*/
font-weight: 900;
color: #009933;
background-color: #ffff99;
@ -360,4 +382,4 @@ img.text-illustration
{
margin: 8px 8px 8px 8px;
float: right;
}
}

View file

@ -10,8 +10,8 @@ Element Selectors
---------------*/
body {
margin:0;
padding:0;
margin:0 0 0 0;
padding:0 0 0 0;
color: #000033;
background-color: #FFFFFF;
font-size: small;

View file

@ -269,7 +269,7 @@ public class DisplayHelper
*/
public String getTibetan()
{
return TibetanHTML.getHTMLX( getWylie() );
return TibetanHTML.getHTML( getWylie() );
}

View file

@ -180,6 +180,7 @@ public class LexActionServlet extends HttpServlet
HashMap commands = new HashMap();
commands.put( "menu", new NullCommand( "menu.jsp" ) );
commands.put( "search", new NullCommand( "search.jsp" ) );
commands.put( "logout", new NullCommand( "logout.jsp" ) );
commands.put( "getMetaPrefsForm", new NullCommand( "metaPrefsForm.jsp" ) );
commands.put( "getMetaDefaultsForm", new NullCommand( "metaDefaultsForm.jsp" ) );

View file

@ -33,11 +33,17 @@
</c:if>
<!--<span class="label">Passage:</span>-->
<c:set target="${ sessionScope.visit.helper}" property="wylie" value="${ passage.passage }"/>
<c:set target="${ sessionScope.visit.helper}" property="wylie" value="${ passage.passage }"/>
<c:catch var="exception">
<c:set var="tib" value="${ sessionScope.visit.helper.tibetan } " />
<div class="tmw-block"><c:out value="${ tib }" escapeXml="false" /></div>
</c:catch>
<c:if test="${ ! empty exception }">
<span class="error-info">Wylie conversion error: <c:out value="${ exception }"/></span>
</c:if>
<div class="tmw-block"><c:out value="${ passage.passage }" /></div>
<!--metadata-->
<jsp:include page="displayMeta.jsf" />

View file

@ -9,7 +9,12 @@
<!--TERM-->
<h1 class="tmw-block">
<c:set target="${ sessionScope.visit.helper}" property="wylie" value="${ sessionScope.visit.query.entry.term }"/>
<c:catch var="exception">
<c:out value="${ sessionScope.visit.helper.tibetan }" escapeXml="false"/>
</c:catch>
<c:if test="${ ! empty exception }">
<span class="error-info">Wylie conversion error: <c:out value="${ exception }"/></span>
</c:if>
<span class="tmw-roman"><c:out value="${ sessionScope.visit.query.entry.term }" /></span>
</h1>

View file

@ -10,13 +10,6 @@
<ol>
<!--TRANSITIONAL DATA-->
<c:set value="${sessionScope.visit.query.entry.transitionalData}" target="${sessionScope.visit.helper}" property="collection"/>
<c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
<c:out value='<li><a href="#${sessionScope.visit.query.entry.transitionalData}">Special Guests</a></li>' escapeXml='false' />
<c:forEach var="transitionalData" items="${ sessionScope.visit.query.entry.transitionalData }"></c:forEach>
</c:if>
<!--PRONUNCIATION-->
<c:set value="${sessionScope.visit.query.entry.pronunciations}" target="${sessionScope.visit.helper}" property="collection"/>
<c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
@ -124,6 +117,14 @@
</c:forEach><!--END DEFINITIONS-->
</c:if>
<!--TRANSITIONAL DATA-->
<c:set value="${sessionScope.visit.query.entry.transitionalData}" target="${sessionScope.visit.helper}" property="collection"/>
<c:if test="${ sessionScope.visit.helper.collectionSize > 0 }">
<c:out value='<li><a href="#${sessionScope.visit.query.entry.transitionalData}">Other Dictionaries</a></li>' escapeXml='false' />
<c:forEach var="transitionalData" items="${ sessionScope.visit.query.entry.transitionalData }"></c:forEach>
</c:if>
<%-- </ol>
</li> --%>

View file

@ -87,14 +87,16 @@
<h2>Recently Modified Terms</h2>
<div id="recentTerms">
<c:forEach var="term" items="${applicationScope.global.recentTerms }">
<p>
<p class="tmw-block">
<c:set target="${ sessionScope.visit.helper}" property="wylie" value="${ term.term }"/>
<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' />
<span class="tmw-roman">
Modified by <c:out value="${ applicationScope.flatData.users[ term.meta.modifiedBy ] }" />
<c:set target="${ sessionScope.visit.helper }" property="date" value="${ term.meta.modifiedOn }"/>
<c:out value="${ sessionScope.visit.helper.formattedDate }" />
</span>
</p>
</c:forEach>
</div><!--END RECENT TERMS-->