diff --git a/src/css/lex.css b/src/css/lex.css index 91d0335..6274782 100644 --- a/src/css/lex.css +++ b/src/css/lex.css @@ -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; } */ diff --git a/src/css/thdl-advanced.css b/src/css/thdl-advanced.css index b9d2825..dbbd4cd 100644 --- a/src/css/thdl-advanced.css +++ b/src/css/thdl-advanced.css @@ -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; -} +} diff --git a/src/css/thdl-styles.css b/src/css/thdl-styles.css index 85fb20f..cb7affc 100644 --- a/src/css/thdl-styles.css +++ b/src/css/thdl-styles.css @@ -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; diff --git a/src/java/org/thdl/lex/DisplayHelper.java b/src/java/org/thdl/lex/DisplayHelper.java index a68872e..48760ce 100644 --- a/src/java/org/thdl/lex/DisplayHelper.java +++ b/src/java/org/thdl/lex/DisplayHelper.java @@ -269,7 +269,7 @@ public class DisplayHelper */ public String getTibetan() { - return TibetanHTML.getHTMLX( getWylie() ); + return TibetanHTML.getHTML( getWylie() ); } diff --git a/src/java/org/thdl/lex/LexActionServlet.java b/src/java/org/thdl/lex/LexActionServlet.java index b6a98e3..720c94e 100644 --- a/src/java/org/thdl/lex/LexActionServlet.java +++ b/src/java/org/thdl/lex/LexActionServlet.java @@ -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" ) ); diff --git a/src/jsp/jsp/displayPassage.jsf b/src/jsp/jsp/displayPassage.jsf index 5ec0998..4eb7548 100644 --- a/src/jsp/jsp/displayPassage.jsf +++ b/src/jsp/jsp/displayPassage.jsf @@ -33,11 +33,17 @@ - + +
- - +
+ + Wylie conversion error: + + +
+ diff --git a/src/jsp/jsp/displayTerm.jsf b/src/jsp/jsp/displayTerm.jsf index 4ce9ad4..bc2c5fd 100644 --- a/src/jsp/jsp/displayTerm.jsf +++ b/src/jsp/jsp/displayTerm.jsf @@ -9,7 +9,12 @@

+ + + + Wylie conversion error: +

diff --git a/src/jsp/jsp/displayTreeToc.jsf b/src/jsp/jsp/displayTreeToc.jsf index 5ac398e..5fbe5bb 100644 --- a/src/jsp/jsp/displayTreeToc.jsf +++ b/src/jsp/jsp/displayTreeToc.jsf @@ -10,13 +10,6 @@
    - - - - - - - @@ -124,6 +117,14 @@ + + + + + + + + <%--
--%> diff --git a/src/jsp/jsp/menu.jsp b/src/jsp/jsp/menu.jsp index c49d85d..4198dbd 100644 --- a/src/jsp/jsp/menu.jsp +++ b/src/jsp/jsp/menu.jsp @@ -87,14 +87,16 @@

Recently Modified Terms

-

+

+ Modified by +