Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/casemgmt
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv21088/web/casemgmt
Modified Files:
newCaseManagement.jsp newCaseManagementView.jsp
noteIssueList.jsp newEncounterLayout.jsp header.jsp footer.jsp
rightColumn.jsp unlockAjax.jsp siteLayout.jsp
newCaseManagementEnable.jsp error.jsp IssueList.jsp
taglibs.jsp index.jsp encounterLayout.jsp expired.jsp
viewNotes.jsp displayNote.jsp
Log Message:
removed a slew of superfluous tags
Index: newCaseManagementEnable.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/casemgmt/newCaseManagementEnable.jsp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** newCaseManagementEnable.jsp 6 Oct 2010 21:52:08 -0000 1.14
--- newCaseManagementEnable.jsp 15 Nov 2010 03:26:14 -0000 1.15
***************
*** 1,4 ****
- <%@page contentType="text/html"%>
- <%@page pageEncoding="ISO-8859-1"%>
<%@page
import="java.util.Collections, java.util.Arrays, java.util.ArrayList, java.sql.ResultSet, java.sql.SQLException, oscar.oscarDB.DBHandler"%>
--- 1,2 ----
Index: IssueList.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/casemgmt/IssueList.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** IssueList.jsp 15 May 2010 22:10:53 -0000 1.5
--- IssueList.jsp 15 Nov 2010 03:26:14 -0000 1.6
***************
*** 24,31 ****
// *
// -----------------------------------------------------------------------------------------------------------------------
! --%>
! <%@page contentType="text/html"%>
! <%@page pageEncoding="ISO-8859-1"%>
! <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
<%@page import="org.oscarehr.casemgmt.model.*"%>
<%@page import="java.util.ArrayList"%>
--- 24,28 ----
// *
// -----------------------------------------------------------------------------------------------------------------------
! --%><%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
<%@page import="org.oscarehr.casemgmt.model.*"%>
<%@page import="java.util.ArrayList"%>
Index: displayNote.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/casemgmt/displayNote.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** displayNote.jsp 11 May 2010 00:14:26 -0000 1.3
--- displayNote.jsp 15 Nov 2010 03:26:14 -0000 1.4
***************
*** 1,4 ****
- <%@page contentType="text/html"%>
- <%@page pageEncoding="ISO-8859-1"%>
<%
String noteStr = (String)request.getAttribute("noteStr");
--- 1,2 ----
Index: footer.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/casemgmt/footer.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** footer.jsp 12 Dec 2008 22:56:00 -0000 1.3
--- footer.jsp 15 Nov 2010 03:26:14 -0000 1.4
***************
*** 22,28 ****
*/
-->
-
- <%@ page language="java"%>
-
<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean"
prefix="bean"%>
--- 22,25 ----
Index: rightColumn.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/casemgmt/rightColumn.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** rightColumn.jsp 3 Jun 2010 18:57:28 -0000 1.7
--- rightColumn.jsp 15 Nov 2010 03:26:14 -0000 1.8
***************
*** 1,3 ****
- <%@page contentType="text/html"%>
<!--
/*
--- 1,2 ----
Index: index.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/casemgmt/index.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** index.jsp 12 Dec 2008 22:56:00 -0000 1.3
--- index.jsp 15 Nov 2010 03:26:14 -0000 1.4
***************
*** 22,28 ****
*/
-->
-
- <%@ page language="java"%>
-
<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean"
prefix="bean"%>
--- 22,25 ----
Index: encounterLayout.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/casemgmt/encounterLayout.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** encounterLayout.jsp 20 Apr 2009 04:21:46 -0000 1.7
--- encounterLayout.jsp 15 Nov 2010 03:26:14 -0000 1.8
***************
*** 25,30 ****
<%@ include file="/casemgmt/taglibs.jsp"%>
<%@ page errorPage="/casemgmt/error.jsp"%>
- <%@ page language="java"%>
-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
--- 25,28 ----
Index: header.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/casemgmt/header.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** header.jsp 12 Dec 2008 22:56:00 -0000 1.3
--- header.jsp 15 Nov 2010 03:26:14 -0000 1.4
***************
*** 22,27 ****
*/
-->
- <%@ page language="java"%>
-
<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean"
prefix="bean"%>
--- 22,25 ----
Index: newCaseManagement.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/casemgmt/newCaseManagement.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** newCaseManagement.jsp 6 Oct 2010 21:52:08 -0000 1.10
--- newCaseManagement.jsp 15 Nov 2010 03:26:14 -0000 1.11
***************
*** 1,4 ****
- <%@page contentType="text/html"%>
- <%@page pageEncoding="ISO-8859-1"%>
<%@page
import="java.util.Collections, java.util.Arrays, java.util.ArrayList, java.sql.ResultSet, java.sql.SQLException, oscar.oscarDB.DBHandler"%>
--- 1,2 ----
Index: error.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/casemgmt/error.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** error.jsp 21 Jul 2010 18:24:16 -0000 1.5
--- error.jsp 15 Nov 2010 03:26:14 -0000 1.6
***************
*** 23,27 ****
-->
! <%@ page language="java" isErrorPage="true"%>
--- 23,27 ----
-->
! <%@page isErrorPage="true"%>
Index: noteIssueList.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/casemgmt/noteIssueList.jsp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** noteIssueList.jsp 1 Oct 2010 14:10:52 -0000 1.33
--- noteIssueList.jsp 15 Nov 2010 03:26:14 -0000 1.34
***************
*** 24,31 ****
// *
// -----------------------------------------------------------------------------------------------------------------------
! --%>
! <%@page contentType="text/html"%>
! <%@page pageEncoding="ISO-8859-1"%>
! <%@ page
import="org.oscarehr.casemgmt.web.formbeans.CaseManagementEntryFormBean"%>
<%@page import="org.apache.commons.lang.StringEscapeUtils"%>
--- 24,28 ----
// *
// -----------------------------------------------------------------------------------------------------------------------
! --%><%@ page
import="org.oscarehr.casemgmt.web.formbeans.CaseManagementEntryFormBean"%>
<%@page import="org.apache.commons.lang.StringEscapeUtils"%>
Index: newEncounterLayout.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/casemgmt/newEncounterLayout.jsp,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** newEncounterLayout.jsp 4 Nov 2010 06:25:16 -0000 1.51
--- newEncounterLayout.jsp 15 Nov 2010 03:26:14 -0000 1.52
***************
*** 26,32 ****
<%@ include file="/casemgmt/taglibs.jsp" %>
<%@ page errorPage="/casemgmt/error.jsp" %>
- <%@ page language="java"%>
-
-
<% if(session.getAttribute("userrole") == null ) response.sendRedirect("../logout.jsp"); %>
--- 26,29 ----
Index: taglibs.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/casemgmt/taglibs.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** taglibs.jsp 6 Sep 2010 06:02:11 -0000 1.7
--- taglibs.jsp 15 Nov 2010 03:26:14 -0000 1.8
***************
*** 23,27 ****
--%>
! <%@ page language="java" errorPage="/casemgmt/error.jsp"%>
<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean"%>
<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean-el" prefix="bean-el"%>
--- 23,27 ----
--%>
! <%@page errorPage="/casemgmt/error.jsp"%>
<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean" prefix="bean"%>
<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean-el" prefix="bean-el"%>
Index: expired.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/casemgmt/expired.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** expired.jsp 15 May 2010 22:10:53 -0000 1.6
--- expired.jsp 15 Nov 2010 03:26:14 -0000 1.7
***************
*** 23,32 ****
* Ontario, Canada
*/
! --%>
! <%@page contentType="text/html"%>
! <%@page pageEncoding="ISO-8859-1"%>
!
!
! <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
--- 23,27 ----
* Ontario, Canada
*/
! --%><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
Index: unlockAjax.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/casemgmt/unlockAjax.jsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** unlockAjax.jsp 11 May 2010 00:14:26 -0000 1.9
--- unlockAjax.jsp 15 Nov 2010 03:26:14 -0000 1.10
***************
*** 1,5 ****
- <%@page contentType="text/html"%>
- <%@page pageEncoding="ISO-8859-1"%>
-
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
<%@ taglib uri="http://jakarta.apache.org/struts/tags-bean"
--- 1,2 ----
Index: viewNotes.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/casemgmt/viewNotes.jsp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** viewNotes.jsp 20 Sep 2010 15:40:18 -0000 1.17
--- viewNotes.jsp 15 Nov 2010 03:26:14 -0000 1.18
***************
*** 25,32 ****
// -----------------------------------------------------------------------------------------------------------------------
--%>
! <% long start = System.currentTimeMillis(); %>
! <%@page contentType="text/html"%>
! <%@page pageEncoding="ISO-8859-1"%>
! <%@include file="/casemgmt/taglibs.jsp"%>
<%@page
import="java.util.List, java.util.Set, java.util.Iterator, org.oscarehr.casemgmt.model.CaseManagementIssue, org.oscarehr.casemgmt.model.CaseManagementNoteExt"%>
--- 25,29 ----
// -----------------------------------------------------------------------------------------------------------------------
--%>
! <% long start = System.currentTimeMillis(); %><%@include file="/casemgmt/taglibs.jsp"%>
<%@page
import="java.util.List, java.util.Set, java.util.Iterator, org.oscarehr.casemgmt.model.CaseManagementIssue, org.oscarehr.casemgmt.model.CaseManagementNoteExt"%>
Index: siteLayout.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/casemgmt/siteLayout.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** siteLayout.jsp 18 Dec 2008 17:26:52 -0000 1.4
--- siteLayout.jsp 15 Nov 2010 03:26:14 -0000 1.5
***************
*** 22,28 ****
*/
-->
-
- <%@ page language="java"%>
-
<%@ taglib uri="http://jakarta.apache.org/struts/tags-html"
prefix="html"%>
--- 22,25 ----
Index: newCaseManagementView.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/casemgmt/newCaseManagementView.jsp,v
retrieving revision 1.135
retrieving revision 1.136
diff -C2 -d -r1.135 -r1.136
*** newCaseManagementView.jsp 9 Nov 2010 14:45:28 -0000 1.135
--- newCaseManagementView.jsp 15 Nov 2010 03:26:14 -0000 1.136
***************
*** 1,3 ****
- <%@page contentType="text/html" pageEncoding="ISO-8859-1"%>
<%--
/*
--- 1,2 ----
|