[Ils-source] r1508 - in branches/1.6: . webapp

scribe at crosswire.org scribe at crosswire.org
Mon Dec 12 10:13:03 MST 2016


Author: scribe
Date: 2016-12-12 10:13:03 -0700 (Mon, 12 Dec 2016)
New Revision: 1508

Modified:
   branches/1.6/
   branches/1.6/webapp/admin_announceedit.jsp
   branches/1.6/webapp/admin_complianceedit.jsp
   branches/1.6/webapp/admin_coursemanagement.jsp
   branches/1.6/webapp/admin_coursenew.jsp
   branches/1.6/webapp/admin_curricnew.jsp
   branches/1.6/webapp/admin_groupedit.jsp
   branches/1.6/webapp/admin_groupmanagement.jsp
   branches/1.6/webapp/admin_permpresetedit.jsp
   branches/1.6/webapp/admin_profile.jsp
   branches/1.6/webapp/admin_profilemanagement.jsp
   branches/1.6/webapp/admin_resourceedit.jsp
   branches/1.6/webapp/admin_roleedit.jsp
   branches/1.6/webapp/admin_rolemanagement.jsp
   branches/1.6/webapp/admin_sendemail.jsp
   branches/1.6/webapp/admin_studentrecords.jsp
   branches/1.6/webapp/admin_systemmanagement.jsp
   branches/1.6/webapp/admin_utilities_managecourses.jsp
   branches/1.6/webapp/employee.jsp
   branches/1.6/webapp/employeehometable.jsp
   branches/1.6/webapp/header.jsp
   branches/1.6/webapp/manager_authorization.jsp
   branches/1.6/webapp/report_employeecourseatt.jsp
   branches/1.6/webapp/report_pending_summary.jsp
   branches/1.6/webapp/report_recurrent_training.jsp
   branches/1.6/webapp/selfregistration.jsp
Log:
merged in changed to update report style classes for Dominick
and to move jquery and blockui includes to header.jsp



Property changes on: branches/1.6
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:796-1502,1504-1505
   + /trunk:796-1502,1504-1505,1507

Modified: branches/1.6/webapp/admin_announceedit.jsp
===================================================================
--- branches/1.6/webapp/admin_announceedit.jsp	2016-12-12 17:09:13 UTC (rev 1507)
+++ branches/1.6/webapp/admin_announceedit.jsp	2016-12-12 17:13:03 UTC (rev 1508)
@@ -129,7 +129,6 @@
   <head>
     <title><%= ilsSession.getCurrentCompany().getCompanyName() %> eLearning Portal</title>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
-    <script type="text/javascript" src="crosswire.js"></script>
     <link href="lms_style.css" rel="stylesheet" type="text/css"/>
     <script type="text/javascript" language="JavaScript">
 <!--

Modified: branches/1.6/webapp/admin_complianceedit.jsp
===================================================================
--- branches/1.6/webapp/admin_complianceedit.jsp	2016-12-12 17:09:13 UTC (rev 1507)
+++ branches/1.6/webapp/admin_complianceedit.jsp	2016-12-12 17:13:03 UTC (rev 1508)
@@ -75,7 +75,6 @@
   <head>
     <title><%= ilsSession.getCurrentCompany().getCompanyName() %> eLearning Portal</title>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
-    <script type="text/javascript" src="crosswire.js"></script>
 
     <script type="text/javascript" language="JavaScript">
     <!--

Modified: branches/1.6/webapp/admin_coursemanagement.jsp
===================================================================
--- branches/1.6/webapp/admin_coursemanagement.jsp	2016-12-12 17:09:13 UTC (rev 1507)
+++ branches/1.6/webapp/admin_coursemanagement.jsp	2016-12-12 17:13:03 UTC (rev 1508)
@@ -114,7 +114,6 @@
 <title><%= ilsSession.getCurrentCompany().getCompanyName() %> eLearning Portal</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link href="lms_style.css" rel="stylesheet" type="text/css">
-<script type="text/javascript" src="crosswire.js"></script>
 <script type="text/javascript" language="JavaScript">
 <!--
 function confirmSubmit(form, boxid) {

Modified: branches/1.6/webapp/admin_coursenew.jsp
===================================================================
--- branches/1.6/webapp/admin_coursenew.jsp	2016-12-12 17:09:13 UTC (rev 1507)
+++ branches/1.6/webapp/admin_coursenew.jsp	2016-12-12 17:13:03 UTC (rev 1508)
@@ -235,9 +235,7 @@
   <head>
     <title><%= ilsSession.getCurrentCompany().getCompanyName() %> eLearning Portal</title>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
-    <script type="text/javascript" src="crosswire.js"></script>
     <link href="lms_style.css" rel="stylesheet" type="text/css"/>
-    <script type="text/javascript" src="js/jquery/jquery.min.js"></script>
 
 <style>
 

Modified: branches/1.6/webapp/admin_curricnew.jsp
===================================================================
--- branches/1.6/webapp/admin_curricnew.jsp	2016-12-12 17:09:13 UTC (rev 1507)
+++ branches/1.6/webapp/admin_curricnew.jsp	2016-12-12 17:13:03 UTC (rev 1508)
@@ -146,8 +146,6 @@
 <head>
   <title><%= ilsSession.getCurrentCompany().getCompanyName() %> eLearning Portal</title>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-	<script type="text/javascript" src="crosswire.js"></script>
-	<script type="text/javascript" src="js/jquery/jquery.min.js"></script>
 	<link href="lms_style.css" rel="stylesheet" type="text/css">
 	<script type="text/javascript" language="JavaScript">
 <!--

Modified: branches/1.6/webapp/admin_groupedit.jsp
===================================================================
--- branches/1.6/webapp/admin_groupedit.jsp	2016-12-12 17:09:13 UTC (rev 1507)
+++ branches/1.6/webapp/admin_groupedit.jsp	2016-12-12 17:13:03 UTC (rev 1508)
@@ -90,7 +90,6 @@
   <head>
     <title><%= ilsSession.getCurrentCompany().getCompanyName() %> eLearning Portal</title>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
-    <script type="text/javascript" src="crosswire.js"></script>
     <link href="lms_style.css" rel="stylesheet" type="text/css"/>
   </head>
 

Modified: branches/1.6/webapp/admin_groupmanagement.jsp
===================================================================
--- branches/1.6/webapp/admin_groupmanagement.jsp	2016-12-12 17:09:13 UTC (rev 1507)
+++ branches/1.6/webapp/admin_groupmanagement.jsp	2016-12-12 17:13:03 UTC (rev 1508)
@@ -76,7 +76,6 @@
 <title><%= ilsSession.getCurrentCompany().getCompanyName() %> eLearning Portal</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link href="lms_style.css" rel="stylesheet" type="text/css">
-<script type="text/javascript" src="crosswire.js"></script>
 <script type="text/javascript" language="JavaScript">
 <!--
 function confirmSubmit(form, boxid) {

Modified: branches/1.6/webapp/admin_permpresetedit.jsp
===================================================================
--- branches/1.6/webapp/admin_permpresetedit.jsp	2016-12-12 17:09:13 UTC (rev 1507)
+++ branches/1.6/webapp/admin_permpresetedit.jsp	2016-12-12 17:13:03 UTC (rev 1508)
@@ -87,7 +87,6 @@
   <head>
     <title><%= ilsSession.getCurrentCompany().getCompanyName() %> eLearning Portal</title>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
-    <script type="text/javascript" src="crosswire.js"></script>
 
     <script type="text/javascript" language="JavaScript">
     <!--

Modified: branches/1.6/webapp/admin_profile.jsp
===================================================================
--- branches/1.6/webapp/admin_profile.jsp	2016-12-12 17:09:13 UTC (rev 1507)
+++ branches/1.6/webapp/admin_profile.jsp	2016-12-12 17:13:03 UTC (rev 1508)
@@ -404,9 +404,6 @@
     <meta http-equiv="Expires" content="-1">
     <link href="lms_style.css" rel="stylesheet" type="text/css">
     <link rel="stylesheet" href="css/chosen/chosen.min.css">
-    <script type="text/javascript" src="js/jquery/jquery.min.js"></script>
-    <script type="text/javascript" src="js/chosen/chosen.jquery.min.js"></script>
-    <script type="text/javascript" src="crosswire.js"></script>
     <script type="text/javascript" language="JavaScript">
 <!--
 var rdCtl = null;

Modified: branches/1.6/webapp/admin_profilemanagement.jsp
===================================================================
--- branches/1.6/webapp/admin_profilemanagement.jsp	2016-12-12 17:09:13 UTC (rev 1507)
+++ branches/1.6/webapp/admin_profilemanagement.jsp	2016-12-12 17:13:03 UTC (rev 1508)
@@ -257,10 +257,6 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 	<link href="lms_style.css" rel="stylesheet" type="text/css"/>
 	<link rel="stylesheet" href="css/chosen/chosen.min.css">
-	<script type="text/javascript" src="js/jquery/jquery.min.js"></script>
-	<script type="text/javascript" src="js/chosen/chosen.jquery.min.js"></script>
-	<script type="text/javascript" src="crosswire.js"></script>
-	<script type="text/javascript" src="js/jquery/jquery.blockUI.js"></script>
 	<script type="text/javascript" language="JavaScript">
 <!--
 var rdCtl = null;

Modified: branches/1.6/webapp/admin_resourceedit.jsp
===================================================================
--- branches/1.6/webapp/admin_resourceedit.jsp	2016-12-12 17:09:13 UTC (rev 1507)
+++ branches/1.6/webapp/admin_resourceedit.jsp	2016-12-12 17:13:03 UTC (rev 1508)
@@ -137,7 +137,6 @@
   <head>
     <title><%= ilsSession.getCurrentCompany().getCompanyName() %> eLearning Portal</title>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
-    <script type="text/javascript" src="crosswire.js"></script>
     <link href="lms_style.css" rel="stylesheet" type="text/css"/>
     <script type="text/javascript" language="JavaScript">
 <!--

Modified: branches/1.6/webapp/admin_roleedit.jsp
===================================================================
--- branches/1.6/webapp/admin_roleedit.jsp	2016-12-12 17:09:13 UTC (rev 1507)
+++ branches/1.6/webapp/admin_roleedit.jsp	2016-12-12 17:13:03 UTC (rev 1508)
@@ -84,7 +84,6 @@
   <head>
     <title><%= ilsSession.getCurrentCompany().getCompanyName() %> eLearning Portal</title>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
-    <script type="text/javascript" src="crosswire.js"></script>
     <link href="lms_style.css" rel="stylesheet" type="text/css"/>
   </head>
 

Modified: branches/1.6/webapp/admin_rolemanagement.jsp
===================================================================
--- branches/1.6/webapp/admin_rolemanagement.jsp	2016-12-12 17:09:13 UTC (rev 1507)
+++ branches/1.6/webapp/admin_rolemanagement.jsp	2016-12-12 17:13:03 UTC (rev 1508)
@@ -75,7 +75,6 @@
 <title><%= ilsSession.getCurrentCompany().getCompanyName() %> eLearning Portal</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link href="lms_style.css" rel="stylesheet" type="text/css">
-<script type="text/javascript" src="crosswire.js"></script>
 <script type="text/javascript" language="JavaScript">
 <!--
 function confirmSubmit(form, boxid) {

Modified: branches/1.6/webapp/admin_sendemail.jsp
===================================================================
--- branches/1.6/webapp/admin_sendemail.jsp	2016-12-12 17:09:13 UTC (rev 1507)
+++ branches/1.6/webapp/admin_sendemail.jsp	2016-12-12 17:13:03 UTC (rev 1508)
@@ -74,7 +74,6 @@
 <head>
   <title><%= ilsSession.getCurrentCompany().getCompanyName() %> eLearning Portal</title>
   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-  <script type="text/javascript" src="crosswire.js"></script>
   <link href="lms_style.css" rel="stylesheet" type="text/css">
   <script type="text/javascript" language="JavaScript">
 <!--

Modified: branches/1.6/webapp/admin_studentrecords.jsp
===================================================================
--- branches/1.6/webapp/admin_studentrecords.jsp	2016-12-12 17:09:13 UTC (rev 1507)
+++ branches/1.6/webapp/admin_studentrecords.jsp	2016-12-12 17:13:03 UTC (rev 1508)
@@ -373,10 +373,6 @@
 <title><%= ilsSession.getCurrentCompany().getCompanyName() %> eLearning Portal</title>
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
 	<link rel="stylesheet" href="css/chosen/chosen.min.css">
-	<script type="text/javascript" src="js/jquery/jquery.min.js"></script>
-	<script type="text/javascript" src="js/jquery/jquery.blockUI.js"></script>
-	<script type="text/javascript" src="js/chosen/chosen.jquery.min.js"></script>
-	<script type="text/javascript" src="crosswire.js"></script>
 	<link href="lms_style.css" rel="stylesheet" type="text/css"/>
 	<script type="text/javascript" language="JavaScript">
 <!--

Modified: branches/1.6/webapp/admin_systemmanagement.jsp
===================================================================
--- branches/1.6/webapp/admin_systemmanagement.jsp	2016-12-12 17:09:13 UTC (rev 1507)
+++ branches/1.6/webapp/admin_systemmanagement.jsp	2016-12-12 17:13:03 UTC (rev 1508)
@@ -913,8 +913,6 @@
 </style>
 
 <link href="lms_style.css" rel="stylesheet" type="text/css" />
-<script type="text/javascript" src="crosswire.js"></script>
-<script type="text/javascript" src="js/jquery/jquery.min.js"></script>
 <script type="text/javascript">
 <!--
 function confirmSubmit(form, boxid) {

Modified: branches/1.6/webapp/admin_utilities_managecourses.jsp
===================================================================
--- branches/1.6/webapp/admin_utilities_managecourses.jsp	2016-12-12 17:09:13 UTC (rev 1507)
+++ branches/1.6/webapp/admin_utilities_managecourses.jsp	2016-12-12 17:13:03 UTC (rev 1508)
@@ -128,7 +128,6 @@
 <head>
 	<title><%= ilsSession.getCurrentCompany().getCompanyName() %> eLearning Portal</title>
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-	<script type="text/javascript" src="crosswire.js"></script>
 	<link href="lms_style.css" rel="stylesheet" type="text/css">
 		<style type="text/css">
 		<!--

Modified: branches/1.6/webapp/employee.jsp
===================================================================
--- branches/1.6/webapp/employee.jsp	2016-12-12 17:09:13 UTC (rev 1507)
+++ branches/1.6/webapp/employee.jsp	2016-12-12 17:13:03 UTC (rev 1508)
@@ -58,7 +58,6 @@
 <title><%= ilsSession.getCurrentCompany().getCompanyName() %> eLearning Portal</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link href="lms_style.css" rel="stylesheet" type="text/css">
-<script type="text/javascript" src="crosswire.js"></script>
 
 <script type="text/javascript">
 <!--

Modified: branches/1.6/webapp/employeehometable.jsp
===================================================================
--- branches/1.6/webapp/employeehometable.jsp	2016-12-12 17:09:13 UTC (rev 1507)
+++ branches/1.6/webapp/employeehometable.jsp	2016-12-12 17:13:03 UTC (rev 1508)
@@ -70,7 +70,6 @@
 
 <head>
 <link href="lms_style.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="crosswire.js"></script>
 
 <script type="text/javascript">
 <!--

Modified: branches/1.6/webapp/header.jsp
===================================================================
--- branches/1.6/webapp/header.jsp	2016-12-12 17:09:13 UTC (rev 1507)
+++ branches/1.6/webapp/header.jsp	2016-12-12 17:13:03 UTC (rev 1508)
@@ -1,4 +1,8 @@
 <%@ taglib uri="/META-INF/crosswire-i18n.tld" prefix="t" %>
+	<script type="text/javascript" src="js/jquery/jquery.min.js"></script>
+	<script type="text/javascript" src="js/chosen/chosen.jquery.min.js"></script>
+	<script type="text/javascript" src="crosswire.js"></script>
+	<script type="text/javascript" src="js/jquery/jquery.blockUI.js"></script>
 <t:pagestart />
 <%
     response.setHeader("Cache-Control","no-cache"); 

Modified: branches/1.6/webapp/manager_authorization.jsp
===================================================================
--- branches/1.6/webapp/manager_authorization.jsp	2016-12-12 17:09:13 UTC (rev 1507)
+++ branches/1.6/webapp/manager_authorization.jsp	2016-12-12 17:13:03 UTC (rev 1508)
@@ -114,7 +114,6 @@
   <head>
     <title><%= ilsSession.getCurrentCompany().getCompanyName() %> eLearning Portal</title>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
-    <script type="text/javascript" src="crosswire.js"></script>
     <link href="lms_style.css" rel="stylesheet" type="text/css"/>
     <script type="text/javascript" language="JavaScript">
 <!--

Modified: branches/1.6/webapp/report_employeecourseatt.jsp
===================================================================
--- branches/1.6/webapp/report_employeecourseatt.jsp	2016-12-12 17:09:13 UTC (rev 1507)
+++ branches/1.6/webapp/report_employeecourseatt.jsp	2016-12-12 17:13:03 UTC (rev 1508)
@@ -195,9 +195,6 @@
 <title><%= ilsSession.getCurrentCompany().getCompanyName() %> eLearning Portal</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <link href="lms_style.css" rel="stylesheet" type="text/css">
-	<script type="text/javascript" src="crosswire.js"></script>
-	<script type="text/javascript" src="js/jquery/jquery.min.js"></script>
-	<script type="text/javascript" src="js/jquery/jquery.blockUI.js"></script>
 
 <script type="text/javascript">
 var rcid=0;
@@ -246,20 +243,20 @@
 	if ($('.subCurriculumID_'+courseID+':first').is(":visible")) {
 		$('#curriculumHeader_'+courseID).html('▶');
 		$('.subCurriculumID_'+courseID).hide();
-		$('.subCourseDetail').hide();
+		$('.historyDetail').hide();
 		$('.courseHeader').html('▶');
 	}
 	else {
 		$('#curriculumHeader_'+courseID).html('▼');
 		$('.subCurriculumID_'+courseID).show();
-		$('.subCourseDetail').hide();
+		$('.historyDetail').hide();
 		$('.courseHeader').html('▶');
 	}
 }
 
 $(document).ready(function() {
-	$('.subCourseDetail').hide();
-	$('.subCurriculumDetail').hide();
+	$('.historyDetail').hide();
+	$('.subCourseHeaderRow').hide();
 });
 
 
@@ -297,6 +294,7 @@
                       </tr>
                       <tr>
                         <td><table class="tableDataList tableDataListStudentRecords">
+				<thead>
                             <tr>
                               <th title="Hide/Show Courses within Curriculum"></th>
                               <th title="Hide/Show All History for an Item"></th>
@@ -312,6 +310,8 @@
                               <th>Score %</th>
                               <th>Cert</th>
                             </tr>
+				</thead>
+				<tbody>
 <%
 // TODO
 //	This is a little convoluted. We do this in the order of courseAttempt because they may sort things in some order and we'd like those results to have priority, pulling in their dependencies as we work through the queue.
@@ -344,6 +344,7 @@
 		out.write(html);
 	}
 %>
+			</tbody>
                         </table></td>
                       </tr>
     </table>
@@ -376,6 +377,7 @@
 	if (subClassAddition == null) subClassAddition = "";
 	else subClassAddition += " ";
 
+	boolean isCurriculum = curriculaList.get(ca.getCourseAttemptCourseID()) != null;
 	StringWriter out = new StringWriter();
 	String html = getCourseAttemptHTML(ca, managing, user, wordNum, supressRetake, courseCurriculum, curriculaList, courses, courseCourseAttempts);
 	courseAttempts.remove(ca);
@@ -383,13 +385,13 @@
 	for (int j = 0; j < courseAttempts.size(); ++j) {
 		CourseAttempt ca2 = courseAttempts.get(j);
 		if (ca2.getCourseAttemptCourseID() == ca.getCourseAttemptCourseID()) {
-			moreHTML += "<tr class=\""+subClassAddition+"subCourseDetail subCourseID_"+ca2.getCourseAttemptCourseID()+"\"><td></td><td></td>"+getCourseAttemptHTML(ca2, managing, user, ++wordNum, supressRetake, courseCurriculum, curriculaList, courses, courseCourseAttempts)+"</tr>";
+			moreHTML += "<tr class=\""+(subClassAddition.trim().length() > 0?"subC":"c")+(isCurriculum?"urriculum":"ourse")+"DetailRow historyDetail subCourseID_"+ca2.getCourseAttemptCourseID()+"\"><td></td><td></td>"+getCourseAttemptHTML(ca2, managing, user, ++wordNum, supressRetake, courseCurriculum, curriculaList, courses, courseCourseAttempts)+"</tr>";
 			courseAttempts.remove(ca2);
 			--j;
 		}
 	}
 
-	out.write("<tr class=\""+subClassAddition+"\">");
+	out.write("<tr class=\""+subClassAddition+(subClassAddition.trim().length() > 0?"subC":"c")+(isCurriculum?"urriculum":"ourse")+"HeaderRow\">");
 	out.write("<td>");
 	if (headerAddition != null) out.write(headerAddition);
 	out.write("</td><td>");
@@ -410,7 +412,7 @@
 
 	StringWriter out = new StringWriter();
 	String headerAddition = ("<span class=\"curHeader\" id=\"curriculumHeader_"+caCur.getCourseAttemptCourseID()+"\" title=\"Show / Hide Courses within this Curriculum\" onclick=\"toggleCurriculumDetails('"+caCur.getCourseAttemptCourseID()+"');return false;\"> ▶ </span>");
-	String html = getCourseHTML(courseAttempts, caCur, managing, user, wordNum, headerAddition, "curriculumHeader", false, courseCurriculum, curriculaList, courses, courseCourseAttempts);
+	String html = getCourseHTML(courseAttempts, caCur, managing, user, wordNum, headerAddition, null, false, courseCurriculum, curriculaList, courses, courseCourseAttempts);
 	String moreHTML = "";
 	for (int j = 0; j < courseAttempts.size(); ++j) {
 		CourseAttempt ca2 = courseAttempts.get(j);
@@ -419,7 +421,7 @@
 		Integer curriculumID = courseCurriculum.get(ca2.getCourseAttemptCourseID());
 		if (curriculumID != null && caCur.getCourseAttemptCourseID() == curriculumID.intValue()) {
 logger.info("cours is in cur.");
-			String subClassAddition = "subCurriculumDetail subCurriculumID_"+caCur.getCourseAttemptCourseID();
+			String subClassAddition = "subCurriculumID_"+caCur.getCourseAttemptCourseID();
 			Boolean supressRetake = courseSupressRetake.get(ca2.getCourseAttemptCourseID());
 			moreHTML += getCourseHTML(courseAttempts, ca2, managing, user, ++wordNum, null, subClassAddition, supressRetake != null && supressRetake.booleanValue(), courseCurriculum, curriculaList, courses, courseCourseAttempts);
 			--j;

Modified: branches/1.6/webapp/report_pending_summary.jsp
===================================================================
--- branches/1.6/webapp/report_pending_summary.jsp	2016-12-12 17:09:13 UTC (rev 1507)
+++ branches/1.6/webapp/report_pending_summary.jsp	2016-12-12 17:13:03 UTC (rev 1508)
@@ -180,10 +180,7 @@
 	<title><%= ilsSession.getCurrentCompany().getCompanyName() %> eLearning Portal</title>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
-    <script type="text/javascript" src="crosswire.js"></script>
-    <link href="lms_style.css" rel="stylesheet" type="text/css"/>
-	<script type="text/javascript" src="js/jquery/jquery.min.js"></script>
-	<script type="text/javascript" src="js/jquery/jquery.blockUI.js"></script>
+	<link href="lms_style.css" rel="stylesheet" type="text/css"/>
     <script type="text/javascript">
 <!--
 var rdCtl = null;

Modified: branches/1.6/webapp/report_recurrent_training.jsp
===================================================================
--- branches/1.6/webapp/report_recurrent_training.jsp	2016-12-12 17:09:13 UTC (rev 1507)
+++ branches/1.6/webapp/report_recurrent_training.jsp	2016-12-12 17:13:03 UTC (rev 1508)
@@ -106,10 +106,6 @@
 <title><%= ilsSession.getCurrentCompany().getCompanyName() %> eLearning Portal</title>
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
 	<link rel="stylesheet" href="css/chosen/chosen.min.css">
-	<script type="text/javascript" src="js/jquery/jquery.min.js"></script>
-	<script type="text/javascript" src="js/jquery/jquery.blockUI.js"></script>
-	<script type="text/javascript" src="js/chosen/chosen.jquery.min.js"></script>
-	<script type="text/javascript" src="crosswire.js"></script>
 	<link href="lms_style.css" rel="stylesheet" type="text/css"/>
 	<script type="text/javascript" language="JavaScript">
 <!--

Modified: branches/1.6/webapp/selfregistration.jsp
===================================================================
--- branches/1.6/webapp/selfregistration.jsp	2016-12-12 17:09:13 UTC (rev 1507)
+++ branches/1.6/webapp/selfregistration.jsp	2016-12-12 17:13:03 UTC (rev 1508)
@@ -88,7 +88,6 @@
     <meta http-equiv="Pragma" content="no-cache">
     <meta http-equiv="Expires" content="-1">
     <link href="lms_style.css" rel="stylesheet" type="text/css">
-    <script type="text/javascript" src="crosswire.js"></script>
 </head>
 
 <body onLoad="init()">




More information about the Ils-source mailing list