[sword-cvs] swordweb fulllibrary.jsp,1.14,1.15 parallelstudy.jsp,1.26,1.27 parchment.css,1.14,1.15 passagestudy.jsp,1.30,1.31 sandy.css,1.8,1.9 wash.css,1.37,1.38
sword@www.crosswire.org
sword@www.crosswire.org
Thu, 20 Nov 2003 15:00:51 -0700
Update of /usr/local/cvsroot/swordweb
In directory www:/tmp/cvs-serv14858
Modified Files:
fulllibrary.jsp parallelstudy.jsp parchment.css
passagestudy.jsp sandy.css wash.css
Log Message:
Added promo and copyright bylines
Index: fulllibrary.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/fulllibrary.jsp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- fulllibrary.jsp 18 Nov 2003 07:03:05 -0000 1.14
+++ fulllibrary.jsp 20 Nov 2003 22:00:49 -0000 1.15
@@ -120,9 +120,14 @@
("Essays".equals(type))) {
targetURL = "bookdisplay.jsp?mod="+URLEncoder.encode(module.getName());
}
+
+ String promoLine = module.getConfigEntry("ShortPromo");
+ if (promoLine.equalsIgnoreCase("<swnull>"))
+ promoLine = "";
%>
<h2><a href="<%= targetURL %>"><%= module.getDescription() %></a></h2>
- <%= about %>
+ <div><%= about %></div>
+ <div id="aboutPromo"><%= promoLine %></div>
</div>
<%
Index: parallelstudy.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/parallelstudy.jsp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- parallelstudy.jsp 18 Nov 2003 07:03:05 -0000 1.26
+++ parallelstudy.jsp 20 Nov 2003 22:00:49 -0000 1.27
@@ -283,6 +283,29 @@
</tr>
<%
}
+ %>
+ <tr>
+
+ <% //insert module names at the top
+ for (int i = 0; i < parDispModules.size(); i++) {
+ SWModule mod = mgr.getModuleByName((String)parDispModules.get(i));
+ String copyLine = mod.getConfigEntry("ShortCopyright");
+ String promoLine = mod.getConfigEntry("ShortPromo");
+ if (copyLine.equalsIgnoreCase("<swnull>"))
+ copyLine = "";
+ if (promoLine.equalsIgnoreCase("<swnull>"))
+ promoLine = "";
+ %>
+ <td>
+ <div id="copyLine"><%= copyLine %></div>
+ <div id="promoLine"><%= promoLine %></div>
+ </td>
+ <%
+ }
+ %>
+
+ </tr>
+ <%
}
%>
Index: parchment.css
===================================================================
RCS file: /usr/local/cvsroot/swordweb/parchment.css,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- parchment.css 18 Nov 2003 20:38:30 -0000 1.14
+++ parchment.css 20 Nov 2003 22:00:49 -0000 1.15
@@ -1019,3 +1019,24 @@
padding: 0px 0px 0px 0px;
border-bottom: 1px solid #7F673C;
}
+
+#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;
+}
Index: passagestudy.jsp
===================================================================
RCS file: /usr/local/cvsroot/swordweb/passagestudy.jsp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- passagestudy.jsp 18 Nov 2003 07:03:05 -0000 1.30
+++ passagestudy.jsp 20 Nov 2003 22:00:49 -0000 1.31
@@ -191,7 +191,7 @@
<div id="passagestudy">
<h2><%= activeKey %></h2>
- <h3><%= activeModule.getDescription().replaceAll("&", "&") + " (" + activeModule.getName() + ")" %></h3>
+ <h3><a href="fulllibrary.jsp?show=<%= URLEncoder.encode(activeModule.getName()) %>"><%= activeModule.getDescription().replaceAll("&", "&") + " (" + activeModule.getName() + ")" %></a></h3>
<% //insert next and previous chapter links
// activeKey contains the current key ATM
@@ -271,7 +271,15 @@
</div>
<%
}
+ String copyLine = activeModule.getConfigEntry("ShortCopyright");
+ String promoLine = activeModule.getConfigEntry("ShortPromo");
+ if (copyLine.equalsIgnoreCase("<swnull>"))
+ copyLine = "";
+ if (promoLine.equalsIgnoreCase("<swnull>"))
+ promoLine = "";
%>
+ <div id="copyLine"><%= copyLine %></div>
+ <div id="promoLine"><%= promoLine %></div>
</div>
</tiles:put>
</tiles:insert>
Index: sandy.css
===================================================================
RCS file: /usr/local/cvsroot/swordweb/sandy.css,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- sandy.css 18 Nov 2003 20:38:30 -0000 1.8
+++ sandy.css 20 Nov 2003 22:00:49 -0000 1.9
@@ -599,3 +599,23 @@
border-bottom: 1px solid #DEDACA;
}
+#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;
+}
Index: wash.css
===================================================================
RCS file: /usr/local/cvsroot/swordweb/wash.css,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- wash.css 18 Nov 2003 20:38:30 -0000 1.37
+++ wash.css 20 Nov 2003 22:00:49 -0000 1.38
@@ -782,3 +782,24 @@
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;
+}