some serious new feature implementation:
- cookie-based persistent logins - expanded activity reporting - "top" and "fixed" left menus are now dynamically generated from XML config, not hard coded - error reporting enhanced and protection increased - "About Venice" page first draft - new means of "framing" static content within the Venice "frame" - base page now includes the "footer" itself, "content" pages don't anymore - general cleanup of some heavyweight old containers, replaced with faster Collections framework containers - probably more, there's a LOT of stuff in here
This commit is contained in:
@@ -38,4 +38,3 @@
|
||||
WIDTH=80 HEIGHT=24 BORDER=0>
|
||||
</FORM><P>
|
||||
</FONT>
|
||||
<% rdat.writeFooter(out); %>
|
||||
|
||||
@@ -20,19 +20,6 @@
|
||||
<%@ page import = "com.silverwrist.venice.core.*" %>
|
||||
<%@ page import = "com.silverwrist.venice.servlets.Variables" %>
|
||||
<%@ page import = "com.silverwrist.venice.servlets.format.*" %>
|
||||
<%!
|
||||
|
||||
private static void renderMenu(HttpSession session, java.io.Writer out, RenderData rdat)
|
||||
throws java.io.IOException
|
||||
{
|
||||
ComponentRender menu = Variables.getMenu(session);
|
||||
if (menu==null)
|
||||
menu = new MenuTop();
|
||||
menu.renderHere(out,rdat);
|
||||
|
||||
} // end renderMenu
|
||||
|
||||
%>
|
||||
<%
|
||||
BaseJSPData basedat = BaseJSPData.retrieve(request);
|
||||
Variables.failIfNull(basedat);
|
||||
@@ -97,36 +84,51 @@ private static void renderMenu(HttpSession session, java.io.Writer out, RenderDa
|
||||
<% if (rdat.useHTMLComments()) { %><!-- END PAGE HEADER --><% } %>
|
||||
|
||||
<TR VALIGN=TOP><TD ALIGN=CENTER>
|
||||
<TABLE ALIGN=CENTER WIDTH="100%" BORDER=0 CELLPADDING=2 CELLSPACING=0><TR VALIGN=TOP>
|
||||
<TD ALIGN=LEFT WIDTH=120 BGCOLOR="#9999FF">
|
||||
<TABLE ALIGN=LEFT WIDTH=120 CELPADDING=0 CELLSPACING=0>
|
||||
<% if (rdat.useHTMLComments()) { %><!-- BEGIN LEFT SIDEBAR --><% } %>
|
||||
<TR VALIGN=TOP><TD VALIGN=LEFT><%= rdat.getStdFontTag(null,2) %>
|
||||
<% if (rdat.useHTMLComments()) { %><!-- variable menu --><% } %>
|
||||
<% renderMenu(session,out,rdat); %>
|
||||
</FONT></TD></TR>
|
||||
<TABLE ALIGN=CENTER WIDTH="100%" BORDER=0 CELLPADDING=2 CELLSPACING=0>
|
||||
<TR VALIGN=TOP>
|
||||
<TD ALIGN=LEFT WIDTH=120 BGCOLOR="#9999FF">
|
||||
<TABLE ALIGN=LEFT WIDTH=120 CELPADDING=0 CELLSPACING=0>
|
||||
<% if (rdat.useHTMLComments()) { %><!-- BEGIN LEFT SIDEBAR --><% } %>
|
||||
<TR VALIGN=TOP><TD VALIGN=LEFT><%= rdat.getStdFontTag(null,2) %>
|
||||
<% if (rdat.useHTMLComments()) { %><!-- variable menu --><% } %>
|
||||
<% basedat.renderMenu(session,out,rdat); %>
|
||||
</FONT></TD></TR>
|
||||
|
||||
<TR VALIGN=TOP><TD VALIGN=LEFT> </TD></TR>
|
||||
<TR VALIGN=TOP><TD VALIGN=LEFT><%= rdat.getStdFontTag(null,2) %>
|
||||
<% if (rdat.useHTMLComments()) { %><!-- fixed menu --><% } %>
|
||||
<B>About This Site</B><BR>
|
||||
<A HREF="/TODO">Documentation</A><BR>
|
||||
<A HREF="/TODO">About Venice</A>
|
||||
</FONT></TD></TR>
|
||||
<TR VALIGN=TOP><TD VALIGN=LEFT> </TD></TR>
|
||||
<TR VALIGN=TOP><TD VALIGN=LEFT><%= rdat.getStdFontTag(null,2) %>
|
||||
<% if (rdat.useHTMLComments()) { %><!-- fixed menu --><% } %>
|
||||
<% basedat.renderFixedMenu(out,rdat); %>
|
||||
</FONT></TD></TR>
|
||||
|
||||
<% if (rdat.useHTMLComments()) { %><!-- END LEFT SIDEBAR --><% } %>
|
||||
<% if (rdat.useHTMLComments()) { %><!-- END LEFT SIDEBAR --><% } %>
|
||||
|
||||
</TABLE>
|
||||
</TD>
|
||||
</TABLE>
|
||||
</TD>
|
||||
|
||||
<TD ALIGN=LEFT WIDTH="100%" BGCOLOR="white">
|
||||
<TABLE WIDTH="100%" BORDER=0 CELLPADDING=2 CELLSPACING=0><TR VALIGN=TOP><TD ALIGN=LEFT>
|
||||
<TD ALIGN=LEFT WIDTH="100%" BGCOLOR="white">
|
||||
<% if (rdat.useHTMLComments()) { %><!-- BEGIN PAGE CONTENT --><% } %>
|
||||
<% basedat.renderContent(application,out,rdat); %>
|
||||
<% if (rdat.useHTMLComments()) { %><!-- END PAGE CONTENT --><% } %>
|
||||
</TD></TR></TABLE>
|
||||
</TD>
|
||||
</TR></TABLE>
|
||||
<% if (rdat.useHTMLComments()) { %><!-- END PAGE CONTENT --><% } %>
|
||||
</TD>
|
||||
</TR>
|
||||
<TR VALIGN=TOP>
|
||||
<TD ALIGN=LEFT WIDTH=120 BGCOLOR="#9999FF"> </TD>
|
||||
<TD ALIGN=LEFT WIDTH="100%" BGCOLOR="white">
|
||||
<% if (rdat.useHTMLComments()) { %><!-- PAGE FOOTER --><% } %>
|
||||
<HR WIDTH="80%">
|
||||
<TABLE ALIGN=CENTER BORDER=0 CELLPADDING=0 CELLSPACING=6><TR VALIGN=TOP>
|
||||
<TD ALIGN=RIGHT><%= rdat.getStdFontTag(null,1) %>
|
||||
<%= rdat.getStockMessage("footer-text") %>
|
||||
</FONT></TD>
|
||||
<TD ALIGN=LEFT>
|
||||
<A HREF="http://venice.sourceforge.net" TARGET="_blank"><IMG
|
||||
SRC="<%= rdat.getFullImagePath("powered-by-venice.gif") %>" ALT="Powered by Venice"
|
||||
WIDTH=140 HEIGHT=80 BORDER=0 HSPACE=0 VSPACE=0></A>
|
||||
</TD>
|
||||
</TR></TABLE>
|
||||
</TD>
|
||||
</TR>
|
||||
</TABLE>
|
||||
</TD></TR>
|
||||
</TABLE>
|
||||
</BODY>
|
||||
|
||||
@@ -25,11 +25,18 @@
|
||||
Variables.failIfNull(data);
|
||||
RenderData rdat = RenderConfig.createRenderData(application,request,response);
|
||||
%>
|
||||
<% rdat.writeContentHeader(out,(data.isPosterReport() ? "Posters in Conference:"
|
||||
: "Readers in Conference:"),data.getConfName()); %>
|
||||
<%
|
||||
if (data.isTopicReport())
|
||||
rdat.writeContentHeader(out,(data.isPosterReport() ? "Posters in Topic:"
|
||||
: "Readers in Topic:"),
|
||||
data.getTopicName() + " in " + data.getConfName());
|
||||
else
|
||||
rdat.writeContentHeader(out,(data.isPosterReport() ? "Posters in Conference:"
|
||||
: "Readers in Conference:"),data.getConfName());
|
||||
%>
|
||||
<%= rdat.getStdFontTag(null,2) %>
|
||||
<A HREF="<%= rdat.getEncodedServletPath("confops?" + data.getLocator() + "&cmd=Q") %>">Return to
|
||||
Manage Conference Menu</A>
|
||||
<A HREF="<%= rdat.getEncodedServletPath("confops?" + data.getLocator() + "&cmd=QR") %>">Return to
|
||||
Conference Reports Menu</A>
|
||||
</FONT><P>
|
||||
|
||||
<% if (data.anyElements()) { %>
|
||||
@@ -79,11 +86,18 @@
|
||||
</TABLE>
|
||||
<% } else { %>
|
||||
<%= rdat.getStdFontTag(null,2) %><EM>
|
||||
<% if (data.isPosterReport()) { %>
|
||||
No posters to conference "<%= StringUtil.encodeHTML(data.getConfName()) %>" found.
|
||||
<% if (data.isTopicReport()) { %>
|
||||
<% if (data.isPosterReport()) { %>
|
||||
No posters to topic "<%= data.getTopicName() %>" found.
|
||||
<% } else { %>
|
||||
No readers of topic "<%= data.getTopicName() %>" found.
|
||||
<% } // end if %>
|
||||
<% } else { %>
|
||||
No readers of conference "<%= StringUtil.encodeHTML(data.getConfName()) %>" found.
|
||||
<% if (data.isPosterReport()) { %>
|
||||
No posters to conference "<%= StringUtil.encodeHTML(data.getConfName()) %>" found.
|
||||
<% } else { %>
|
||||
No readers of conference "<%= StringUtil.encodeHTML(data.getConfName()) %>" found.
|
||||
<% } // end if %>
|
||||
<% } // end if %>
|
||||
</EM></FONT>
|
||||
<% } // end if %>
|
||||
<P><% rdat.writeFooter(out); %>
|
||||
|
||||
@@ -151,4 +151,3 @@
|
||||
WIDTH=80 HEIGHT=24 BORDER=0>
|
||||
</FORM><BR>
|
||||
<% } // end if %>
|
||||
<% rdat.writeFooter(out); %>
|
||||
|
||||
@@ -137,4 +137,3 @@
|
||||
<% } else { %>
|
||||
<%= rdat.getStdFontTag(null,2) %><EM>There are no conferences in this SIG.</EM></FONT>
|
||||
<% } // end if %>
|
||||
<% rdat.writeFooter(out); %>
|
||||
|
||||
@@ -72,4 +72,3 @@
|
||||
BORDER=0></A>
|
||||
<% } // end if %>
|
||||
</DIV>
|
||||
<% rdat.writeFooter(out); %>
|
||||
|
||||
@@ -286,4 +286,3 @@ private static String getActivityString(SIGContext sig, RenderData rdat)
|
||||
|
||||
</TABLE><BR CLEAR=LEFT>
|
||||
<% } // end if (results found) %>
|
||||
<% rdat.writeFooter(out); %>
|
||||
|
||||
@@ -96,4 +96,3 @@
|
||||
by visiting the conferences and pressing the "Add to Hotlist" button.
|
||||
</EM></FONT>
|
||||
<% } // end if %>
|
||||
<% rdat.writeFooter(out); %>
|
||||
|
||||
@@ -49,4 +49,3 @@
|
||||
</TD></TR>
|
||||
</TABLE>
|
||||
</FORM>
|
||||
<% rdat.writeFooter(out); %>
|
||||
@@ -68,4 +68,3 @@
|
||||
</FORM>
|
||||
|
||||
</FONT>
|
||||
<% rdat.writeFooter(out); %>
|
||||
|
||||
@@ -61,13 +61,9 @@
|
||||
Conference Aliases</A><P>
|
||||
<A HREF="<%= rdat.getEncodedServletPath("confops?" + data.getLocator() + "&cmd=M") %>">Manage
|
||||
Conference Members</A><P>
|
||||
<A HREF="<%= rdat.getEncodedServletPath("confops?" + data.getLocator() + "&cmd=RP") %>">Conference
|
||||
Posters Report</A><P>
|
||||
<A HREF="<%= rdat.getEncodedServletPath("confops?" + data.getLocator() + "&cmd=RR") %>">Conference
|
||||
Readers/Lurkers Report</A><P>
|
||||
<A HREF="<%= rdat.getEncodedServletPath("confops?" + data.getLocator() + "&cmd=QR") %>">Conference
|
||||
Activity Reports</A><P>
|
||||
<A HREF="<%= rdat.getEncodedServletPath("confops?" + data.getLocator() + "&cmd=DEL") %>">Delete
|
||||
Conference</A><P>
|
||||
</B></FONT>
|
||||
<% } // end if (displaying admin section) %>
|
||||
|
||||
<% rdat.writeFooter(out); %>
|
||||
|
||||
@@ -40,5 +40,3 @@
|
||||
<A HREF="/TODO">Invite Users</A>
|
||||
</DIV>
|
||||
</FONT>
|
||||
<% rdat.writeFooter(out); %>
|
||||
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
<TABLE BORDER=0 CELLPADDING=0>
|
||||
<TR><TD ALIGN=LEFT COLSPAN=2>
|
||||
<%= rdat.getStdFontTag(null,2) %>New topic name:</FONT><BR>
|
||||
<INPUT TYPE="TEXT" NAME="title" SIZE=37 MAXLENGTH=255 VALUE="<%= data.getTopicName() %>">
|
||||
<INPUT TYPE="TEXT" NAME="title" SIZE=37 MAXLENGTH=128 VALUE="<%= data.getTopicName() %>">
|
||||
</TD></TR>
|
||||
<TR><TD ALIGN=LEFT COLSPAN=2>
|
||||
<%= rdat.getStdFontTag(null,2) %>Your name/header:</FONT><BR>
|
||||
@@ -77,4 +77,3 @@
|
||||
</TD></TR>
|
||||
</TABLE>
|
||||
</FORM>
|
||||
<% rdat.writeFooter(out); %>
|
||||
|
||||
@@ -176,7 +176,7 @@
|
||||
</EM>)
|
||||
<% if (msg.hasAttachment()) { %>
|
||||
<A HREF="<%= rdat.getEncodedServletPath("attachment?" + data.getConfLocator() + "&msg="
|
||||
+ msg.getPostID()) %>"><IMG
|
||||
+ msg.getPostID()) %>" TARGET="_blank"><IMG
|
||||
SRC="<%= rdat.getFullImagePath("attachment.gif") %>"
|
||||
ALT="(Attachment <%= msg.getAttachmentFilename() %> - <%= msg.getAttachmentLength() %> bytes)"
|
||||
WIDTH=16 HEIGHT=16 BORDER=0></A>
|
||||
@@ -341,4 +341,3 @@
|
||||
<% } else if (data.isTopicFrozen()) { %>
|
||||
<DIV ALIGN=CENTER><%= rdat.getStdFontTag(null,2) %><B>This is a <EM>Frozen</EM> Topic</B></DIV>
|
||||
<% } // end if %>
|
||||
<% rdat.writeFooter(out); %>
|
||||
|
||||
@@ -84,4 +84,3 @@
|
||||
</TD></TR>
|
||||
</TABLE>
|
||||
</FORM>
|
||||
<% rdat.writeFooter(out); %>
|
||||
|
||||
73
web/format/report_conf.jsp
Normal file
73
web/format/report_conf.jsp
Normal file
@@ -0,0 +1,73 @@
|
||||
<%--
|
||||
The contents of this file are subject to the Mozilla Public License Version 1.1
|
||||
(the "License"); you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at <http://www.mozilla.org/MPL/>.
|
||||
|
||||
Software distributed under the License is distributed on an "AS IS" basis, WITHOUT
|
||||
WARRANTY OF ANY KIND, either express or implied. See the License for the specific
|
||||
language governing rights and limitations under the License.
|
||||
|
||||
The Original Code is the Venice Web Communities System.
|
||||
|
||||
The Initial Developer of the Original Code is Eric J. Bowersox <erbo@silcom.com>,
|
||||
for Silverwrist Design Studios. Portions created by Eric J. Bowersox are
|
||||
Copyright (C) 2001 Eric J. Bowersox/Silverwrist Design Studios. All Rights Reserved.
|
||||
|
||||
Contributor(s):
|
||||
--%>
|
||||
<%@ page import = "java.util.*" %>
|
||||
<%@ page import = "com.silverwrist.util.StringUtil" %>
|
||||
<%@ page import = "com.silverwrist.venice.core.*" %>
|
||||
<%@ page import = "com.silverwrist.venice.servlets.Variables" %>
|
||||
<%@ page import = "com.silverwrist.venice.servlets.format.*" %>
|
||||
<%
|
||||
ReportConferenceMenu data = ReportConferenceMenu.retrieve(request);
|
||||
Variables.failIfNull(data);
|
||||
RenderData rdat = RenderConfig.createRenderData(application,request,response);
|
||||
String stdfont = rdat.getStdFontTag(null,2);
|
||||
String partial;
|
||||
%>
|
||||
<% if (rdat.useHTMLComments()) { %><!-- Reports for conference #<%= data.getConfID() %> --><% } %>
|
||||
<% rdat.writeContentHeader(out,"Conference Reports:",data.getConfName()); %>
|
||||
|
||||
<%= stdfont %>
|
||||
<A HREF="<%= rdat.getEncodedServletPath("confops?" + data.getLocator() + "&cmd=Q") %>">Return to Manage
|
||||
Conference Menu</A>
|
||||
</FONT><P>
|
||||
|
||||
<TABLE ALIGN=CENTER BORDER=0 CELLPADDING=0 CELLSPACING=6>
|
||||
<TR VALIGN=MIDDLE>
|
||||
<TH ALIGN=LEFT><%= stdfont %><B><U>#</U></B></FONT></TH>
|
||||
<TH ALIGN=LEFT><%= stdfont %><B><U>Topic Name</U></B></FONT></TH>
|
||||
<TH ALIGN=LEFT COLSPAN=2><%= stdfont %><B><U>Reports</U></B></FONT></TH>
|
||||
</TR>
|
||||
<TR VALIGN=MIDDLE>
|
||||
<TD ALIGN=LEFT> </TD>
|
||||
<TD ALIGN=LEFT><%= stdfont %>(Entire conference)</FONT></TD>
|
||||
<% partial = "confops?" + data.getLocator() + "&cmd="; %>
|
||||
<TD ALIGN=LEFT><%= stdfont %>
|
||||
<A HREF="<%= rdat.getEncodedServletPath(partial + "RP") %>">Posters</A>
|
||||
</FONT></TD>
|
||||
<TD ALIGN=LEFT><%= stdfont %>
|
||||
<A HREF="<%= rdat.getEncodedServletPath(partial + "RR") %>">Readers/Lurkers</A>
|
||||
</FONT></TD>
|
||||
</TR>
|
||||
|
||||
<% Iterator it = data.getTopics(); %>
|
||||
<% while (it.hasNext()) { %>
|
||||
<%
|
||||
TopicContext topic = (TopicContext)(it.next());
|
||||
partial = "confops?" + data.getLocator() + "&top=" + topic.getTopicNumber() + "&cmd=";
|
||||
%>
|
||||
<TR VALIGN=MIDDLE>
|
||||
<TD ALIGN=LEFT><%= stdfont %><%= topic.getTopicNumber() %></FONT></TD>
|
||||
<TD ALIGN=LEFT><%= stdfont %><%= topic.getName() %></FONT></TD>
|
||||
<TD ALIGN=LEFT><%= stdfont %>
|
||||
<A HREF="<%= rdat.getEncodedServletPath(partial + "RP") %>">Posters</A>
|
||||
</FONT></TD>
|
||||
<TD ALIGN=LEFT><%= stdfont %>
|
||||
<A HREF="<%= rdat.getEncodedServletPath(partial + "RR") %>">Readers/Lurkers</A>
|
||||
</FONT></TD>
|
||||
</TR>
|
||||
<% } // end while %>
|
||||
</TABLE><P>
|
||||
@@ -148,4 +148,3 @@
|
||||
WIDTH=80 HEIGHT=24 BORDER=0>
|
||||
</FORM><BR>
|
||||
<% } // end if %>
|
||||
<% rdat.writeFooter(out); %>
|
||||
|
||||
@@ -69,4 +69,3 @@
|
||||
<B>SIG Administration</B> menu.<P>
|
||||
|
||||
</FONT>
|
||||
<% rdat.writeFooter(out); %>
|
||||
|
||||
@@ -62,4 +62,3 @@
|
||||
<% } else { %>
|
||||
<%= rdat.getStdFontTag(null,2) %><EM>You are not a member of any SIGs.</EM></FONT>
|
||||
<% } // end if %>
|
||||
<% rdat.writeFooter(out); %>
|
||||
|
||||
@@ -100,4 +100,3 @@
|
||||
|
||||
</FONT></TD>
|
||||
</TR></TABLE>
|
||||
<% rdat.writeFooter(out); %>
|
||||
|
||||
@@ -33,4 +33,3 @@
|
||||
has elected to provide. Enjoy your membership!<P>
|
||||
<DIV ALIGN=CENTER><A HREF="<%= data.getEntryURL(rdat) %>">Enter SIG</A></DIV>
|
||||
</FONT>
|
||||
<% rdat.writeFooter(out); %>
|
||||
|
||||
@@ -106,6 +106,3 @@
|
||||
</TD></TR>
|
||||
</TABLE>
|
||||
</FORM>
|
||||
<% rdat.writeFooter(out); %>
|
||||
|
||||
|
||||
|
||||
@@ -51,4 +51,4 @@
|
||||
<% } // end for %>
|
||||
<% } else { %>
|
||||
<%= rdat.getStdFontTag(null,2) %><EM>No front page postings found.</EM></FONT>
|
||||
<% } // end if %>
|
||||
<% } // end if %>
|
||||
|
||||
@@ -190,4 +190,3 @@
|
||||
<B>]</B>
|
||||
</DIV>
|
||||
</FONT>
|
||||
<% rdat.writeFooter(out); %>
|
||||
|
||||
@@ -109,5 +109,3 @@
|
||||
</TABLE>
|
||||
</FORM>
|
||||
<% } // end if %>
|
||||
|
||||
<% rdat.writeFooter(out); %>
|
||||
|
||||
Reference in New Issue
Block a user