From 81a2b8ede55c678a4f7a25c0eb1f8d22c1572c31 Mon Sep 17 00:00:00 2001 From: dubtraxis Date: Thu, 23 Oct 2003 22:11:50 +0000 Subject: [PATCH] Made many small layout tweaks like list-style-types, etc. --- src/css/lex-advanced.css | 7 +- src/css/lex.css | 157 +++++++------------ src/java/org/thdl/lex/DisplayHelper.java | 22 +++ src/jsp/jsp/displayDefinition.jsf | 10 +- src/jsp/jsp/displayEncyclopediaArticle.jsf | 6 +- src/jsp/jsp/displayEntry.jsp | 38 ++++- src/jsp/jsp/displayEtymology.jsf | 18 +-- src/jsp/jsp/displayFunction.jsf | 6 +- src/jsp/jsp/displayKeyword.jsf | 6 +- src/jsp/jsp/displayMeta.jsf | 2 +- src/jsp/jsp/displayModelSentence.jsf | 10 +- src/jsp/jsp/displayNotes.jsf | 5 +- src/jsp/jsp/displayPassage.jsf | 21 ++- src/jsp/jsp/displayPronunciation.jsf | 12 +- src/jsp/jsp/displayRegister.jsf | 6 +- src/jsp/jsp/displayRelatedTerm.jsf | 6 +- src/jsp/jsp/displaySpelling.jsf | 8 +- src/jsp/jsp/displaySubdefinition.jsf | 10 +- src/jsp/jsp/displayTerm.jsf | 11 +- src/jsp/jsp/displayTransitionalData.jsf | 8 +- src/jsp/jsp/displayTranslationEquivalent.jsf | 6 +- src/jsp/jsp/displayTree.jsf | 98 ++++++------ src/jsp/jsp/displayTreeToc.jsf | 7 +- 23 files changed, 248 insertions(+), 232 deletions(-) diff --git a/src/css/lex-advanced.css b/src/css/lex-advanced.css index b3fce98..72fdcca 100644 --- a/src/css/lex-advanced.css +++ b/src/css/lex-advanced.css @@ -37,7 +37,7 @@ margin-top: 2px; #termChildren, #defChildren, #subdefChildren { } -#columnLeft select, #columnLeft input +#columnLeft select, #columnLeft input, #columnRight select, #columnRight input { width: 120px; } @@ -62,7 +62,7 @@ margin: 5px 5px 5px 5px; ul.navLinks { list-style-type: none; - margin: 0 0 0 0 !important; + margin: 0 0 0 6px !important; padding: 0 0 0 0; } ul.navLinks li @@ -103,9 +103,10 @@ margin-right: 0; margin-bottom: 0; } -.data img +a.meta img, .data img { margin-right: 2px; +vertical-align: middle; } .metadata diff --git a/src/css/lex.css b/src/css/lex.css index 67739cb..80ed6a9 100644 --- a/src/css/lex.css +++ b/src/css/lex.css @@ -15,77 +15,75 @@ h1 text-transform: none; } -li, ol, ul -{ - padding: 0 1em 0 1em; - margin-top: 0; - border-width: 0px; -} -li -{ - border-color: green; -} - -ol -{ - border-color: red; -} - -ul -{ - border-color: blue; -} - - -li -{ - margin-left: 1em !important; - padding: 0; -} - ol { -list-style-type: upper-roman; +list-style-type: none; +} +ol ol +{ +list-style-type: decimal; } -#entry ol, #entry ul, #entry li +ol ol ol { -clear: right; -margin-right: 0 !important; -padding-right: 0 !important; -} +list-style-type: lower-alpha; +} +ol ol ol ol +{ +list-style-type: none; +} #results ol { - list-style-type: decimal; +list-style-type: decimal; } ol.notes { list-style-type: lower-roman; } -ol ol -{ -list-style-type: upper-alpha; -margin-left: 0 !important; -} -ol ol ol -{ -list-style-type: decimal; -margin-left: 0 !important; -} - -ol ul, ol ol ul, ol ol ol ul +ul { list-style-type: disc; -margin-left: 0 !important; } -ol ul li, ol ol ul li, ol ol ol ul li +ol, ul, li { -margin-left: 0 !important; +clear: right; +margin-right: 0 !important; +padding-right: 0 !important; +margin-left: 2px !important; padding-left: 0 !important; } +#results ol +{ + margin-left: 30px !important; +} +li +{ + margin-left: 0 !important; +} + +/* #entry ol +{ + + border: solid 2px black; +} + +#entry li ol +{ + border: solid 2px yellow; +} +#entry li +{ + border: solid 2px red; +} */ +li li +{ + margin-left: 25px !important; + /* border: solid 2px blue; */ +} + div.tmw-block, h1.tmw-block, p.tmw-block { @@ -116,6 +114,17 @@ span.tmw7 {font: 24pt TibetanMachineWeb7 !important; text-transform: none; } span.tmw8 {font: 24pt TibetanMachineWeb8 !important; text-transform: none; } span.tmw9 {font: 24pt TibetanMachineWeb9 !important; text-transform: none; } +h1 span.tmw {font-size: 32pt !important; } +h1 span.tmw1 {font-size: 32pt !important; } +h1 span.tmw2 {font-size: 32pt !important; } +h1 span.tmw3 {font-size: 32pt !important; } +h1 span.tmw4 {font-size: 32pt !important; } +h1 span.tmw5 {font-size: 32pt !important; } +h1 span.tmw6 {font-size: 32pt !important; } +h1 span.tmw7 {font-size: 32pt !important; } +h1 span.tmw8 {font-size: 32pt !important; } +h1 span.tmw9 {font-size: 32pt !important; } + /* The following child selectors hide this css from IE 6 and lower which can't re-position without screwing up the drawing of the fonts*/ .tmw-block>span.tmw-roman, a>span.tmw-roman { @@ -127,51 +136,3 @@ a.tmw-link:hover background-color: inherit; } - -/* -span.tmw-roman {position: relative; top: 0pt; padding-left: .25em;} -span.tmw {font: 24pt TibetanMachineWeb !important; text-transform: none; } -span.tmw1 {font: 24pt TibetanMachineWeb1 !important; text-transform: none; } -span.tmw2 {font: 24pt TibetanMachineWeb2 !important; text-transform: none; } -span.tmw3 {font: 24pt TibetanMachineWeb3 !important; text-transform: none; } -span.tmw4 {font: 24pt TibetanMachineWeb4 !important; text-transform: none; } -span.tmw5 {font: 24pt TibetanMachineWeb5 !important; text-transform: none; } -span.tmw6 {font: 24pt TibetanMachineWeb6 !important; text-transform: none; } -span.tmw7 {font: 24pt TibetanMachineWeb7 !important; text-transform: none; } -span.tmw8 {font: 24pt TibetanMachineWeb8 !important; text-transform: none; } -span.tmw9 {font: 24pt TibetanMachineWeb9 !important; text-transform: none; } - -h1 span.tmw-roman { top: 0pt; } -h1 span.tmw {font-size: 32pt !important; top: -8pt;} -h1 span.tmw1 {font-size: 32pt !important; top: -8pt;} -h1 span.tmw2 {font-size: 32pt !important; top: -8pt;} -h1 span.tmw3 {font-size: 32pt !important; top: -8pt;} -h1 span.tmw4 {font-size: 32pt !important; top: -8pt;} -h1 span.tmw5 {font-size: 32pt !important; top: -8pt;} -h1 span.tmw6 {font-size: 32pt !important; top: -8pt;} -h1 span.tmw7 {font-size: 32pt !important; top: -8pt;} -h1 span.tmw8 {font-size: 32pt !important; top: -8pt;} -h1 span.tmw9 {font-size: 32pt !important; top: -8pt;} - -p span.tmw {font-size: 20pt !important; } -p span.tmw1 {font-size: 20pt !important; } -p span.tmw2 {font-size: 20pt !important; } -p span.tmw3 {font-size: 20pt !important; } -p span.tmw4 {font-size: 20pt !important; } -p span.tmw5 {font-size: 20pt !important; } -p span.tmw6 {font-size: 20pt !important; } -p span.tmw7 {font-size: 20pt !important; } -p span.tmw8 {font-size: 20pt !important; } -p span.tmw9 {font-size: 20pt !important; } - - -li span.tmw {font-size: 20pt !important; } -li span.tmw1 {font-size: 20pt !important; } -li span.tmw2 {font-size: 20pt !important; } -li span.tmw3 {font-size: 20pt !important; } -li span.tmw4 {font-size: 20pt !important; } -li span.tmw5 {font-size: 20pt !important; } -li span.tmw6 {font-size: 20pt !important; } -li span.tmw7 {font-size: 20pt !important; } -li span.tmw8 {font-size: 20pt !important; } -li span.tmw9 {font-size: 20pt !important; } */ diff --git a/src/java/org/thdl/lex/DisplayHelper.java b/src/java/org/thdl/lex/DisplayHelper.java index 48760ce..ff749a3 100644 --- a/src/java/org/thdl/lex/DisplayHelper.java +++ b/src/java/org/thdl/lex/DisplayHelper.java @@ -314,6 +314,28 @@ public class DisplayHelper } + /** + * Gets the hashCode attribute of the DisplayHelper object + * + * @return The hashCode value + */ + public int getHashCodeForComponent() + { + return getComponent().hashCode(); + } + + + /** + * Gets the hashCodeForCollection attribute of the DisplayHelper object + * + * @return The hashCodeForCollection value + */ + public int getHashCodeForCollection() + { + return getCollection().hashCode(); + } + + /** *Constructor for the DisplayHelper object */ diff --git a/src/jsp/jsp/displayDefinition.jsf b/src/jsp/jsp/displayDefinition.jsf index fc22047..4606579 100644 --- a/src/jsp/jsp/displayDefinition.jsf +++ b/src/jsp/jsp/displayDefinition.jsf @@ -7,7 +7,7 @@

- + @@ -22,13 +22,13 @@ - + - + @@ -39,13 +39,13 @@ - + - + diff --git a/src/jsp/jsp/displayEncyclopediaArticle.jsf b/src/jsp/jsp/displayEncyclopediaArticle.jsf index c13b179..f78b537 100644 --- a/src/jsp/jsp/displayEncyclopediaArticle.jsf +++ b/src/jsp/jsp/displayEncyclopediaArticle.jsf @@ -3,7 +3,7 @@

- + @@ -14,11 +14,11 @@ - + - +

diff --git a/src/jsp/jsp/displayEntry.jsp b/src/jsp/jsp/displayEntry.jsp index 52f9f62..790fd9f 100644 --- a/src/jsp/jsp/displayEntry.jsp +++ b/src/jsp/jsp/displayEntry.jsp @@ -10,6 +10,30 @@
+
+
+

Quick Search

+

+ + + Term: + +
+ Find: + + +

+ +

+ +

+
+
+

Search Results

    @@ -60,29 +84,29 @@ - - + + - - + + - - + + - + diff --git a/src/jsp/jsp/displayEtymology.jsf b/src/jsp/jsp/displayEtymology.jsf index 043d2fe..70a36c1 100644 --- a/src/jsp/jsp/displayEtymology.jsf +++ b/src/jsp/jsp/displayEtymology.jsf @@ -7,7 +7,7 @@

    - + @@ -17,14 +17,15 @@ -
    -
    + ; -
    + ;     + + <%-- Derivation: --%> @@ -32,14 +33,11 @@ - - - - +

    Translations

    @@ -62,7 +60,7 @@
    - + @@ -74,7 +72,7 @@ - +

    diff --git a/src/jsp/jsp/displayFunction.jsf b/src/jsp/jsp/displayFunction.jsf index 6f4468b..5901858 100644 --- a/src/jsp/jsp/displayFunction.jsf +++ b/src/jsp/jsp/displayFunction.jsf @@ -9,17 +9,17 @@ - + - + - +

    diff --git a/src/jsp/jsp/displayKeyword.jsf b/src/jsp/jsp/displayKeyword.jsf index 8f15918..45e9f85 100644 --- a/src/jsp/jsp/displayKeyword.jsf +++ b/src/jsp/jsp/displayKeyword.jsf @@ -6,7 +6,7 @@

    - + @@ -17,12 +17,12 @@ - + - + diff --git a/src/jsp/jsp/displayMeta.jsf b/src/jsp/jsp/displayMeta.jsf index 2096ad0..1b62d3b 100644 --- a/src/jsp/jsp/displayMeta.jsf +++ b/src/jsp/jsp/displayMeta.jsf @@ -6,7 +6,7 @@ -
    +<%--
    --%> view metadata diff --git a/src/jsp/jsp/displayModelSentence.jsf b/src/jsp/jsp/displayModelSentence.jsf index 5d3212a..f58f006 100644 --- a/src/jsp/jsp/displayModelSentence.jsf +++ b/src/jsp/jsp/displayModelSentence.jsf @@ -6,7 +6,7 @@

    - + @@ -20,13 +20,13 @@ - + - + @@ -45,7 +45,7 @@ - + @@ -57,7 +57,7 @@ - + diff --git a/src/jsp/jsp/displayNotes.jsf b/src/jsp/jsp/displayNotes.jsf index 4767aa8..1115058 100644 --- a/src/jsp/jsp/displayNotes.jsf +++ b/src/jsp/jsp/displayNotes.jsf @@ -1,9 +1,10 @@ <%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%> <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> - + +

    Notes

    @@ -13,7 +14,7 @@ - + diff --git a/src/jsp/jsp/displayPassage.jsf b/src/jsp/jsp/displayPassage.jsf index 4eb7548..ebf135c 100644 --- a/src/jsp/jsp/displayPassage.jsf +++ b/src/jsp/jsp/displayPassage.jsf @@ -6,7 +6,7 @@

    - + @@ -36,21 +36,26 @@ -

    + +
    +     + - Wylie conversion error: + Wylie conversion error (view source for details) + + -
    +
    - + - +

    Translations

    @@ -81,7 +86,7 @@ <%--     --%> - + @@ -94,7 +99,7 @@ - + diff --git a/src/jsp/jsp/displayPronunciation.jsf b/src/jsp/jsp/displayPronunciation.jsf index 246722d..477d6ab 100644 --- a/src/jsp/jsp/displayPronunciation.jsf +++ b/src/jsp/jsp/displayPronunciation.jsf @@ -7,7 +7,7 @@

    - + @@ -15,17 +15,17 @@ - -
    - + ; + + + - - +

    diff --git a/src/jsp/jsp/displayRegister.jsf b/src/jsp/jsp/displayRegister.jsf index c3e02ea..1e2eadb 100644 --- a/src/jsp/jsp/displayRegister.jsf +++ b/src/jsp/jsp/displayRegister.jsf @@ -6,7 +6,7 @@

    - + @@ -18,11 +18,11 @@ - + - +

    diff --git a/src/jsp/jsp/displayRelatedTerm.jsf b/src/jsp/jsp/displayRelatedTerm.jsf index 49cbe96..0f5fc7b 100644 --- a/src/jsp/jsp/displayRelatedTerm.jsf +++ b/src/jsp/jsp/displayRelatedTerm.jsf @@ -5,7 +5,7 @@

    - + @@ -19,12 +19,12 @@ - + - + diff --git a/src/jsp/jsp/displaySpelling.jsf b/src/jsp/jsp/displaySpelling.jsf index 5c3e421..dccff88 100644 --- a/src/jsp/jsp/displaySpelling.jsf +++ b/src/jsp/jsp/displaySpelling.jsf @@ -10,18 +10,18 @@ - + -
    + - + - +

    diff --git a/src/jsp/jsp/displaySubdefinition.jsf b/src/jsp/jsp/displaySubdefinition.jsf index 19f3110..567b540 100644 --- a/src/jsp/jsp/displaySubdefinition.jsf +++ b/src/jsp/jsp/displaySubdefinition.jsf @@ -7,7 +7,7 @@

    - + @@ -28,12 +28,12 @@ - + - + @@ -45,13 +45,13 @@ - + - + diff --git a/src/jsp/jsp/displayTerm.jsf b/src/jsp/jsp/displayTerm.jsf index bc2c5fd..0f4c3b1 100644 --- a/src/jsp/jsp/displayTerm.jsf +++ b/src/jsp/jsp/displayTerm.jsf @@ -15,11 +15,13 @@ Wylie conversion error: -

    - + + + + @@ -34,11 +36,6 @@ - - - - -

    diff --git a/src/jsp/jsp/displayTransitionalData.jsf b/src/jsp/jsp/displayTransitionalData.jsf index c318e5f..df4bf65 100644 --- a/src/jsp/jsp/displayTransitionalData.jsf +++ b/src/jsp/jsp/displayTransitionalData.jsf @@ -7,7 +7,7 @@

    - + @@ -21,11 +21,11 @@ - + - - + +

    diff --git a/src/jsp/jsp/displayTranslationEquivalent.jsf b/src/jsp/jsp/displayTranslationEquivalent.jsf index db15869..7a47979 100644 --- a/src/jsp/jsp/displayTranslationEquivalent.jsf +++ b/src/jsp/jsp/displayTranslationEquivalent.jsf @@ -6,7 +6,7 @@

    - + @@ -19,12 +19,12 @@ - + - + diff --git a/src/jsp/jsp/displayTree.jsf b/src/jsp/jsp/displayTree.jsf index de51228..a15051d 100644 --- a/src/jsp/jsp/displayTree.jsf +++ b/src/jsp/jsp/displayTree.jsf @@ -14,17 +14,17 @@

      - +
    1. - +

      Pronunciations

      • - +
        • @@ -32,17 +32,17 @@ - +
      • - +

        Etymologies

        • - +
          • @@ -50,17 +50,17 @@ - +
        • - +

          Spellings

          • - +
            • @@ -68,17 +68,17 @@ - +
          • - +

            Functions

            • - +
              • @@ -86,17 +86,17 @@ - +
            • - +

              Encyclopedia Articles

              • - +
                • @@ -104,42 +104,43 @@ - -
              • - -

                Definitions

                - - +
              • +

                Definitions

                + +
                  + +
                1. + <%--

                  --%> - + - + - +
                  1. - +
                      - +
                    1. - +

                      Keywords

                      • - +
                        • @@ -147,17 +148,17 @@ - +
                      • - +

                        Model Sentences

                        • - +
                          • @@ -165,17 +166,17 @@ - +
                        • - +

                          Translation Equivalents

                          • - +
                            • @@ -183,17 +184,17 @@ - +
                          • - +

                            RelatedTerm

                            • - +
                              • @@ -201,17 +202,17 @@ - +
                            • - +

                              Passages

                              • - +
                                • @@ -219,18 +220,18 @@ - +
                              • - +

                                Registers

                                • - +
                                  • @@ -245,22 +246,23 @@
                    - - +
                    2. +                     +
                  2. - +
                2. - +

                  Other Dictionaries

                  • - +
                    • diff --git a/src/jsp/jsp/displayTreeToc.jsf b/src/jsp/jsp/displayTreeToc.jsf index 5fbe5bb..2e46a5a 100644 --- a/src/jsp/jsp/displayTreeToc.jsf +++ b/src/jsp/jsp/displayTreeToc.jsf @@ -48,6 +48,9 @@ +
                  • + +
                    1. @@ -80,7 +83,7 @@ - + @@ -115,6 +118,8 @@
                      2. +
                    +
                    •