[sword-svn] r280 - trunk/webapp
scribe at www.crosswire.org
scribe at www.crosswire.org
Sat Sep 20 13:40:27 MST 2008
Author: scribe
Date: 2008-09-20 13:40:26 -0700 (Sat, 20 Sep 2008)
New Revision: 280
Removed:
trunk/webapp/blank.css
trunk/webapp/blues.css
Modified:
trunk/webapp/init.jsp
trunk/webapp/wash.css
Log:
updating to boil down our CSS
Added to properties: defaultLang
Deleted: trunk/webapp/blank.css
===================================================================
--- trunk/webapp/blank.css 2008-08-21 00:27:57 UTC (rev 279)
+++ trunk/webapp/blank.css 2008-09-20 20:40:26 UTC (rev 280)
@@ -1,4 +0,0 @@
-body{
-
-}
-
Deleted: trunk/webapp/blues.css
===================================================================
--- trunk/webapp/blues.css 2008-08-21 00:27:57 UTC (rev 279)
+++ trunk/webapp/blues.css 2008-09-20 20:40:26 UTC (rev 280)
@@ -1,483 +0,0 @@
-html, body {
- padding: 0;
- margin: 0;
- }
-
-body {
- color: #000;
- background-color: #fff;
- }
-
-div {
- padding: 0;
- margin: 0;
- }
-
-dl {
- font: 11px/16px verdana, geneva, arial, helvetica, sans-serif;
- }
-
-h1, h2, h3, h4, h5, h6 {
- font-family: palatino, georgia, serif;
- font-weight: normal;
- line-height: 1.5em;
- text-transform: uppercase;
- padding: 0;
- margin: 0;
- }
-
-h1 {
- font-size: 24px;
- }
-
-h2 {
- font-size: 18px;
- }
-
-h3 {
- font-size: 16px;
- }
-
-h4 {
- font-size: 14px;
- }
-
-h5 {
- font-size: 12px;
- }
-
-h6 {
- font-size: 11px;
- }
-
-img {
- padding: 0;
- border: 0 none;
- margin: 0;
- }
-
-p {
- font: 11px/1.5em verdana, geneva, arial, helvetica, sans-serif;
- color: #000;
- background-color: transparent;
- padding: 0;
- margin: .5em 0 0 0;
- }
-
-a {
- font: bold 11px/16px verdana, geneva, arial, helvetica, sans-serif;
- color: #69c;
- background: transparent;
- text-decoration: none;
- }
-
-a:link {
- color: #69c;
- background:
- ransparent;
- }
-
-a:visited {
- color: #69c;
- background: transparent;
- }
-a:hover {
- color: #000099;
- background: transparent;
- text-decoration: none;
- }
-a:active {
- color: #69c;
- background:
- transparent;
- text-decoration: none;}
-
-/* header content section ---------- */
-
-#header {
- color: #000;
- background-color: #000099;
- padding: 0 15px;
- border-bottom-style: solid;
- border-bottom-width: 1px;
- border-bottom-color: #333;
- }
-
-#header h1 {
- letter-spacing: 0.1em;
- color: #fff;
- background-color: transparent;
- }
-
-#header img {
- align:right;
- top:5px;
- right:5px;
- position:absolute;
- }
-
-#header ul li {
- display:inline;
- padding: 0px 0px 0px 0px;
- margin: 0px 0px 0px 0px;
-}
-
-#header ul {
- display:inline;
- padding: 0px 0px 0px 0px;
- margin: 0px 0px 0px 0px;
-}
-
-#header ul li a {
- padding: 3px 3px 3px 3px;
- text-decoration: none;
-}
-
-#header ul li a:hover {
- color: #ffffff;
-}
-
-/* content section ---------- */
-
-#content-wrap {
- padding: 15px 15px 0 15px;
- margin-bottom: 15px;
-}
-
-/* --- left column ---------- */
-
-#content-sub-1 {
- float: left;
- width: 200px;
- text-align: left;
- padding-right: 5px;
- background-color: #ffffff;
- }
-
-#content-wrap > #content-sub-1 {
- width: 190px;
- }
-
-#content-sub-1 ul {
- padding: 0px 0px 0px 10px;
- margin: 0px 0px 0px 5px;
- list-style-type: square;
-}
-
-#content-sub-1 ul.plain {
- padding: 0px 0px 0px 0px;
- margin: 0px 0px 0px 0px;
- list-style-type:none;
-}
-
-#content-sub-1 ul.plain ul {
- padding: 0px 0px 0px 10px;
- margin: 0px 0px 0px 5px;
- list-style-type:none;
-}
-
-
-/* --- right column ---------- */
-
-#content-sub-2 {
- float: right;
- width: 200px;
- text-align: left;
- padding-left: 5px;
- background-color: #fff;
- }
-
-#content-wrap > #content-sub-2 {
- width: 190px;
- }
-
-#content-sub-2 ul {
- padding: 0px 0px 0px 10px;
- margin: 0px 0px 0px 5px;
- list-style-type: square;
-}
-
-#content-sub-2 ul.plain {
- padding: 0px 0px 0px 0px;
- margin: 0px 0px 0px 0px;
- list-style-type:none;
-}
-
-
-/* --- center column (main content)---------- */
-
-#content-main {
- margin: 0 185px;
- text-align: justify;
- background-color: #fff;
- padding: 0px 5px 0px 5px;
-}
-
-
-#content-main h2 {
- font-size: 22px;
- letter-spacing: 0.1em;
- }
-
-#content-main p {
- text-indent: 1.5em;
- }
-
-#content-main .first {
- text-indent: 0;
- }
-
-#content-main .first:first-letter {
- float: left;
- font: 36px palatino, georgia, serif;
- padding-right: 5px;
- }
-
-#content-main span.versenum {
- vertical-align:text-top;
- font-size: x-small;
- margin: 0px 3px 0px 10px;
- font-weight: bold;
-}
-
-.clk {
- cursor:pointer;
-}
-
-.verse {
- font-family:cardo,tahoma,code2000,code2001,arial unicode ms,arial,sans serif,serif;
- margin: 0px 0px 5px 0px;
- padding: 0px 5px 0px 5px;
- vertical-align:text-top;
-}
-
-.currentverse {
- font-family:cardo,tahoma,code2000,code2001,arial unicode ms,arial,sans serif,serif;
- vertical-align:text-top;
- margin: 0px 0px 5px 0px;
- background-color: #eeeeee;
- border: 1px dotted #dddddd;
- padding: 0px 5px 0px 5px;
-}
-
-#content-main p.textname {
- margin: 0px 0px 5px 0px;
-}
-
-#content-main *[dir=rtl] {
- font-family:cardo,tahoma,code2000,code2001,arial unicode ms,arial,sans serif,serif;
- font-size:larger;
-}
-
-
-/* --- parallel display stuff---------- */
-
-#paralleldisplay {
- width:100%;
-}
-
-#paralleldisplay tr th {
- font-weight:bold;
- font-size:small;
-}
-
-#paralleldisplay td {
-
-}
-
-#paralleldisplay tr {
-
-}
-
-/* footer section ---------- */
-
-#footer {
- clear: both;
- color: #000;
- background-color: #eee;
- padding: 5px 15px;
- border-top-style: solid;
- border-top-width: 1px;
- border-top-color: #333;
- margin-top: 15px;
- }
-
-#footer p {
- padding: 0;
- margin: 0;
- }
-
-
-/* blue panel */
-.bluepanel {
- background-color: #eeeeee;
- border:1px solid #dddddd;
- padding:0px 5px 0px 5px;
- text-align:left;
-}
-
-.bluepanel input.textinput{
- border:1px solid #555555;
- width:100px;
-}
-
-.bluepanel input.searchbutton {
- border: 2px solid #eeeeee;
- color:#ffffff;
- background-color:#000099;
-}
-
-.bluepanel input.searchbutton:hover{
- border: 2px inset #eeeeee;
- color:#ffffff;
- background-color:#000099;
-}
-
-.bluepanel fieldset{
- border: 0;
- padding: 0;
- margin: 0;
-}
-/* ----------------*/
-
-.quicksearch {
- background-color: #eeeeee;
- border: 1px dotted #dddddd;
- padding: 0px 5px 0px 5px;
- text-align: center;
-}
-
-.quicksearch input.textinput{
- border-style: solid;
- border: 1px solid #555555;
- width:100px;
-}
-
-.quicksearch input.searchbutton{
- border: 2px outset #eeeeee;
- color:#ffffff;
- background-color:#000099;
-}
-
-.quicksearch input.searchbutton:hover{
- border: 2px inset #eeeeee;
- color:#ffffff;
- background-color:#000099;
-}
-
-.quicksearch fieldset{
- border: 0;
- padding: 0;
- margin: 0;
-}
-
-
-ul.library {
-}
-
-ul.library li {
- font-size:small;
-}
-ul.library ul {
-
-}
-ul.library ul li {
- font-size:x-small;
-}
-
-
-
-ul.booknav {
- padding: 0px 0px 0px 0px;
- margin: 0px 0px 10px 0px;
- border-bottom: 1px solid #dddddd;
- border-top: 1px solid #dddddd;
- background-color: #eeeeee;
- text-align: center;
-}
-
-ul.booknav li{
- padding: 3px 3px 3px 3px;
- margin: 0px 0px 0px 0px;
- list-style-type: none;
- display: inline;
-}
-
-ul.searchresultsnav {
- padding: 0px 0px 0px 0px;
- margin: 0px 0px 10px 0px;
- border-bottom: 1px solid #dddddd;
- border-top: 1px solid #dddddd;
- background-color: #eeeeee;
-}
-
-ul.searchresultsnav li{
- padding: 3px 3px 3px 3px;
- margin: 0px 0px 0px 0px;
- list-style-type: none;
- display: inline;
-}
-
-form {
- margin: 0px 0px 0px 0px;
- padding: 0px 0px 0px 0px;
-}
-
-.word-layer {
- visibility: hidden;
- position:absolute;
- left:50px;
- top:50px;
- width:300px;
- background-color: #fff3cf;
- margin-left : 0;
- overflow: visible;
- z-index:6;
- border: 1px #000000;
- border-style: solid;
- padding: 7px 7px 7px 7px;
- color : #000000;
- font-size : x-small;
- font-style : normal;
- font-weight : normal;
- font-variant : normal;
- word-spacing : normal;
- letter-spacing : normal;
- vertical-align : baseline;
- text-transform : none;
- text-align : left;
- text-indent : 0;
- line-height : normal;
-}
-
-span.curWord {
- text-decoration: underline;
- font-weight : bold;
- background-color: #f0f0f0;
-}
-span.sameLemmaMorph {
- text-decoration: underline;
- font-weight : bold;
-}
-span.sameLemma {
- font-weight : bold;
-}
-
-.fn {
- cursor:pointer;
- vertical-align: super;
- margin-left : 0;
- overflow: visible;
- padding: 7px 7px 7px 7px;
- color : #0000FF;
- font-size : x-small;
- font-style : normal;
- font-weight : normal;
- font-variant : normal;
- word-spacing : normal;
- letter-spacing : normal;
- text-transform : none;
- text-align : left;
- text-indent : 0;
- line-height : normal;
-}
Modified: trunk/webapp/init.jsp
===================================================================
--- trunk/webapp/init.jsp 2008-08-21 00:27:57 UTC (rev 279)
+++ trunk/webapp/init.jsp 2008-09-20 20:40:26 UTC (rev 280)
@@ -24,6 +24,7 @@
static Vector tabTitles = null;
static Vector tabDefaults = null;
static String defaultBible = null;
+ static String defaultLang = null;
static Properties swordWebConfig = null;
%>
@@ -41,6 +42,7 @@
}
catch (Exception e) { e.printStackTrace(); }
defaultBible = swordWebConfig.getProperty("defaultBible", "NASB");
+ defaultLang = swordWebConfig.getProperty("defaultLang", "en_US");
styleNames = new Vector();
styleFiles = new Vector();
@@ -306,6 +308,13 @@
if ((prefStyle == null) || (styleNames.indexOf(prefStyle) < 0))
prefStyle = (String)styleNames.get(0);
+ String appLang = request.getParameter("lang");
+ if (appLang == null) {
+ appLang = session.getAttribute("lang");
+ if (appLang == null) {
+ appLang = defaultLang;
+ }
+ }
session.setAttribute("PrefBibles", prefBibles);
session.setAttribute("PrefCommentaries", prefCommentaries);
session.setAttribute("ParDispModules", parDispModules);
@@ -315,17 +324,12 @@
session.setAttribute("Cross-references", xrefs);
session.setAttribute("Javascript", javascript);
session.setAttribute("showTabs", showTabs);
+ session.setAttribute("lang", appLang);
mgr.setJavascript(!"Off".equalsIgnoreCase(javascript));
mgr.setGlobalOption("Headings", ("Off".equalsIgnoreCase(headings)) ? "Off":"On");
mgr.setGlobalOption("Footnotes", ("On".equalsIgnoreCase(footnotes)) ? "On":"Off");
mgr.setGlobalOption("Cross-references", ("On".equalsIgnoreCase(xrefs)) ? "On":"Off");
- {
- String lang = request.getParameter("lang");
- if (lang != null) {
- session.setAttribute("lang", lang);
- }
- }
/*
// kept around in case we ever need it again
Modified: trunk/webapp/wash.css
===================================================================
--- trunk/webapp/wash.css 2008-08-21 00:27:57 UTC (rev 279)
+++ trunk/webapp/wash.css 2008-09-20 20:40:26 UTC (rev 280)
@@ -1,94 +1,201 @@
-body{
-color: #000000;
-background-color: #ffffff;
-font-size: 76%;
-margin: 0px 10px 0px 10px;
+/* General - Site wide style */
+
+body {
+ color: #000000;
+ background-color: #ffffff;
+ font-size: 76%;
+ margin: 0px 10px 0px 10px;
}
-/* Mast Head */
-#header{
-background-image: url(images/osislogo.png);
-background-position: left top;
-background-repeat: no-repeat;
-font-family: "Trebuchet MS", verdana, lucida, arial, helvetica, sans-serif;
-height:60px;
+h2 {
+ margin: 1em .5em 0 .5em;
+ font-family: "Trebuchet MS", verdana, lucida, arial, helvetica, sans-serif;
+ font-size: 1.4em;
}
-#header h1 {
-font-family: georgia, palatino, Times New Roman, Times, Serif;
-font-weight: normal;
-font-size: 2.0em;
-line-height: 2.0em;
-text-transform: uppercase;
-padding: 0px 0px 0px 70px;
-margin: 0px 0px 0px 0px;
+h3 {
+ margin: 1em .5em .5em 1em;
+ font-family: "Trebuchet MS", verdana, lucida, arial, helvetica, sans-serif;
+ font-weight: bold;
+ font-size: 1.0em;
}
+a:link {
+ color:#000099;
+}
+.wordsOfJesus {
+ color: #bb0000;
+}
-/* Main Navigation */
+.copyLine {
+ margin: 1em 0px .5em 0px;
+ padding: 0px 0px 0px 0px;
+ border-top: 1px solid #7F673C;
+ font-weight: bold;
+ font-style: italic;
+}
-#navlist{
-border-bottom: 1px solid #ccc;
-margin: -15px 0 0 0;
-padding-bottom: 19px;
-padding-left: 70px;
+.promoLine {
+ margin: 1em 0px .5em 0px;
+ padding: 10px 0px 0px 0px;
+ font-weight: bold;
}
-#navlist ul, #navlist li{
-display: inline;
-list-style-type: none;
-margin: 0;
-padding: 0;
+.word-layer { /* The layer which appears after clicking on a word */
+ visibility: hidden;
+ position: absolute;
+ left: 50px;
+ top: 50px;
+ width: 300px;
+ background-color: #EEEEEE;
+ margin-left: 0;
+ overflow: visible;
+ z-index: 6;
+ border: 1px #000000;
+ border-style: solid;
+ padding: 7px;
+ color: #000000;
+ font-size: x-small;
+ font-style: normal;
+ font-weight: normal;
+ font-variant: normal;
+ word-spacing: normal;
+ letter-spacing: normal;
+ vertical-align: baseline;
+ text-transform: none;
+ text-align: left;
+ text-indent: 0;
+ line-height: normal;
}
-#navlist a:link, #navlist a:visited{
-background: #E8EBF0;
-border: 1px solid #ccc;
-color: #666;
-float: left;
-font-family: "Trebuchet MS", verdana, lucida, arial, helvetica, sans-serif;
-font-size: 1.0em;
-font-weight: normal;
-line-height: 1.4em;
-margin-right: 8px;
-padding: 1px 5px 0px 5px;
-text-decoration: none;
+/* Formating options for the grammatical highlighting */
+span.curWord { /* The clicked word */
+ text-decoration: underline;
+ font-weight: bold;
+ background: #C5D6EA;
}
+span.sameLemmaMorph { /* The other words with the same morph code */
+ text-decoration: underline;
+ font-weight: bold;
+}
+span.sameLemma { /* The other words with the same lemma on the page */
+ font-weight: bold;
+}
+.word-layer.span.sameLemma { /* The other words with the same lemma on the page */
+ font-weight: bold;
+}
-#navlist a:link#current, #navlist a:visited#current{
-background: #fff;
-border-bottom: 1px solid #fff;
-color: #000;
+.fn {
+ cursor: pointer;
+ vertical-align: super;
+ margin-left: 0;
+ overflow: visible;
+ padding: 7px 7px 7px 7px;
+ color: #0000FF;
+ font-size: x-small;
+ font-style: normal;
+ font-weight: normal;
+ font-variant: normal;
+ word-spacing: normal;
+ letter-spacing: normal;
+ text-transform: none;
+ text-align: left;
+ text-indent: 0;
+ line-height: normal;
}
-#navlist a:hover {
-color: #ff0000;
-background: #C5D6EA;
+#aboutPromo {
+ margin: 1em 0px .5em 0px;
+ padding: 10px 0px 0px 0px;
+ border-top: 1px solid #7F673C;
+ font-weight: bold;
}
-#navlist li#skip {display:none;}
+#about .q {
+ font-weight: bold;
+ font-style: italic;
+}
-/* General - Site wide style */
+#about h3 {
+ margin: 1em 0px .5em 0px;
+ padding: 0px 0px 0px 0px;
+ border-bottom: 1px solid #ccc;
+}
-h2{
-margin: 1em .5em 0 .5em;
-font-family: "Trebuchet MS", verdana, lucida, arial, helvetica, sans-serif;
-font-size: 1.4em;
+#about ul {
+ margin: 12px 0px 2em 0px;
+ padding: 5px 0em 3px 2em;
}
+/* Mast Head */
-h3{
-margin: 1em .5em .5em 1em;
-font-family: "Trebuchet MS", verdana, lucida, arial, helvetica, sans-serif;
-font-weight: bold;
-font-size: 1.0em;
+#header {
+ background-image: url(images/osislogo.png);
+ background-position: left top;
+ background-repeat: no-repeat;
+ font-family: "Trebuchet MS", verdana, lucida, arial, helvetica, sans-serif;
+ height:60px;
}
-a:link {color:#000099;}
+#header h1 {
+ font-family: georgia, palatino, Times New Roman, Times, Serif;
+ font-weight: normal;
+ font-size: 2.0em;
+ line-height: 2.0em;
+ text-transform: uppercase;
+ padding: 0px 0px 0px 70px;
+ margin: 0px 0px 0px 0px;
+}
+
+
+/* Main Navigation */
+
+#navlist {
+ border-bottom: 1px solid #ccc;
+ margin: -15px 0 0 0;
+ padding-bottom: 19px;
+ padding-left: 70px;
+}
+
+#navlist ul, #navlist li {
+ display: inline;
+ list-style-type: none;
+ margin: 0;
+ padding: 0;
+}
+
+#navlist a:link, #navlist a:visited {
+ background: #E8EBF0;
+ border: 1px solid #ccc;
+ color: #666;
+ float: left;
+ font-family: "Trebuchet MS", verdana, lucida, arial, helvetica, sans-serif;
+ font-size: 1.0em;
+ font-weight: normal;
+ line-height: 1.4em;
+ margin-right: 8px;
+ padding: 1px 5px 0px 5px;
+ text-decoration: none;
+}
+
+#navlist a:link#current, #navlist a:visited#current {
+ background: #fff;
+ border-bottom: 1px solid #fff;
+ color: #000;
+}
+
+#navlist a:hover {
+ color: #ff0000;
+ background: #C5D6EA;
+}
+
+#navlist li#skip {display:none;}
+
+
/* Layout */
#content-wrap{
@@ -784,114 +891,3 @@
color:#f00;
}
-.wordsOfJesus {
-color: #bb0000;
-}
-
-
-/* FAQ
-// DON I CHANGED THIS FOR IE
-#about ul {
-margin: 1em 0px 2em 0px;
-}
- */
-
-#about ul {
- margin: 12px 0px 2em 0px;
- padding: 5px 0em 3px 2em;
-}
-
-#about .q {
-font-weight: bold;
-font-style: italic;
-}
-
-#about h3 {
-margin: 1em 0px .5em 0px;
-padding: 0px 0px 0px 0px;
-border-bottom: 1px solid #ccc;
-}
-
-.copyLine {
- margin: 1em 0px .5em 0px;
- padding: 0px 0px 0px 0px;
- border-top: 1px solid #7F673C;
- font-weight: bold;
- font-style: italic;
-}
-
-.promoLine {
- margin: 1em 0px .5em 0px;
- padding: 10px 0px 0px 0px;
- font-weight: bold;
-}
-
-#aboutPromo {
- margin: 1em 0px .5em 0px;
- padding: 10px 0px 0px 0px;
- border-top: 1px solid #7F673C;
- font-weight: bold;
-}
-
-.word-layer { /* The layer which appears after clicking on a word */
- visibility: hidden;
- position:absolute;
- left:50px;
- top:50px;
- width:300px;
- background-color: #EEEEEE;
- margin-left : 0;
- overflow: visible;
- z-index:6;
- border: 1px #000000;
- border-style: solid;
- padding: 7px;
- color : #000000;
- font-size : x-small;
- font-style : normal;
- font-weight : normal;
- font-variant : normal;
- word-spacing : normal;
- letter-spacing : normal;
- vertical-align : baseline;
- text-transform : none;
- text-align : left;
- text-indent : 0;
- line-height : normal;
-}
-
-/* Formating options for the grammatical highlighting */
-span.curWord { /* The clicked word */
- text-decoration: underline;
- font-weight : bold;
- background: #C5D6EA;
-}
-span.sameLemmaMorph { /* The other words with the same morph code */
- text-decoration: underline;
- font-weight : bold;
-}
-span.sameLemma { /* The other words with the same lemma on the page */
- font-weight : bold;
-}
-.word-layer.span.sameLemma { /* The other words with the same lemma on the page */
- font-weight : bold;
-}
-
-.fn {
- cursor:pointer;
- vertical-align: super;
- margin-left : 0;
- overflow: visible;
- padding: 7px 7px 7px 7px;
- color : #0000FF;
- font-size : x-small;
- font-style : normal;
- font-weight : normal;
- font-variant : normal;
- word-spacing : normal;
- letter-spacing : normal;
- text-transform : none;
- text-align : left;
- text-indent : 0;
- line-height : normal;
-}
More information about the sword-cvs
mailing list