xlawrence 2005/01/20 16:08:02 CET
Modified files:
calClient/webapp/admin/src/webapp/WEB-INF/jsp error.jsp
calClient/webapp/uiclient/src/webapp/WEB-INF/jsp emitEvent.jsp
main.jsp
Log:
Corrected jsp includes
Revision Changes Path
1.2 +2 -0
uwcal_JSR168/calClient/webapp/admin/src/webapp/WEB-INF/jsp/error.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/webapp/admin/src/webapp/WEB-INF/jsp/error.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +2 -2
uwcal_JSR168/calClient/webapp/uiclient/src/webapp/WEB-INF/jsp/emitEvent.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/webapp/uiclient/src/webapp/WEB-INF/jsp/emitEvent.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +1 -1
uwcal_JSR168/calClient/webapp/uiclient/src/webapp/WEB-INF/jsp/main.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/webapp/uiclient/src/webapp/WEB-INF/jsp/main.jsp.diff?r1=1.1&r2=1.2&f=h
Index: error.jsp
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/webapp/admin/src/webapp/WEB-INF/jsp/error.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- error.jsp 11 Jan 2005 09:47:05 -0000 1.1
+++ error.jsp 20 Jan 2005 15:08:01 -0000 1.2
@@ -4,6 +4,8 @@
<%@ taglib uri='struts-html' prefix='html' %>
<%@ taglib uri="http://portals.apache.org/bridges/struts/tags-portlet"
prefix="sp" %>
+<link rel="stylesheet" type="text/css"
href="<%=request.getContextPath()%>/css/caladmin.css" />
+
<%--
<bean:define id="appBase" name="edu.rpi.sss.util.action.approot" />
--%>
Index: emitEvent.jsp
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/webapp/uiclient/src/webapp/WEB-INF/jsp/emitEvent.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- emitEvent.jsp 11 Jan 2005 09:47:11 -0000 1.1
+++ emitEvent.jsp 20 Jan 2005 15:08:02 -0000 1.2
@@ -11,13 +11,13 @@
<bean:define id="date" name="eventFmt"
property="startCalendar"
toScope="session" />
- <jsp:include page="/docs/emitDate.jsp" />
+ <jsp:include page="emitDate.jsp" />
</start>
<end><%-- end date and time --%>
<bean:define id="date" name="eventFmt"
property="endCalendar"
toScope="session" />
- <jsp:include page="/docs/emitDate.jsp" />
+ <jsp:include page="emitDate.jsp" />
</end>
<id><bean:write name="event" property="id"/></id><%--
Value: integer - event id --%>
Index: main.jsp
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/webapp/uiclient/src/webapp/WEB-INF/jsp/main.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- main.jsp 11 Jan 2005 09:47:11 -0000 1.1
+++ main.jsp 20 Jan 2005 15:08:02 -0000 1.2
@@ -55,7 +55,7 @@
property="eventFormatters" >
<bean:define id="eventFormatter" name="eventFmt"
toScope="session" />
- <jsp:include page="/docs/emitEvent.jsp" />
+ <jsp:include page="emitEvent.jsp" />
</logic:iterate>
</logic:notEmpty>
</logic:notEqual>