[sword-svn] r193 - trunk
scribe at crosswire.org
scribe at crosswire.org
Tue Mar 8 11:58:45 MST 2005
Author: scribe
Date: 2005-03-08 11:58:44 -0700 (Tue, 08 Mar 2005)
New Revision: 193
Modified:
trunk/blues.css
trunk/init.jsp
trunk/parchment.css
trunk/passagestudy.jsp
trunk/preferences.jsp
trunk/print.css
trunk/sandy.css
trunk/wash.css
Log:
Modified: trunk/blues.css
===================================================================
--- trunk/blues.css 2005-03-08 04:32:08 UTC (rev 192)
+++ trunk/blues.css 2005-03-08 18:58:44 UTC (rev 193)
@@ -426,8 +426,6 @@
margin-left : 0;
overflow: visible;
z-index:6;
- filter: Alpha(Opacity=92)
- layer-background-color: #fff3cf;
border: 1px #000000;
border-style: solid;
padding: 7px 7px 7px 7px;
Modified: trunk/init.jsp
===================================================================
--- trunk/init.jsp 2005-03-08 04:32:08 UTC (rev 192)
+++ trunk/init.jsp 2005-03-08 18:58:44 UTC (rev 193)
@@ -269,6 +269,8 @@
session.setAttribute("Headings", headings);
session.setAttribute("Javascript", javascript);
session.setAttribute("showTabs", showTabs);
+ mgr.setJavascript(!"Off".equalsIgnoreCase(javascript));
+ mgr.setGlobalOption("Headings", ("Off".equalsIgnoreCase(headings)) ? "Off":"On");
/*
// kept around in case we ever need it again
// de-serialize from cookie
Modified: trunk/parchment.css
===================================================================
(Binary files differ)
Modified: trunk/passagestudy.jsp
===================================================================
--- trunk/passagestudy.jsp 2005-03-08 04:32:08 UTC (rev 192)
+++ trunk/passagestudy.jsp 2005-03-08 18:58:44 UTC (rev 193)
@@ -35,8 +35,6 @@
String showStrong = request.getParameter("showStrong");
String showMorph = request.getParameter("showMorph");
- mgr.setGlobalOption("Headings", ("Off".equalsIgnoreCase(headings)) ? "Off":"On");
- mgr.setJavascript(!"Off".equalsIgnoreCase(javascript));
for (int i = 0; i < 2; i++) {
String []nodes = request.getParameterValues((i>0)?"close":"open");
Modified: trunk/preferences.jsp
===================================================================
--- trunk/preferences.jsp 2005-03-08 04:32:08 UTC (rev 192)
+++ trunk/preferences.jsp 2005-03-08 18:58:44 UTC (rev 193)
@@ -43,16 +43,20 @@
<h2>Translations:</h2>
<h3>Preferred Translations</h3>
- <ul>
<%
+ if (prefBibles.size() > 0) {
+ out.println("<ul>");
+ }
for (int i = 0; i < prefBibles.size(); i++) {
SWModule module = mgr.getModuleByName((String)prefBibles.get(i));
%>
<li><a href="preferences.jsp?add=<%= URLEncoder.encode(module.getName()) %>" title="Add <%= module.getDescription().replaceAll("&", "&") %>"><%= module.getDescription().replaceAll("&", "&") %></a></li>
<%
}
+ if (prefBibles.size() > 0) {
+ out.println("</ul>");
+ }
%>
- </ul>
<h3>All Translations</h3>
<ul>
@@ -76,16 +80,20 @@
<h2>Comentaries:</h2>
<h3>Preferred Comentaries</h3>
- <ul>
<%
+ if (prefCommentaries.size() > 0) {
+ out.println("<ul>");
+ }
for (int i = 0; i < prefCommentaries.size(); i++) {
SWModule module = mgr.getModuleByName((String)prefCommentaries.get(i));
%>
<li><a href="preferences.jsp?add=<%= URLEncoder.encode(module.getName()) %>" title="Add <%= module.getDescription().replaceAll("&", "&") %>"><%= module.getDescription().replaceAll("&", "&") %></a></li>
<%
}
+ if (prefCommentaries.size() > 0) {
+ out.println("</ul>");
+ }
%>
- </ul>
<h3>All Comentaries</h3>
@@ -109,8 +117,10 @@
<div id="preferences">
<h2>Preferred Translations</h2>
<p>Click to remove. Reselect on the side to move to the top.</p>
- <ul>
<%
+ if (prefBibles.size() > 0) {
+ out.println("<ul>");
+ }
for (int i = 0; i < prefBibles.size(); i++) {
SWModule mod = mgr.getModuleByName((String)prefBibles.get(i));
%>
@@ -118,12 +128,16 @@
<%
}
+ if (prefBibles.size() > 0) {
+ out.println("</ul>");
+ }
%>
- </ul>
<h2>Preferred Commentaries</h2>
<p>Click to remove. Reselect on the side to move to the top.</p>
- <ul>
<%
+ if (prefCommentaries.size() > 0) {
+ out.println("<ul>");
+ }
for (int i = 0; i < prefCommentaries.size(); i++) {
SWModule mod = mgr.getModuleByName((String)prefCommentaries.get(i));
%>
@@ -131,8 +145,10 @@
<%
}
+ if (prefCommentaries.size() > 0) {
+ out.println("</ul>");
+ }
%>
- </ul>
<h2>Preferred Style</h2>
<ul>
<% for (int i = 0; i < styleNames.size(); i++) { %>
@@ -153,8 +169,8 @@
</ul>
<h2 id="misc">Misc Options</h2>
<ul>
- <li><a id="headings" href="preferences.jsp?Headings=<%= "Off".equalsIgnoreCase(headings)?"On":"Off" %>#misc" title=<%= "Off".equalsIgnoreCase(headings)?"Show":"Hide" %> Headings in Bibles"><%= "Off".equalsIgnoreCase(headings)?"Show":"Hide" %> Headings in Bibles</a></li>
- <li><a id="javascript" href="preferences.jsp?Javascript=<%= "Off".equalsIgnoreCase(javascript)?"On":"Off" %>#misc" title=<%= "Off".equalsIgnoreCase(javascript)?"Use":"Don't Use" %> Javascript"><%= "Off".equalsIgnoreCase(javascript)?"Use":"Don't Use" %> Javascript</a></li>
+ <li><a id="headings" href="preferences.jsp?Headings=<%= "Off".equalsIgnoreCase(headings)?"On":"Off" %>#misc" title="<%= "Off".equalsIgnoreCase(headings)?"Show":"Hide" %> Headings in Bibles"><%= "Off".equalsIgnoreCase(headings)?"Show":"Hide" %> Headings in Bibles</a></li>
+ <li><a id="javascript" href="preferences.jsp?Javascript=<%= "Off".equalsIgnoreCase(javascript)?"On":"Off" %>#misc" title="<%= "Off".equalsIgnoreCase(javascript)?"Use":"Don't Use" %> Javascript"><%= "Off".equalsIgnoreCase(javascript)?"Use":"Don't Use" %> Javascript</a></li>
</ul>
</div>
Modified: trunk/print.css
===================================================================
--- trunk/print.css 2005-03-08 04:32:08 UTC (rev 192)
+++ trunk/print.css 2005-03-08 18:58:44 UTC (rev 193)
@@ -96,8 +96,6 @@
margin-left : 0;
overflow: visible;
z-index:6;
- filter: Alpha(Opacity=92)
- layer-background-color: #fff3cf;
border: 1px #000000;
border-style: solid;
padding: 7px 7px 7px 7px;
Modified: trunk/sandy.css
===================================================================
--- trunk/sandy.css 2005-03-08 04:32:08 UTC (rev 192)
+++ trunk/sandy.css 2005-03-08 18:58:44 UTC (rev 193)
@@ -630,8 +630,6 @@
background-color: #fff3cf;
overflow: visible;
z-index:6;
- filter: Alpha(Opacity=92)
- layer-background-color: #fff3cf;
border: 1px #000000;
border-style: solid;
padding: 7px 7px 7px 7px;
Modified: trunk/wash.css
===================================================================
--- trunk/wash.css 2005-03-08 04:32:08 UTC (rev 192)
+++ trunk/wash.css 2005-03-08 18:58:44 UTC (rev 193)
@@ -815,8 +815,6 @@
margin-left : 0;
overflow: visible;
z-index:6;
- filter: Alpha(Opacity=92)
- layer-background-color: #fff3cf;
border: 1px #000000;
border-style: solid;
padding: 7px 7px 7px 7px;
More information about the sword-cvs
mailing list