From 948352a7fb2907b0cc3f074d95ce6a8613231d4d Mon Sep 17 00:00:00 2001 From: dubtraxis Date: Mon, 20 Oct 2003 18:16:33 +0000 Subject: [PATCH] Made layout changes in displayTree.jsf and CSS adjustments. --- src/css/lex-advanced.css | 22 +- src/css/lex-full-advanced.css | 237 ------------------- src/css/lex-full.css | 11 - src/css/lex.css | 71 ++++++ src/java/org/thdl/lex/LexActionServlet.java | 1 + src/jsp/jsp/displayDefinition.jsf | 9 +- src/jsp/jsp/displayEncyclopediaArticle.jsf | 40 ++-- src/jsp/jsp/displayEntry.jsp | 17 +- src/jsp/jsp/displayEtymology.jsf | 46 ++-- src/jsp/jsp/displayFunction.jsf | 47 ++-- src/jsp/jsp/displayKeyword.jsf | 7 +- src/jsp/jsp/displayModelSentence.jsf | 25 +- src/jsp/jsp/displayNotes.jsf | 12 +- src/jsp/jsp/displayPassage.jsf | 75 ++++-- src/jsp/jsp/displayPronunciation.jsf | 11 +- src/jsp/jsp/displayRegister.jsf | 10 +- src/jsp/jsp/displayRelatedTerm.jsf | 6 +- src/jsp/jsp/displaySpelling.jsf | 43 ++-- src/jsp/jsp/displaySubdefinition.jsf | 9 +- src/jsp/jsp/displayTerm.jsf | 2 +- src/jsp/jsp/displayTransitionalData.jsf | 7 +- src/jsp/jsp/displayTranslationEquivalent.jsf | 9 +- src/jsp/jsp/displayTree.jsf | 181 +++++++++++--- src/jsp/jsp/displayTreeToc.jsf | 23 +- src/jsp/jsp/header.jsf | 8 + src/jsp/jsp/passageForm.jsf | 2 +- 26 files changed, 481 insertions(+), 450 deletions(-) delete mode 100644 src/css/lex-full-advanced.css delete mode 100644 src/css/lex-full.css diff --git a/src/css/lex-advanced.css b/src/css/lex-advanced.css index 925e72f..7455c5e 100644 --- a/src/css/lex-advanced.css +++ b/src/css/lex-advanced.css @@ -17,6 +17,13 @@ { padding: 0; } + +#helper +{ + background-color: #99ccff; + border: solid 1px gray; + padding: 2px 0 2px 2px; +} #entry { } @@ -25,8 +32,9 @@ { } -#columnMain textarea +#columnCenter p { + text-align: justify; } #newCompForm, #preferencesForm @@ -78,7 +86,7 @@ margin-bottom: 0; margin-right: 2px; } -.metadata, .translation, .analysis +.metadata { display: none; margin-left: 1.5em; @@ -102,17 +110,17 @@ background-color: white; color: #003366; } -p.data a:link span.metadata, p.data a:link span.translation, p.data a:link span.analysis +p.data a:link span.metadata { display: none; } -p.data a:visited span.metadata, p.data a:visited span.translation, p.data a:visited span.analysis +p.data a:visited span.metadata { display: none; } -p.data a:hover span.metadata, p.data a:hover span.translation, p.data a:hover span.analysis +p.data a:hover span.metadata { text-decoration: none !important; position: absolute; @@ -125,10 +133,10 @@ text-align:left; display: block; } -p.data a:hover span.translation span.metadata, p.data a:hover span.analysis span.metadata +/* p.data a:hover span.translation span.metadata, p.data a:hover span.analysis span.metadata { width: 300px; -} +} */ /* END OF CSS*/ diff --git a/src/css/lex-full-advanced.css b/src/css/lex-full-advanced.css deleted file mode 100644 index 52473ed..0000000 --- a/src/css/lex-full-advanced.css +++ /dev/null @@ -1,237 +0,0 @@ -/* ID Selectors */ -#header -{ -position: absolute; -top: 80px; -left: 0px; -width: 98%; -height: 25px; -margin-top: 10px; -margin-left: 5px; -background-color: #ffffff; -color:gray; -font-size:.9em; -border-left:1px solid #000; -border-right:1px solid #000; -border-top:1px solid #000; -padding: 3px 0 0 3px; -} - -#label p -{ - color:white; -} - -#label -{ -position: absolute; -top: 115px; -left: 0px; -margin-left: 5px; -width: 98%; -height: 25px; -background-color: #666666; -color:white; -font-size:.9em; -border-left:1px solid #000; -border-right:1px solid #000; -border-top:1px solid #000; -padding: 3px 0 0 3px; -} - -#message -{ -position: absolute; -top: 140px; -left: 0px; -margin-left: 5px; -width: 98%; -height: 25px; -font-size:.9em; -background-color: #999999; -border-left:1px solid #000; -border-right:1px solid #000; -border-top:1px solid #000; -padding: 3px 0 0 3px; - -} - -#columnSingle -{ -position:absolute; -top:166px; -left: 0; -margin-left: 5px; -padding-bottom:10px; -width: 98%; -background-color: white; -border:1px solid #000; -padding: 3px 0 0 3px; -} - -#columnSingle #menu -{ -float:right; -border-left:1px solid #000; -border-bottom:1px solid #000; -width: 230px; -background:#eee; -margin:0px 0px 10px 10px; -padding-top: 5px; -padding-bottom: 5px; -} - -#columnSingle form, #columnSingle h1 -{ -margin:5px 5px 5px 5px; -} - -#menu > form -{ -border-left: 0; -border-bottom: 0; -margin-left:10px; -} - -#termChildren, #defChildren, #subdefChildren -{ -margin-left: 35px; -margin-right: 0; -} - -#columnMain textarea -{ -border: black solid 1px; -} - -#debug -{ -display: none; -position: absolute; -top: 0; -margin-left: 105%; -font-size:.8em; -width: 60%; -height: auto; -z-index: 4; -background-color: white; -} - -#debug table -{ -position:absolute; -top: 0px; -left: 0px; -width: 100%; -border: black solid 2px; -color: black; -background-color: cyan; -margin: 0 0 15px 0;} - -#debug th, #debug td -{ -border-collapse: collapse; -border-spacing: 0; -background-color: cyan; -font-size: .9em; -text-align: left; -vertical-align: top; -margin: 0; -} - -#debug h3 -{ - background-color: #99ccff; -} - -#backButton -{ -float:right; -margin-right: 25px; -margin-top: 25px; -} - -#newCompForm, #preferencesForm -{ -background-color: #99ccff; -border: black solid 1px; -margin: 8px 8px 8px 8px !important; -} - -#newCompForm input, select, textarea -{ -margin: 5px 5px 5px 5px; -} - -/* Class Selectors.*/ -.label -{ -font-weight: bold; -} - -.compEditOptions -{ -padding: 0; -} - -.data -{ -border-top: 1px solid silver; -padding-top: 6px; -margin-left: 0; -margin-right: 0; -margin-top: 0; -margin-bottom: 0; -} - -#columnSingle > p.data -{ - margin-left: 3px; -} -.data img -{ -margin-right: 2px; -} - -.metadata, .translation, .analysis -{ -display: block; -/* font-size: .75em; */ -margin-left: 1.5em; -/* margin-top: .5em; */ -color: black; -} - -.data input -{ - font-size: .9em; - padding: 0px; -} - -/* CSS Rollovers */ - -p.data a:hover -{ -/* -Don't Remove bgcolor and color or rollover will not work on IE Windows -These CSS Rollovers do not work on IE Mac. but they do work on Mozilla Mac -*/ -text-decoration: none; -background-color: white; -/* color: #003366; */ -} - -p.data img -{ - display: none; -} - -.translation, .analysis -{ - color: black; -} - - -/* TEMP WORK/TESTING AREA */ - -/* END OF CSS*/ diff --git a/src/css/lex-full.css b/src/css/lex-full.css deleted file mode 100644 index 15440a6..0000000 --- a/src/css/lex-full.css +++ /dev/null @@ -1,11 +0,0 @@ -@import url( "http://iris.lib.virginia.edu/tibet/style/thdl-styles.css" ); -@import url( "lex-full-advanced.css" ); - -/* Element Selectors */ - -#main * -{ /*--------- '*' = everything -------------*/ -font-family: 'Arial Unicode MS', 'TITUS Cyberbit Basic', 'Lucida Grande', sans-serif !important; -} - - diff --git a/src/css/lex.css b/src/css/lex.css index f12d5c1..b4d49bf 100644 --- a/src/css/lex.css +++ b/src/css/lex.css @@ -9,3 +9,74 @@ font-family: 'Arial Unicode MS', 'Lucida Grande', sans-serif !important; } +h1 +{ + font-size: 1.5em; +} + +li, ol, ul +{ + padding: 0 1em 0 1em; + margin-top: 0; + border-width: 0px; + +} +li +{ + border-color: green; +} + +ol +{ + border-color: red; +} + +ul +{ + border-color: blue; +} + + +li +{ + margin-left: 1em !important; + padding: 0; +} + +ol +{ +list-style-type: upper-roman; +} +#results ol +{ + list-style-type: decimal; +} +ol.notes +{ +list-style-type: lower-roman; +} +ol ol +{ +list-style-type: upper-alpha; +margin-left: 0 !important; +} + +ol ol ol +{ +list-style-type: decimal; +margin-left: 0 !important; +} + +ol ul, ol ol ul, ol ol ol ul +{ +list-style-type: disc; +margin-left: 0 !important; +} + +ol ul li, ol ol ul li, ol ol ol ul li +{ +margin-left: 0 !important; +padding-left: 0 !important; +} + + diff --git a/src/java/org/thdl/lex/LexActionServlet.java b/src/java/org/thdl/lex/LexActionServlet.java index c02b0db..9b209e9 100644 --- a/src/java/org/thdl/lex/LexActionServlet.java +++ b/src/java/org/thdl/lex/LexActionServlet.java @@ -106,6 +106,7 @@ public class LexActionServlet extends HttpServlet */ public void service( HttpServletRequest req, HttpServletResponse res ) throws ServletException, IOException { + res.setContentType( "text/html; charset=UTF-8" ); /* LexLogger.debug( "Checking Request state at start of LexActionServlet.service()" ); LexLogger.logRequestState( req ); diff --git a/src/jsp/jsp/displayDefinition.jsf b/src/jsp/jsp/displayDefinition.jsf index 89d4d19..b63ee7b 100644 --- a/src/jsp/jsp/displayDefinition.jsf +++ b/src/jsp/jsp/displayDefinition.jsf @@ -1,12 +1,13 @@ <%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%> <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> - + -

- + +

+ @@ -22,7 +23,7 @@ - + diff --git a/src/jsp/jsp/displayEncyclopediaArticle.jsf b/src/jsp/jsp/displayEncyclopediaArticle.jsf index c7d0f9a..ed62429 100644 --- a/src/jsp/jsp/displayEncyclopediaArticle.jsf +++ b/src/jsp/jsp/displayEncyclopediaArticle.jsf @@ -1,35 +1,25 @@ <%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%> <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> - + +

+ + + + + + + + +
+ - - -

- - - - - - - - - -
- - - - - - - - - - + + +

- diff --git a/src/jsp/jsp/displayEntry.jsp b/src/jsp/jsp/displayEntry.jsp index d577498..f54aa57 100644 --- a/src/jsp/jsp/displayEntry.jsp +++ b/src/jsp/jsp/displayEntry.jsp @@ -1,4 +1,4 @@ -<%@ page buffer="512kb" autoFlush="false" import="org.thdl.lex.*,org.thdl.lex.component.*" errorPage="/jsp/error.jsp" %> +<%@ page buffer="512kb" autoFlush="false" import="org.thdl.lex.*,org.thdl.lex.component.*" errorPage="/jsp/error.jsp" contentType="text/html; charset=UTF-8"%> <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> @@ -8,7 +8,7 @@ - +<%-- @@ -22,9 +22,9 @@ - + --%> -
+

Search Results

    @@ -40,13 +40,18 @@
+
+ +
+
- +
-
+ +

diff --git a/src/jsp/jsp/displayEtymology.jsf b/src/jsp/jsp/displayEtymology.jsf index 9816117..f59e2f7 100644 --- a/src/jsp/jsp/displayEtymology.jsf +++ b/src/jsp/jsp/displayEtymology.jsf @@ -1,13 +1,13 @@ <%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%> <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> - + - -

- + +

+ @@ -20,26 +20,39 @@

+ +
- + + + + <%-- Derivation: --%>
- + - + + + + +

Translations

+
    + - +
  • + + <%-- - - view/edit translation + + view/edit translation--%>
    @@ -50,16 +63,19 @@
    -     + + - - + + +
    • +     +
+

- - diff --git a/src/jsp/jsp/displayFunction.jsf b/src/jsp/jsp/displayFunction.jsf index 29c5fb8..c83cca1 100644 --- a/src/jsp/jsp/displayFunction.jsf +++ b/src/jsp/jsp/displayFunction.jsf @@ -1,32 +1,27 @@ <%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%> <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> - - - - - +

- - - - - - - - -
- - - - - - - - - - -

- + + + + + + + + +
+ + + + + + + + + + +

diff --git a/src/jsp/jsp/displayKeyword.jsf b/src/jsp/jsp/displayKeyword.jsf index 5399fae..06bcfb8 100644 --- a/src/jsp/jsp/displayKeyword.jsf +++ b/src/jsp/jsp/displayKeyword.jsf @@ -1,11 +1,12 @@ <%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%> <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> - + +

- + @@ -18,7 +19,7 @@
- + diff --git a/src/jsp/jsp/displayModelSentence.jsf b/src/jsp/jsp/displayModelSentence.jsf index e68e6b5..dd83f42 100644 --- a/src/jsp/jsp/displayModelSentence.jsf +++ b/src/jsp/jsp/displayModelSentence.jsf @@ -1,11 +1,12 @@ <%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%> <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> - + +

- + @@ -20,26 +21,40 @@ - + + + + +

Translations

+
    + +
  • + <%-- - view/edit translation + view/edit translation --%>
    -     + + + + +
    • +
+ diff --git a/src/jsp/jsp/displayNotes.jsf b/src/jsp/jsp/displayNotes.jsf index c3a69c5..6622bbe 100644 --- a/src/jsp/jsp/displayNotes.jsf +++ b/src/jsp/jsp/displayNotes.jsf @@ -3,8 +3,13 @@ + + + +

Notes

+
    -analysis +

  1. @@ -17,6 +22,9 @@     -     +
    2.  +
+ + diff --git a/src/jsp/jsp/displayPassage.jsf b/src/jsp/jsp/displayPassage.jsf index a032c47..09dca0d 100644 --- a/src/jsp/jsp/displayPassage.jsf +++ b/src/jsp/jsp/displayPassage.jsf @@ -1,11 +1,12 @@ <%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%> <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> - + +

- + @@ -14,43 +15,75 @@ + + + -
- +
+ + + + Spelling:
- -
+ + + + Pagination: + ''
+ +
- + + + +

Translations

+
    - +
  • + <%-- - - view/edit translation - - -
    - -
    - -
    - -
    -     + --%> + <%-- --%> + + + + +
    +     + + + Spelling: +
    +     + + + Pagination: +
    +     + +
    + <%--     --%> + - + + + + +
    • +
+ diff --git a/src/jsp/jsp/displayPronunciation.jsf b/src/jsp/jsp/displayPronunciation.jsf index 2648b27..cb601a6 100644 --- a/src/jsp/jsp/displayPronunciation.jsf +++ b/src/jsp/jsp/displayPronunciation.jsf @@ -1,13 +1,13 @@ <%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%> <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> - + - -

- + +

+ @@ -22,12 +22,11 @@ - +

- diff --git a/src/jsp/jsp/displayRegister.jsf b/src/jsp/jsp/displayRegister.jsf index 5052be8..a1d356e 100644 --- a/src/jsp/jsp/displayRegister.jsf +++ b/src/jsp/jsp/displayRegister.jsf @@ -1,11 +1,12 @@ <%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%> <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> - + +

- + @@ -18,14 +19,11 @@ - - + - -

diff --git a/src/jsp/jsp/displayRelatedTerm.jsf b/src/jsp/jsp/displayRelatedTerm.jsf index 3c8b484..5ecfd5c 100644 --- a/src/jsp/jsp/displayRelatedTerm.jsf +++ b/src/jsp/jsp/displayRelatedTerm.jsf @@ -1,11 +1,11 @@ <%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%> <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> - +

- + @@ -21,7 +21,7 @@ - + diff --git a/src/jsp/jsp/displaySpelling.jsf b/src/jsp/jsp/displaySpelling.jsf index 6497ded..07983fa 100644 --- a/src/jsp/jsp/displaySpelling.jsf +++ b/src/jsp/jsp/displaySpelling.jsf @@ -1,34 +1,27 @@ <%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%> <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> - - - - - +

- - - - - - + + + + + + - -
-
- - - - - - + + +
+ +
- - + -

- - + + + + +

diff --git a/src/jsp/jsp/displaySubdefinition.jsf b/src/jsp/jsp/displaySubdefinition.jsf index 93ec1b7..10342b3 100644 --- a/src/jsp/jsp/displaySubdefinition.jsf +++ b/src/jsp/jsp/displaySubdefinition.jsf @@ -1,12 +1,13 @@ <%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%> <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> - + -

- + +

+ @@ -28,7 +29,7 @@
- + diff --git a/src/jsp/jsp/displayTerm.jsf b/src/jsp/jsp/displayTerm.jsf index a5e8343..67726b2 100644 --- a/src/jsp/jsp/displayTerm.jsf +++ b/src/jsp/jsp/displayTerm.jsf @@ -9,7 +9,7 @@

- + diff --git a/src/jsp/jsp/displayTransitionalData.jsf b/src/jsp/jsp/displayTransitionalData.jsf index 2a65da5..f846495 100644 --- a/src/jsp/jsp/displayTransitionalData.jsf +++ b/src/jsp/jsp/displayTransitionalData.jsf @@ -6,8 +6,9 @@ -

- + +

+ @@ -22,7 +23,7 @@ - + diff --git a/src/jsp/jsp/displayTranslationEquivalent.jsf b/src/jsp/jsp/displayTranslationEquivalent.jsf index 1f095e1..f39d390 100644 --- a/src/jsp/jsp/displayTranslationEquivalent.jsf +++ b/src/jsp/jsp/displayTranslationEquivalent.jsf @@ -1,11 +1,12 @@ <%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false"%> <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> - -

- + + +

+ @@ -19,7 +20,7 @@ - + diff --git a/src/jsp/jsp/displayTree.jsf b/src/jsp/jsp/displayTree.jsf index 4fb31f7..d73cad1 100644 --- a/src/jsp/jsp/displayTree.jsf +++ b/src/jsp/jsp/displayTree.jsf @@ -1,152 +1,271 @@ <%@ page import="org.thdl.lex.*,org.thdl.lex.component.*" buffer="512kb" autoFlush="false" %> <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %> - + - + +

    + -

    Special Guests

    +
  1. + +

    Special Guests

    +
      + +
    • + +
      •  +
    +
    2.  -

    Pronunciations

    +
  2. + +

    Pronunciations

    +
      + +
    • + +
      •  +
    +
    3.  -

    Etymologies

    +
  3. + +

    Etymologies

    +
      + +
    • + +
      •  +
    +
    4.  -

    Spellings

    +
  4. + +

    Spellings

    +
      + +
    • + +
      •  +
    +
    5.  -

    Functions

    +
  5. + +

    Functions

    +
      + +
    • + +
      •  +
    +
    6.  -

    Encyclopedia Articles

    +
  6. + +

    Encyclopedia Articles

    +
      + +
    • + +
      •  +
    +
    7.  -

    Definitions

    - - - +
  7. + +

    Definitions

    + + + + -

    Subdefinitions

    + +
      - + +
    1. + +
        -

        Keywords

        +
      1. + +

        Keywords

        +
          - + +
        • + +
          •  - +
        +
        2. +         -

        Model Sentences

        +
      2. + +

        Model Sentences

        +
          - + +
        • + +
          •  - +
        +
        3. +         -

        Translation Equivalents

        +
      3. + +

        Translation Equivalents

        +
          - + +
        • + +
          •  - +
        +
        4. +         -

        RelatedTerm

        +
      4. + +

        RelatedTerm

        +
          - + +
        • + +
          •  - +
        +
        5. +         -

        Passages

        +
      5. + +

        Passages

        +
          - + +
        • + +
          •  +
        +
        6.  -

        Registers

        +
      6. + +

        Registers

        +
          + + +
        • + +
          •  +
        +
        7.  - +
      +
      2. + +       + +
     -     + +
    8.  diff --git a/src/jsp/jsp/displayTreeToc.jsf b/src/jsp/jsp/displayTreeToc.jsf index 3d05e80..84eaa81 100644 --- a/src/jsp/jsp/displayTreeToc.jsf +++ b/src/jsp/jsp/displayTreeToc.jsf @@ -55,16 +55,20 @@ - +
  8. + +
      - +
    1. + +
        @@ -108,9 +112,20 @@ - +
      +
      2. + +             - + +
    +
    9. + +         + +
+ + diff --git a/src/jsp/jsp/header.jsf b/src/jsp/jsp/header.jsf index c0324a2..dc93424 100644 --- a/src/jsp/jsp/header.jsf +++ b/src/jsp/jsp/header.jsf @@ -11,6 +11,14 @@ THDL Tibetan Collaborative Dictionaries + diff --git a/src/jsp/jsp/passageForm.jsf b/src/jsp/jsp/passageForm.jsf index 40aa459..ee19cbc 100644 --- a/src/jsp/jsp/passageForm.jsf +++ b/src/jsp/jsp/passageForm.jsf @@ -61,7 +61,7 @@ Spelling: Pagination:
-
+
Passage: