From scribe at crosswire.org  Thu Dec  8 10:38:47 2016
From: scribe at crosswire.org (scribe at crosswire.org)
Date: Thu, 08 Dec 2016 10:38:47 -0700
Subject: [Ils-source] r1505 - trunk/webapp
Message-ID: <E1cF2ed-0006iq-Br@crosswire.org>

Author: scribe
Date: 2016-12-08 10:38:47 -0700 (Thu, 08 Dec 2016)
New Revision: 1505

Modified:
   trunk/webapp/admin_coursenew.jsp
   trunk/webapp/admin_curricnew.jsp
   trunk/webapp/lms_style.css
Log:
aesthetic changes from Dominick


Modified: trunk/webapp/admin_coursenew.jsp
===================================================================
--- trunk/webapp/admin_coursenew.jsp	2016-11-30 17:33:51 UTC (rev 1504)
+++ trunk/webapp/admin_coursenew.jsp	2016-12-08 17:38:47 UTC (rev 1505)
@@ -356,7 +356,7 @@
                         </select></td>
                       </tr>
                       <tr>
-                        <td class="formHeadings">URL / File Path: </td>
+                        <td class="formHeadings">URL / File Path :</td>
                         <td><table>
                             <tr>
                               <td><input name="locURL" type="text" value="<%=current.getCourseURL()%>" size="40"/>                              </td>
@@ -370,7 +370,7 @@
                         </table></td>
                       </tr>
                       <tr>
-                        <td class="formHeadings">Certification:</td>
+                        <td class="formHeadings">Certification :</td>
                         <td><table>
                             <tr>
                               <td width="130"><select name="cert">
@@ -410,7 +410,7 @@
 	                              <td colspan="2">&nbsp;</td>
 	                            </tr>
                       <tr>
-                        <td class="formHeadings">Course Certificate</td>
+                        <td class="formHeadings">Course Certificate :</td>
                         <td>
                               <input id="dontStoreCert" name="certstore" type="radio" <%=!current.isCourseCertificateStore()?"checked=\"true\"":""%> value="0" />
 				<label for="dontStoreCert">Displays Current Template and Data</label>
@@ -419,7 +419,7 @@
 			</td>
                       </tr>
                       <tr>
-                        <td class="formHeadings">Course Certificate Generator </td>
+                        <td class="formHeadings">Course Certificate Type :</td>
                         <td>
 				<select name="certgen">
 					<option value="">default</option>
@@ -449,15 +449,15 @@
 	                            </tr>
                       <tr>
                       <tr>
-                        <td class="formHeadings">Course Certificate Expires After </td>
+                        <td class="formHeadings">Course Certificate Expires After :</td>
                         <td><input name="passexp" type="text" value="<%=current.getCoursePassExpireDays()%>" size="6"/> Days</td>
                       </tr>
                       <tr>
-                        <td class="formHeadings">Reassign As Recurrent Training </td>
+                        <td class="formHeadings">Reassign As Recurrent Training :</td>
                         <td><input name="passreassign" type="text" value="<%=current.getCourseReassignBeforeDays()%>" size="6"/> Days Before Expiration</td>
                       </tr>
                        <tr>
-                        <td class="formHeadings">Reassign Now As Recurrent Training To All Applicable Users</td>
+                        <td class="formHeadings">Reassign Now As Recurrent Training :<br/>To All Applicable Users&nbsp;&nbsp;</td>
                         <td><a href="#" onClick="confirmRevoke(); return false;"><img border="0" src="images/run_btn.gif" width="51" height="24" alt="Perform Action"/></a></td>
                       </tr>
                       <tr>
@@ -470,7 +470,7 @@
 	                            </tr>
                       <tr>
                       <tr>
-                        <td class="formHeadings">Requires Management Approval for Completion: </td>
+                        <td class="formHeadings">Requires Management :<br/>Approval for Completion&nbsp;&nbsp;</td>
                         <td colspan="2">
                             <select name="mgrApprvl">
                             <option value="0" <%=(!current.isCourseRequiresManagerApproval())?"selected=\"true\"":""%>>No</option>
@@ -481,7 +481,7 @@
 
 
 
-                        <td class="formHeadings">Approval Checklist: </td>
+                        <td class="formHeadings">Approval Checklist :</td>
                         <td>
 
                         <% if ((current.getCourseChecklistURL() != null) && (current.getCourseChecklistURL().length() > 0)) { %>

Modified: trunk/webapp/admin_curricnew.jsp
===================================================================
--- trunk/webapp/admin_curricnew.jsp	2016-11-30 17:33:51 UTC (rev 1504)
+++ trunk/webapp/admin_curricnew.jsp	2016-12-08 17:38:47 UTC (rev 1505)
@@ -236,7 +236,7 @@
 	                              <td colspan="2">&nbsp;</td>
 	                            </tr>
 	                            <tr>
-	                              <td class="formHeadingsTitle">Cirriculum Certificate Settings</td>
+	                              <td class="formHeadingsTitle">Curriculum Certificate Settings</td>
 	                              <td colspan="2">&nbsp;</td>
 	                            </tr>
                       <tr>
@@ -283,15 +283,15 @@
 	                              <td colspan="2">&nbsp;</td>
 	                            </tr>
                       <tr>
-                        <td class="formHeadings">Curriculum Certificate Expires After </td>
+                        <td class="formHeadings">Curriculum Certificate Expires After :</td>
                         <td><input name="passexp" type="text" value="<%=current.getCoursePassExpireDays()%>" size="6"/> Days</td>
                       </tr>
                       <tr>
-                        <td class="formHeadings">Reassign As Recurrent Training </td>
+                        <td class="formHeadings">Reassign As Recurrent Training :</td>
                         <td><input name="passreassign" type="text" value="<%=current.getCourseReassignBeforeDays()%>" size="6"/> Days Before Expiration</td>
                       </tr>
                        <tr>
-                        <td class="formHeadings">Reassign Now As Recurrent Training To All Applicable Users</td>
+                        <td class="formHeadings">Reassign Now As Recurrent Training :<br/>To All Applicable Users&nbsp;&nbsp;</td>
                         <td><a href="#" onClick="confirmRevoke(); return false;"><img border="0" src="images/run_btn.gif" width="51" height="24" alt="Perform Action"/></a></td>
                       </tr>
                             <tr>

Modified: trunk/webapp/lms_style.css
===================================================================
--- trunk/webapp/lms_style.css	2016-11-30 17:33:51 UTC (rev 1504)
+++ trunk/webapp/lms_style.css	2016-12-08 17:38:47 UTC (rev 1505)
@@ -1,12 +1,57 @@
 td {
 	text-align: left;
 }
-body
-{
+body {
 	padding-top: 10px;
 	text-align: center;
 }
+.blockMsg h3 {
+	color: #666666 !important;
+	font-family: Arial, Helvetica, sans-serif !important;
+}
+.tableDataListStudentRecords {
+	font-weight: bold;
+}
+.curriculumHeader {
+	background: #bbbbbb;
+	font-weight: bold;
+}
+.subCurriculumDetail {
+	background: #d2d2d2 !important;
+}
+.subCurriculumDetail td {
 
+}
+.subCourseDetail {
+	/*background: #e6e5e5 !important;*/
+	background: #FFF !important;
+}
+.subCourseDetail td, .subCourseDetail td a {
+	font-style:italic !important;
+	font-weight:normal !important;
+	color:#a8a8a8 !important;
+	text-align:right !important;
+}
+.subCourseDetail td:last-child {
+	text-align:left !important;
+}
+.curHeader, .courseHeader {
+	cursor: pointer;
+}
+.dropdown {
+	background-image:none !important;
+	background-color:rgba(255, 255, 255, 0.9) !important;
+	border:1px #666666 solid !important;
+	left: -1px !important;
+	top: 33px !important;
+	width: 200px !important;
+}
+.dropdown li a {
+	color:#666666 !important;
+}
+.dropdown li a:hover {
+	text-decoration:underline !important;
+}
 .coursecomplete {
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 11px;
@@ -27,7 +72,6 @@
 	alignment:center;
 	text-align:center;
 }
-
 a {
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 12px;
@@ -49,21 +93,18 @@
 a:active {
 	text-decoration: none;
 }
-
 .courselnk a {
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 12px;
 	font-weight: bold;
 	color: #666666;
 }
-
 .instructiontxt {
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 12px;
 	color: #FF0000;
 	text-transform: uppercase;
 }
-
 .word-layer a {
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 12px;
@@ -107,8 +148,6 @@
 	font-size: 11px;
 	color: #7D7D7D;
 }
-
-
 /* browse box */
 .list-layer {
      visibility: hidden;
@@ -138,11 +177,11 @@
      text-indent : 0;
      line-height : normal;
 }
-
 /* Calendar */
 
-.caldays {color: #333333;}
-
+.caldays {
+	color: #333333;
+}
 .caldaylink {
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 12px;
@@ -152,11 +191,9 @@
 	text-decoration: none;
 	border: none;
 }
-
 .formbtn:hover {
 	text-decoration: underline;
 }
-
 .cal-layer {
      visibility: hidden;
      position:absolute;
@@ -184,28 +221,22 @@
      text-indent : 0;
      line-height : normal;
 }
-
 .cal-layer h2 {
 	margin: 0;
 }
-
-
 /* day cells */
 
 tr.cal {
 }
-
 td.cal {
 padding: 0 1px 1px;
 margin-left: 0;
 text-align: right;
 color: #333333;
 }
-
 td.cal a{
 color: #333333;
 }
-
 td.caloth a{
 color: #666666;
 }
@@ -216,16 +247,12 @@
 text-align: right;
 color: #666666;
 }
-
-
-
 /* course list */
 td.clist {
 padding: 0 1px 1px;
 margin-left: 0;
 text-align: center;
 }
-
 td.clist li {
 list-style: none;
 margin: 0;
@@ -234,28 +261,27 @@
 border-left: 1px solid #222;
 border-right: 1px solid #222;
 }
-
 td.clist li a {
 display: block;
 background: #666666;
 text-decoration: none;
 }
-
 td.clist ul {
 text-indent: 0em;
 padding: 0px;
 margin: 0px
 }
-
-td.clist li a:link { color: #000; }
-td.clist li a:visited { color: #000; }
-
+td.clist li a:link {
+	color: #000;
+}
+td.clist li a:visited {
+	color: #000;
+}
 td.clist li a:hover {
 border-color: #81693F;
 color: #8A0010;
 background : #FFFFCC
 }
-
 .shim-layer {
 	visibility: hidden;
 	position:absolute;
@@ -268,29 +294,25 @@
 	overflow: hidden;
 	z-index:8;
 }
-
 .mainmenu {
 	background-image: url(images/sidemenu_bg.jpg);
 	background-repeat: repeat-y;
 	background-position: left;
 	width: 122px;
 }
-
 /* Everything is new from this point on. When finished, some of the above styles can be deleted. */
 
 #pageContainer{
-	width: 860px;
+	width: 858px;
 	border:1px solid #C6C5C5;
 	border-top: none;
 	margin-right: auto;
 	margin-left: auto;
 	background-color: #F7F7F7;
-	text-align: center;
-	/*margin-top: -50px;*/
+	text-align: center;/*margin-top: -50px;*/
 	}
-
 #pageHeaderContainer {
-	width: 864px;
+	width: 858px;
 	margin-top: -10px;
 	margin-right: auto;
 	margin-left: auto;
@@ -313,20 +335,18 @@
 	margin: 5px;
 	padding: 5px;
 }
-#pageHeaderLogo
-{
+#pageHeaderLogo {
 	position: relative;
 	text-align: left;
 	top: 93px;
 	left: 0px;
-	width: 859px;
+	width: 858px;
 	margin: auto;
-	margin-left: 2px;
+	/*margin-left: 2px;*/
 	margin-top: -45px;
 	padding: 0px;
 }
-#pageHeaderBtns, #pageHeaderText
-{
+#pageHeaderBtns, #pageHeaderText {
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 11px;
 	color: #7D7D7D;
@@ -336,8 +356,7 @@
 	/*padding: 0 10px;*/
 	margin: -26px 10px 0 10px;
 }
-#pageHeaderBtns img
-{
+#pageHeaderBtns img {
 	margin: 0 3px;
 }
 #Banner {
@@ -352,21 +371,18 @@
 	border-left-color: #C6C5C5;*/ 
 	clear: both;
 	height: 90px;
-	width: 862px;
+	width: 858px;
 	text-align:left;
 	background-color: #fff;
 }
 /* There are two instances of the "logged in verbiage", one is always Display None, depending on the design.*/
 
-.loggedinTop
-{
+.loggedinTop {
 	/*display: none;*/
 }
-.loggedinBar
-{
+.loggedinBar {
 	display: none;
 }
-
 #MainMenu {
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 12px;
@@ -375,13 +391,14 @@
 	background-repeat: repeat-x;
 	background-position: left bottom;
 	height: 34px;
-	width: 860px;
-	border-right-width: 1px;
+	width: 858px;
+	margin-bottom:20px;
+	/*border-right-width: 1px;
 	border-left-width: 1px;
 	border-right-style: solid;
 	border-left-style: solid;
 	border-right-color: #C6C5C5;
-	border-left-color: #C6C5C5;
+	border-left-color: #C6C5C5;*/
 	background-color: #FFFFFF;
 	background-image: url(images/bggradient.jpg);
 }
@@ -402,7 +419,6 @@
 #MainMenu a:active {
 	text-decoration: none;
 }
-
 #ulMainNav {
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 10px;
@@ -411,13 +427,12 @@
 	margin: 0px;
 	padding: 0px;
 	list-style-type: none;
-	width: 860px;
+	width: 858px;
 	height: 34px;
 	background-image:url(images/bggradient.jpg);
 	background-position:left bottom;
 	background-repeat:repeat-x;
 }
-
 #ulMainNav li{
 	/*background-image:url(images/bggradient.jpg);
 	background-position:left bottom;
@@ -428,16 +443,16 @@
 	font-family:Arial,Helvetica,sans-serif;
 	font-size:10px;
 	font-weight:bold;
-	height:26px;
+	height:34px;
 	line-height:11px;
 	list-style-type:none;
 	margin:0px;
-	padding:4px 8px;
-	white-space:pre;
+	padding-top:5px;
+	padding-left:5px;
+	padding-right:5px;
+	/*white-space:pre;*/
 	width:auto;
 }
-
-
 .tableMain {
 	border: 1px solid #666666;
 	width: 838px;
@@ -482,9 +497,7 @@
 .tableData {
 	width: 100%;
 	border-collapse: collapse;
-	
 }
-
 .tableData th {
 	background-color: #9A9697;
 	background-image:url(images/reporthdr_bg.jpg);
@@ -531,14 +544,10 @@
 .tableData a:hover{
 	text-decoration:underline;
 }
-
-
 .tableDataList {
 	width: 100%;
 	border-collapse: collapse;
-	
 }
-
 .tableDataList th {
 	background-color: #9A9697;
 	background-image:url(images/reporthdr_bg.jpg);
@@ -575,8 +584,6 @@
 	padding-bottom: 0px;
 	padding-left: 5px;
 	text-align:left;
-
-
 }
 .tableDataList a{
 	font-family: Arial, Helvetica, sans-serif;
@@ -590,15 +597,10 @@
 	text-decoration:underline;
 }
 .tableDataList p{
-
 }
-
-
-
 #tableFormLogin {
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 12px;
-	padding: 5px;
 	width: 370px;
 	border: 1px solid #666666;
 	margin-top: 20px;
@@ -617,7 +619,6 @@
 	text-transform:uppercase;
 	text-align:left;
 	color: #FFFFFF;
-
 }
 #tableFormLogin td{
 	border: none;
@@ -626,14 +627,13 @@
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 12px;
 	color: #666666;
-	padding: 5px;
+	/*padding: 5px;*/
 	width: 100%;
 	border:none;
 }
-
 #tableForm, .tableForm{
 	border: 1px solid #666666;
-	width: 700px;
+	width: 838px;
 	margin-right: auto;
 	margin-left: auto;
 	background-color: #FFFFFF;
@@ -664,8 +664,6 @@
 	padding: 3px;
 	width: 100%;
 }
-
-
 .formHeadings{
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 11px;
@@ -679,6 +677,19 @@
 	background-position: top;
 	vertical-align: top;
 }
+.formHeadingsTitle {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	color: #666666;
+	padding: 5px;
+	width: 250px;
+	font-weight: bold;
+	text-transform: capitalize;
+	background-position: top;
+	vertical-align: top;
+	text-decoration:underline;
+	text-align: left;
+}
 .formButtons, .formButtons a, .formButtons a:visited{
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 12px;
@@ -687,7 +698,6 @@
 	width: 90px;
 	display: block;
 	vertical-align: text-bottom;
-
 }
 .formButtons a:hover{
 text-decoration:underline;
@@ -696,8 +706,6 @@
 	border:none;
 	width: 320px;
 }
-
-
 #copyright {
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 12px;
@@ -707,13 +715,11 @@
 	background-color: #CCCCCC;
 	text-align: center;
 	height: 15px;
-	width: 862px;
-	border: 1px solid #C6C5C5;
-	border-top: none;
-	margin: 0px 0 0 0;
+	width: 858px;/*border: 1px solid #C6C5C5;
+	border-top: none;*//*margin: 0px 0 0 0;*/
 }
 #pageTitles {
-	width: 860px;
+	width: 858px;
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 16px;
 	color: #666666;
@@ -721,7 +727,6 @@
 	font-weight: bold;
 	text-align: left;
 	}
-
 #loginHeader {
 	height: 90px;
 	width: 525px;
@@ -729,12 +734,10 @@
 	border-bottom: none;
 	text-align: left;
 	background-image: url(images/login_hdr.jpg);
-
 }
 #loginContainer {
 	width: 525px;
 	border: 1px solid #C6C5C5;
-
 }
 #loginTitles {
 	width: 500px;
@@ -749,7 +752,6 @@
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 12px;
 	color: #666666;
-
 }
 .PageNumberNum, PageNumberNum a {
 	font-family: Arial, Helvetica, sans-serif;
@@ -758,7 +760,6 @@
 	color: #4A854D;
 	padding: 3px;
 }
-
 .PageNumberNum a:hover, a:active {
 	text-decoration:underline;
 }
@@ -772,7 +773,6 @@
 	margin: 0px;
 	padding: 0px;
 }
-
 #pageContainer #content .tableMain .tableDataList .Assign {
 	color: #E1272C;
 	text-transform: uppercase;



From scribe at crosswire.org  Thu Dec  8 10:41:18 2016
From: scribe at crosswire.org (scribe at crosswire.org)
Date: Thu, 08 Dec 2016 10:41:18 -0700
Subject: [Ils-source] r1506 - in branches/1.6: . webapp
Message-ID: <E1cF2h4-0006kf-Tt@crosswire.org>

Author: scribe
Date: 2016-12-08 10:41:18 -0700 (Thu, 08 Dec 2016)
New Revision: 1506

Modified:
   branches/1.6/
   branches/1.6/webapp/admin_coursenew.jsp
   branches/1.6/webapp/admin_curricnew.jsp
   branches/1.6/webapp/lms_style.css
   branches/1.6/webapp/report_employeecourseatt.jsp
Log:
merged aesthetic improvements from Dominick



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

Modified: branches/1.6/webapp/admin_coursenew.jsp
===================================================================
--- branches/1.6/webapp/admin_coursenew.jsp	2016-12-08 17:38:47 UTC (rev 1505)
+++ branches/1.6/webapp/admin_coursenew.jsp	2016-12-08 17:41:18 UTC (rev 1506)
@@ -356,7 +356,7 @@
                         </select></td>
                       </tr>
                       <tr>
-                        <td class="formHeadings">URL / File Path: </td>
+                        <td class="formHeadings">URL / File Path :</td>
                         <td><table>
                             <tr>
                               <td><input name="locURL" type="text" value="<%=current.getCourseURL()%>" size="40"/>                              </td>
@@ -370,7 +370,7 @@
                         </table></td>
                       </tr>
                       <tr>
-                        <td class="formHeadings">Certification:</td>
+                        <td class="formHeadings">Certification :</td>
                         <td><table>
                             <tr>
                               <td width="130"><select name="cert">
@@ -402,7 +402,15 @@
                         <td><input name="pass" type="text" value="<%=current.getCoursePass()%>" size="6"/> % </td>
                       </tr>
                       <tr>
-                        <td class="formHeadings">Course Certificate</td>
+	                              <td>&nbsp;</td>
+	                              <td colspan="2">&nbsp;</td>
+	                            </tr>
+	                            <tr>
+	                              <td class="formHeadingsTitle">Course Certificate Settings</td>
+	                              <td colspan="2">&nbsp;</td>
+	                            </tr>
+                      <tr>
+                        <td class="formHeadings">Course Certificate :</td>
                         <td>
                               <input id="dontStoreCert" name="certstore" type="radio" <%=!current.isCourseCertificateStore()?"checked=\"true\"":""%> value="0" />
 				<label for="dontStoreCert">Displays Current Template and Data</label>
@@ -411,7 +419,7 @@
 			</td>
                       </tr>
                       <tr>
-                        <td class="formHeadings">Course Certificate Generator </td>
+                        <td class="formHeadings">Course Certificate Type :</td>
                         <td>
 				<select name="certgen">
 					<option value="">default</option>
@@ -432,19 +440,37 @@
 			</td>
                       </tr>
                       <tr>
-                        <td class="formHeadings">Course Certificate Expires After </td>
+	                              <td>&nbsp;</td>
+	                              <td colspan="2">&nbsp;</td>
+	                            </tr>
+	                            <tr>
+	                              <td class="formHeadingsTitle">Recurrent Training Settings</td>
+	                              <td colspan="2">&nbsp;</td>
+	                            </tr>
+                      <tr>
+                      <tr>
+                        <td class="formHeadings">Course Certificate Expires After :</td>
                         <td><input name="passexp" type="text" value="<%=current.getCoursePassExpireDays()%>" size="6"/> Days</td>
                       </tr>
                       <tr>
-                        <td class="formHeadings">Reassign As Recurrent Training </td>
+                        <td class="formHeadings">Reassign As Recurrent Training :</td>
                         <td><input name="passreassign" type="text" value="<%=current.getCourseReassignBeforeDays()%>" size="6"/> Days Before Expiration</td>
                       </tr>
                        <tr>
-                        <td class="formHeadings">Reassign Now As Recurrent Training To All Applicable Users</td>
+                        <td class="formHeadings">Reassign Now As Recurrent Training :<br/>To All Applicable Users&nbsp;&nbsp;</td>
                         <td><a href="#" onClick="confirmRevoke(); return false;"><img border="0" src="images/run_btn.gif" width="51" height="24" alt="Perform Action"/></a></td>
                       </tr>
                       <tr>
-                        <td class="formHeadings">Requires Management Approval for Completion: </td>
+	                              <td>&nbsp;</td>
+	                              <td colspan="2">&nbsp;</td>
+	                            </tr>
+	                            <tr>
+	                              <td class="formHeadingsTitle">Manager Approval Settings</td>
+	                              <td colspan="2">&nbsp;</td>
+	                            </tr>
+                      <tr>
+                      <tr>
+                        <td class="formHeadings">Requires Management :<br/>Approval for Completion&nbsp;&nbsp;</td>
                         <td colspan="2">
                             <select name="mgrApprvl">
                             <option value="0" <%=(!current.isCourseRequiresManagerApproval())?"selected=\"true\"":""%>>No</option>
@@ -455,7 +481,7 @@
 
 
 
-                        <td class="formHeadings">Approval Checklist: </td>
+                        <td class="formHeadings">Approval Checklist :</td>
                         <td>
 
                         <% if ((current.getCourseChecklistURL() != null) && (current.getCourseChecklistURL().length() > 0)) { %>

Modified: branches/1.6/webapp/admin_curricnew.jsp
===================================================================
--- branches/1.6/webapp/admin_curricnew.jsp	2016-12-08 17:38:47 UTC (rev 1505)
+++ branches/1.6/webapp/admin_curricnew.jsp	2016-12-08 17:41:18 UTC (rev 1506)
@@ -227,12 +227,25 @@
                                   <option value="0" <%=(!current.isCourseActive())?"selected=\"true\"":""%>>Inactive</option>
                               </select></td>
                             </tr>
+							<tr>
+                              <td class="formHeadings">Enable Curriculum Partial Retake :</td>
+                              <td><input type="checkbox" <%=(current.isCourseAllowCurriculumPartRetake())?"checked=\"checked\"":""%> name="curricPartRetake" value="true" /></td>
+                            </tr>
                             <tr>
+	                              <td>&nbsp;</td>
+	                              <td colspan="2">&nbsp;</td>
+	                            </tr>
+	                            <tr>
+	                              <td class="formHeadingsTitle">Curriculum Certificate Settings</td>
+	                              <td colspan="2">&nbsp;</td>
+	                            </tr>
+                      <tr>
+                            <tr>
                               <td class="formHeadings">Enable Curriculum Certificate :</td>
-                              <td><input onclick="updateCertVisibility();" type="checkbox" <%=(current.isCourseCurriculumCertificate())?"checked=\"checked\"":""%> id="curricCert" name="curricCert" value="true" /></td>
+                              <td><input onClick="updateCertVisibility();" type="checkbox" <%=(current.isCourseCurriculumCertificate())?"checked=\"checked\"":""%> id="curricCert" name="curricCert" value="true" /></td>
                             </tr>
 			      <tr>
-                        <td class="formHeadings">Curriculum Certificate</td>
+                        <td class="formHeadings">Curriculum Certificate :</td>
                         <td>
                               <input id="dontStoreCert" name="certstore" type="radio" <%=!current.isCourseCertificateStore()?"checked=\"true\"":""%> value="0" />
 				<label for="dontStoreCert">Displays Current Template and Data</label>
@@ -241,7 +254,7 @@
 			</td>
                       </tr>
                       <tr>
-				<td class="formHeadings">Curriculum Certificate Generator </td>
+				<td class="formHeadings">Curriculum Certificate Type :</td>
 				<td>
 					<select id="certgen" name="certgen">
 						<option value="">default</option>
@@ -261,20 +274,24 @@
 					</select>
 				</td>
 			      </tr>
-                            <tr>
-                              <td class="formHeadings">Enable Curriculum Part Retake :</td>
-                              <td><input type="checkbox" <%=(current.isCourseAllowCurriculumPartRetake())?"checked=\"checked\"":""%> name="curricPartRetake" value="true" /></td>
-                            </tr>
+                  <tr>
+	                              <td>&nbsp;</td>
+	                              <td colspan="2">&nbsp;</td>
+	                            </tr>
+	                            <tr>
+	                              <td class="formHeadingsTitle">Recurrent Training Settings</td>
+	                              <td colspan="2">&nbsp;</td>
+	                            </tr>
                       <tr>
-                        <td class="formHeadings">Curriculum Certificate Expires After </td>
+                        <td class="formHeadings">Curriculum Certificate Expires After :</td>
                         <td><input name="passexp" type="text" value="<%=current.getCoursePassExpireDays()%>" size="6"/> Days</td>
                       </tr>
                       <tr>
-                        <td class="formHeadings">Reassign As Recurrent Training </td>
+                        <td class="formHeadings">Reassign As Recurrent Training :</td>
                         <td><input name="passreassign" type="text" value="<%=current.getCourseReassignBeforeDays()%>" size="6"/> Days Before Expiration</td>
                       </tr>
                        <tr>
-                        <td class="formHeadings">Reassign Now As Recurrent Training To All Applicable Users</td>
+                        <td class="formHeadings">Reassign Now As Recurrent Training :<br/>To All Applicable Users&nbsp;&nbsp;</td>
                         <td><a href="#" onClick="confirmRevoke(); return false;"><img border="0" src="images/run_btn.gif" width="51" height="24" alt="Perform Action"/></a></td>
                       </tr>
                             <tr>

Modified: branches/1.6/webapp/lms_style.css
===================================================================
--- branches/1.6/webapp/lms_style.css	2016-12-08 17:38:47 UTC (rev 1505)
+++ branches/1.6/webapp/lms_style.css	2016-12-08 17:41:18 UTC (rev 1506)
@@ -1,12 +1,57 @@
 td {
 	text-align: left;
 }
-body
-{
+body {
 	padding-top: 10px;
 	text-align: center;
 }
+.blockMsg h3 {
+	color: #666666 !important;
+	font-family: Arial, Helvetica, sans-serif !important;
+}
+.tableDataListStudentRecords {
+	font-weight: bold;
+}
+.curriculumHeader {
+	background: #bbbbbb;
+	font-weight: bold;
+}
+.subCurriculumDetail {
+	background: #d2d2d2 !important;
+}
+.subCurriculumDetail td {
 
+}
+.subCourseDetail {
+	/*background: #e6e5e5 !important;*/
+	background: #FFF !important;
+}
+.subCourseDetail td, .subCourseDetail td a {
+	font-style:italic !important;
+	font-weight:normal !important;
+	color:#a8a8a8 !important;
+	text-align:right !important;
+}
+.subCourseDetail td:last-child {
+	text-align:left !important;
+}
+.curHeader, .courseHeader {
+	cursor: pointer;
+}
+.dropdown {
+	background-image:none !important;
+	background-color:rgba(255, 255, 255, 0.9) !important;
+	border:1px #666666 solid !important;
+	left: -1px !important;
+	top: 33px !important;
+	width: 200px !important;
+}
+.dropdown li a {
+	color:#666666 !important;
+}
+.dropdown li a:hover {
+	text-decoration:underline !important;
+}
 .coursecomplete {
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 11px;
@@ -27,7 +72,6 @@
 	alignment:center;
 	text-align:center;
 }
-
 a {
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 12px;
@@ -49,21 +93,18 @@
 a:active {
 	text-decoration: none;
 }
-
 .courselnk a {
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 12px;
 	font-weight: bold;
 	color: #666666;
 }
-
 .instructiontxt {
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 12px;
 	color: #FF0000;
 	text-transform: uppercase;
 }
-
 .word-layer a {
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 12px;
@@ -107,8 +148,6 @@
 	font-size: 11px;
 	color: #7D7D7D;
 }
-
-
 /* browse box */
 .list-layer {
      visibility: hidden;
@@ -138,11 +177,11 @@
      text-indent : 0;
      line-height : normal;
 }
-
 /* Calendar */
 
-.caldays {color: #333333;}
-
+.caldays {
+	color: #333333;
+}
 .caldaylink {
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 12px;
@@ -152,11 +191,9 @@
 	text-decoration: none;
 	border: none;
 }
-
 .formbtn:hover {
 	text-decoration: underline;
 }
-
 .cal-layer {
      visibility: hidden;
      position:absolute;
@@ -184,28 +221,22 @@
      text-indent : 0;
      line-height : normal;
 }
-
 .cal-layer h2 {
 	margin: 0;
 }
-
-
 /* day cells */
 
 tr.cal {
 }
-
 td.cal {
 padding: 0 1px 1px;
 margin-left: 0;
 text-align: right;
 color: #333333;
 }
-
 td.cal a{
 color: #333333;
 }
-
 td.caloth a{
 color: #666666;
 }
@@ -216,16 +247,12 @@
 text-align: right;
 color: #666666;
 }
-
-
-
 /* course list */
 td.clist {
 padding: 0 1px 1px;
 margin-left: 0;
 text-align: center;
 }
-
 td.clist li {
 list-style: none;
 margin: 0;
@@ -234,28 +261,27 @@
 border-left: 1px solid #222;
 border-right: 1px solid #222;
 }
-
 td.clist li a {
 display: block;
 background: #666666;
 text-decoration: none;
 }
-
 td.clist ul {
 text-indent: 0em;
 padding: 0px;
 margin: 0px
 }
-
-td.clist li a:link { color: #000; }
-td.clist li a:visited { color: #000; }
-
+td.clist li a:link {
+	color: #000;
+}
+td.clist li a:visited {
+	color: #000;
+}
 td.clist li a:hover {
 border-color: #81693F;
 color: #8A0010;
 background : #FFFFCC
 }
-
 .shim-layer {
 	visibility: hidden;
 	position:absolute;
@@ -268,29 +294,25 @@
 	overflow: hidden;
 	z-index:8;
 }
-
 .mainmenu {
 	background-image: url(images/sidemenu_bg.jpg);
 	background-repeat: repeat-y;
 	background-position: left;
 	width: 122px;
 }
-
 /* Everything is new from this point on. When finished, some of the above styles can be deleted. */
 
 #pageContainer{
-	width: 860px;
+	width: 858px;
 	border:1px solid #C6C5C5;
 	border-top: none;
 	margin-right: auto;
 	margin-left: auto;
 	background-color: #F7F7F7;
-	text-align: center;
-	/*margin-top: -50px;*/
+	text-align: center;/*margin-top: -50px;*/
 	}
-
 #pageHeaderContainer {
-	width: 864px;
+	width: 858px;
 	margin-top: -10px;
 	margin-right: auto;
 	margin-left: auto;
@@ -313,20 +335,18 @@
 	margin: 5px;
 	padding: 5px;
 }
-#pageHeaderLogo
-{
+#pageHeaderLogo {
 	position: relative;
 	text-align: left;
 	top: 93px;
 	left: 0px;
-	width: 859px;
+	width: 858px;
 	margin: auto;
-	margin-left: 2px;
+	/*margin-left: 2px;*/
 	margin-top: -45px;
 	padding: 0px;
 }
-#pageHeaderBtns, #pageHeaderText
-{
+#pageHeaderBtns, #pageHeaderText {
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 11px;
 	color: #7D7D7D;
@@ -336,8 +356,7 @@
 	/*padding: 0 10px;*/
 	margin: -26px 10px 0 10px;
 }
-#pageHeaderBtns img
-{
+#pageHeaderBtns img {
 	margin: 0 3px;
 }
 #Banner {
@@ -352,21 +371,18 @@
 	border-left-color: #C6C5C5;*/ 
 	clear: both;
 	height: 90px;
-	width: 862px;
+	width: 858px;
 	text-align:left;
 	background-color: #fff;
 }
 /* There are two instances of the "logged in verbiage", one is always Display None, depending on the design.*/
 
-.loggedinTop
-{
+.loggedinTop {
 	/*display: none;*/
 }
-.loggedinBar
-{
+.loggedinBar {
 	display: none;
 }
-
 #MainMenu {
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 12px;
@@ -375,13 +391,14 @@
 	background-repeat: repeat-x;
 	background-position: left bottom;
 	height: 34px;
-	width: 860px;
-	border-right-width: 1px;
+	width: 858px;
+	margin-bottom:20px;
+	/*border-right-width: 1px;
 	border-left-width: 1px;
 	border-right-style: solid;
 	border-left-style: solid;
 	border-right-color: #C6C5C5;
-	border-left-color: #C6C5C5;
+	border-left-color: #C6C5C5;*/
 	background-color: #FFFFFF;
 	background-image: url(images/bggradient.jpg);
 }
@@ -402,7 +419,6 @@
 #MainMenu a:active {
 	text-decoration: none;
 }
-
 #ulMainNav {
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 10px;
@@ -411,13 +427,12 @@
 	margin: 0px;
 	padding: 0px;
 	list-style-type: none;
-	width: 860px;
+	width: 858px;
 	height: 34px;
 	background-image:url(images/bggradient.jpg);
 	background-position:left bottom;
 	background-repeat:repeat-x;
 }
-
 #ulMainNav li{
 	/*background-image:url(images/bggradient.jpg);
 	background-position:left bottom;
@@ -428,16 +443,16 @@
 	font-family:Arial,Helvetica,sans-serif;
 	font-size:10px;
 	font-weight:bold;
-	height:26px;
+	height:34px;
 	line-height:11px;
 	list-style-type:none;
 	margin:0px;
-	padding:4px 8px;
-	white-space:pre;
+	padding-top:5px;
+	padding-left:5px;
+	padding-right:5px;
+	/*white-space:pre;*/
 	width:auto;
 }
-
-
 .tableMain {
 	border: 1px solid #666666;
 	width: 838px;
@@ -482,9 +497,7 @@
 .tableData {
 	width: 100%;
 	border-collapse: collapse;
-	
 }
-
 .tableData th {
 	background-color: #9A9697;
 	background-image:url(images/reporthdr_bg.jpg);
@@ -531,14 +544,10 @@
 .tableData a:hover{
 	text-decoration:underline;
 }
-
-
 .tableDataList {
 	width: 100%;
 	border-collapse: collapse;
-	
 }
-
 .tableDataList th {
 	background-color: #9A9697;
 	background-image:url(images/reporthdr_bg.jpg);
@@ -575,8 +584,6 @@
 	padding-bottom: 0px;
 	padding-left: 5px;
 	text-align:left;
-
-
 }
 .tableDataList a{
 	font-family: Arial, Helvetica, sans-serif;
@@ -590,15 +597,10 @@
 	text-decoration:underline;
 }
 .tableDataList p{
-
 }
-
-
-
 #tableFormLogin {
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 12px;
-	padding: 5px;
 	width: 370px;
 	border: 1px solid #666666;
 	margin-top: 20px;
@@ -617,7 +619,6 @@
 	text-transform:uppercase;
 	text-align:left;
 	color: #FFFFFF;
-
 }
 #tableFormLogin td{
 	border: none;
@@ -626,14 +627,13 @@
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 12px;
 	color: #666666;
-	padding: 5px;
+	/*padding: 5px;*/
 	width: 100%;
 	border:none;
 }
-
 #tableForm, .tableForm{
 	border: 1px solid #666666;
-	width: 700px;
+	width: 838px;
 	margin-right: auto;
 	margin-left: auto;
 	background-color: #FFFFFF;
@@ -664,8 +664,6 @@
 	padding: 3px;
 	width: 100%;
 }
-
-
 .formHeadings{
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 11px;
@@ -679,6 +677,19 @@
 	background-position: top;
 	vertical-align: top;
 }
+.formHeadingsTitle {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	color: #666666;
+	padding: 5px;
+	width: 250px;
+	font-weight: bold;
+	text-transform: capitalize;
+	background-position: top;
+	vertical-align: top;
+	text-decoration:underline;
+	text-align: left;
+}
 .formButtons, .formButtons a, .formButtons a:visited{
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 12px;
@@ -687,7 +698,6 @@
 	width: 90px;
 	display: block;
 	vertical-align: text-bottom;
-
 }
 .formButtons a:hover{
 text-decoration:underline;
@@ -696,8 +706,6 @@
 	border:none;
 	width: 320px;
 }
-
-
 #copyright {
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 12px;
@@ -707,13 +715,11 @@
 	background-color: #CCCCCC;
 	text-align: center;
 	height: 15px;
-	width: 862px;
-	border: 1px solid #C6C5C5;
-	border-top: none;
-	margin: 0px 0 0 0;
+	width: 858px;/*border: 1px solid #C6C5C5;
+	border-top: none;*//*margin: 0px 0 0 0;*/
 }
 #pageTitles {
-	width: 860px;
+	width: 858px;
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 16px;
 	color: #666666;
@@ -721,7 +727,6 @@
 	font-weight: bold;
 	text-align: left;
 	}
-
 #loginHeader {
 	height: 90px;
 	width: 525px;
@@ -729,12 +734,10 @@
 	border-bottom: none;
 	text-align: left;
 	background-image: url(images/login_hdr.jpg);
-
 }
 #loginContainer {
 	width: 525px;
 	border: 1px solid #C6C5C5;
-
 }
 #loginTitles {
 	width: 500px;
@@ -749,7 +752,6 @@
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 12px;
 	color: #666666;
-
 }
 .PageNumberNum, PageNumberNum a {
 	font-family: Arial, Helvetica, sans-serif;
@@ -758,7 +760,6 @@
 	color: #4A854D;
 	padding: 3px;
 }
-
 .PageNumberNum a:hover, a:active {
 	text-decoration:underline;
 }
@@ -772,7 +773,6 @@
 	margin: 0px;
 	padding: 0px;
 }
-
 #pageContainer #content .tableMain .tableDataList .Assign {
 	color: #E1272C;
 	text-transform: uppercase;

Modified: branches/1.6/webapp/report_employeecourseatt.jsp
===================================================================
--- branches/1.6/webapp/report_employeecourseatt.jsp	2016-12-08 17:38:47 UTC (rev 1505)
+++ branches/1.6/webapp/report_employeecourseatt.jsp	2016-12-08 17:41:18 UTC (rev 1506)
@@ -195,16 +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">
-<style>
-	.curriculumHeader {
-		background: lightgrey;
-	}
-
-	.curHeader, .courseHeader {
-		cursor: pointer;
-	}
-</style>
-
 	<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>
@@ -306,10 +296,10 @@
                         </td>
                       </tr>
                       <tr>
-                        <td><table class="tableDataList">
+                        <td><table class="tableDataList tableDataListStudentRecords">
                             <tr>
-                              <th title="Hide/Show Courses within Curriculum">C</th>
-                              <th title="Hide/Show All History for an Item">H</th>
+                              <th title="Hide/Show Courses within Curriculum"></th>
+                              <th title="Hide/Show All History for an Item"></th>
 <% if (managing) { %>                            
                               <th>Comments</th>
 <% } %>                              
@@ -491,7 +481,7 @@
 		out.write("<td>");
 		if ("Passed".equals(status)) {
 			if (!ca.isCourseAttemptExpired() && !supressRetake) {
-				out.write("<a href=\"#\" onClick=\"retake("+ca.getCourseAttemptID()+");return false;\" class=\"Assign\">Assign Retake</a>");
+				out.write("<a href=\"#\" onClick=\"retake("+ca.getCourseAttemptID()+");return false;\" class=\"Assign\">Assign Retake</a><br>");
 			}
 		}
 		else if (!"Awaiting <t:t>Manager</t:t> Approval".equals(status) && user.getUserProfileAccessLevel() > UserProfile.ACCESS_MANAGER || user.hasAccess(UserProfile.ACCESS_MODE_STUDENTREC_PASS_OVERRIDE)) {
@@ -513,7 +503,7 @@
 
 	out.write("<td>"+status+"</td>");
 	out.write("<td>"+ca.getStringValue("coursenum")+"</td>");
-	out.write("<td><a href=\"#\" onclick=\"p('course','"+ca.getCourseAttemptCourseID()+"','"+wordNum+"');\"><strong>"+ca.getStringValue("coursename")+"</strong></a></td>");
+	out.write("<td><a href=\"#\" onclick=\"p('course','"+ca.getCourseAttemptCourseID()+"','"+wordNum+"');\">"+ca.getStringValue("coursename")+"</a></td>");
 	out.write("<td>"+ca.getStringValue("seattimetext")+"</td>");
 	out.write("<td>"+startDate+"</td>");
 	out.write("<td>"+endDate+"</td>");



From scribe at crosswire.org  Mon Dec 12 10:09:13 2016
From: scribe at crosswire.org (scribe at crosswire.org)
Date: Mon, 12 Dec 2016 10:09:13 -0700
Subject: [Ils-source] r1507 - trunk/webapp
Message-ID: <E1cGU6D-0000Yk-Jq@crosswire.org>

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

Modified:
   trunk/webapp/admin_announceedit.jsp
   trunk/webapp/admin_complianceedit.jsp
   trunk/webapp/admin_coursemanagement.jsp
   trunk/webapp/admin_coursenew.jsp
   trunk/webapp/admin_curricnew.jsp
   trunk/webapp/admin_groupedit.jsp
   trunk/webapp/admin_groupmanagement.jsp
   trunk/webapp/admin_permpresetedit.jsp
   trunk/webapp/admin_profile.jsp
   trunk/webapp/admin_profilemanagement.jsp
   trunk/webapp/admin_resourceedit.jsp
   trunk/webapp/admin_roleedit.jsp
   trunk/webapp/admin_rolemanagement.jsp
   trunk/webapp/admin_sendemail.jsp
   trunk/webapp/admin_studentrecords.jsp
   trunk/webapp/admin_systemmanagement.jsp
   trunk/webapp/admin_utilities_managecourses.jsp
   trunk/webapp/employee.jsp
   trunk/webapp/employeehometable.jsp
   trunk/webapp/header.jsp
   trunk/webapp/manager_authorization.jsp
   trunk/webapp/report_employeecourseatt.jsp
   trunk/webapp/report_pending_summary.jsp
   trunk/webapp/report_recurrent_training.jsp
   trunk/webapp/selfregistration.jsp
Log:
moved inclusion on jquery and blockui wait screen to header.jsp
updated employee course attempt report to use better organized style classes for Dominick.


Modified: trunk/webapp/admin_announceedit.jsp
===================================================================
--- trunk/webapp/admin_announceedit.jsp	2016-12-08 17:41:18 UTC (rev 1506)
+++ trunk/webapp/admin_announceedit.jsp	2016-12-12 17:09:13 UTC (rev 1507)
@@ -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: trunk/webapp/admin_complianceedit.jsp
===================================================================
--- trunk/webapp/admin_complianceedit.jsp	2016-12-08 17:41:18 UTC (rev 1506)
+++ trunk/webapp/admin_complianceedit.jsp	2016-12-12 17:09:13 UTC (rev 1507)
@@ -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: trunk/webapp/admin_coursemanagement.jsp
===================================================================
--- trunk/webapp/admin_coursemanagement.jsp	2016-12-08 17:41:18 UTC (rev 1506)
+++ trunk/webapp/admin_coursemanagement.jsp	2016-12-12 17:09:13 UTC (rev 1507)
@@ -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: trunk/webapp/admin_coursenew.jsp
===================================================================
--- trunk/webapp/admin_coursenew.jsp	2016-12-08 17:41:18 UTC (rev 1506)
+++ trunk/webapp/admin_coursenew.jsp	2016-12-12 17:09:13 UTC (rev 1507)
@@ -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: trunk/webapp/admin_curricnew.jsp
===================================================================
--- trunk/webapp/admin_curricnew.jsp	2016-12-08 17:41:18 UTC (rev 1506)
+++ trunk/webapp/admin_curricnew.jsp	2016-12-12 17:09:13 UTC (rev 1507)
@@ -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: trunk/webapp/admin_groupedit.jsp
===================================================================
--- trunk/webapp/admin_groupedit.jsp	2016-12-08 17:41:18 UTC (rev 1506)
+++ trunk/webapp/admin_groupedit.jsp	2016-12-12 17:09:13 UTC (rev 1507)
@@ -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: trunk/webapp/admin_groupmanagement.jsp
===================================================================
--- trunk/webapp/admin_groupmanagement.jsp	2016-12-08 17:41:18 UTC (rev 1506)
+++ trunk/webapp/admin_groupmanagement.jsp	2016-12-12 17:09:13 UTC (rev 1507)
@@ -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: trunk/webapp/admin_permpresetedit.jsp
===================================================================
--- trunk/webapp/admin_permpresetedit.jsp	2016-12-08 17:41:18 UTC (rev 1506)
+++ trunk/webapp/admin_permpresetedit.jsp	2016-12-12 17:09:13 UTC (rev 1507)
@@ -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: trunk/webapp/admin_profile.jsp
===================================================================
--- trunk/webapp/admin_profile.jsp	2016-12-08 17:41:18 UTC (rev 1506)
+++ trunk/webapp/admin_profile.jsp	2016-12-12 17:09:13 UTC (rev 1507)
@@ -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: trunk/webapp/admin_profilemanagement.jsp
===================================================================
--- trunk/webapp/admin_profilemanagement.jsp	2016-12-08 17:41:18 UTC (rev 1506)
+++ trunk/webapp/admin_profilemanagement.jsp	2016-12-12 17:09:13 UTC (rev 1507)
@@ -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: trunk/webapp/admin_resourceedit.jsp
===================================================================
--- trunk/webapp/admin_resourceedit.jsp	2016-12-08 17:41:18 UTC (rev 1506)
+++ trunk/webapp/admin_resourceedit.jsp	2016-12-12 17:09:13 UTC (rev 1507)
@@ -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: trunk/webapp/admin_roleedit.jsp
===================================================================
--- trunk/webapp/admin_roleedit.jsp	2016-12-08 17:41:18 UTC (rev 1506)
+++ trunk/webapp/admin_roleedit.jsp	2016-12-12 17:09:13 UTC (rev 1507)
@@ -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: trunk/webapp/admin_rolemanagement.jsp
===================================================================
--- trunk/webapp/admin_rolemanagement.jsp	2016-12-08 17:41:18 UTC (rev 1506)
+++ trunk/webapp/admin_rolemanagement.jsp	2016-12-12 17:09:13 UTC (rev 1507)
@@ -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: trunk/webapp/admin_sendemail.jsp
===================================================================
--- trunk/webapp/admin_sendemail.jsp	2016-12-08 17:41:18 UTC (rev 1506)
+++ trunk/webapp/admin_sendemail.jsp	2016-12-12 17:09:13 UTC (rev 1507)
@@ -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: trunk/webapp/admin_studentrecords.jsp
===================================================================
--- trunk/webapp/admin_studentrecords.jsp	2016-12-08 17:41:18 UTC (rev 1506)
+++ trunk/webapp/admin_studentrecords.jsp	2016-12-12 17:09:13 UTC (rev 1507)
@@ -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: trunk/webapp/admin_systemmanagement.jsp
===================================================================
--- trunk/webapp/admin_systemmanagement.jsp	2016-12-08 17:41:18 UTC (rev 1506)
+++ trunk/webapp/admin_systemmanagement.jsp	2016-12-12 17:09:13 UTC (rev 1507)
@@ -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: trunk/webapp/admin_utilities_managecourses.jsp
===================================================================
--- trunk/webapp/admin_utilities_managecourses.jsp	2016-12-08 17:41:18 UTC (rev 1506)
+++ trunk/webapp/admin_utilities_managecourses.jsp	2016-12-12 17:09:13 UTC (rev 1507)
@@ -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: trunk/webapp/employee.jsp
===================================================================
--- trunk/webapp/employee.jsp	2016-12-08 17:41:18 UTC (rev 1506)
+++ trunk/webapp/employee.jsp	2016-12-12 17:09:13 UTC (rev 1507)
@@ -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: trunk/webapp/employeehometable.jsp
===================================================================
--- trunk/webapp/employeehometable.jsp	2016-12-08 17:41:18 UTC (rev 1506)
+++ trunk/webapp/employeehometable.jsp	2016-12-12 17:09:13 UTC (rev 1507)
@@ -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: trunk/webapp/header.jsp
===================================================================
--- trunk/webapp/header.jsp	2016-12-08 17:41:18 UTC (rev 1506)
+++ trunk/webapp/header.jsp	2016-12-12 17:09:13 UTC (rev 1507)
@@ -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: trunk/webapp/manager_authorization.jsp
===================================================================
--- trunk/webapp/manager_authorization.jsp	2016-12-08 17:41:18 UTC (rev 1506)
+++ trunk/webapp/manager_authorization.jsp	2016-12-12 17:09:13 UTC (rev 1507)
@@ -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: trunk/webapp/report_employeecourseatt.jsp
===================================================================
--- trunk/webapp/report_employeecourseatt.jsp	2016-12-08 17:41:18 UTC (rev 1506)
+++ trunk/webapp/report_employeecourseatt.jsp	2016-12-12 17:09:13 UTC (rev 1507)
@@ -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: trunk/webapp/report_pending_summary.jsp
===================================================================
--- trunk/webapp/report_pending_summary.jsp	2016-12-08 17:41:18 UTC (rev 1506)
+++ trunk/webapp/report_pending_summary.jsp	2016-12-12 17:09:13 UTC (rev 1507)
@@ -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>
 	<script type="text/javascript">
 <!--
 var rdCtl = null;

Modified: trunk/webapp/report_recurrent_training.jsp
===================================================================
--- trunk/webapp/report_recurrent_training.jsp	2016-12-08 17:41:18 UTC (rev 1506)
+++ trunk/webapp/report_recurrent_training.jsp	2016-12-12 17:09:13 UTC (rev 1507)
@@ -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: trunk/webapp/selfregistration.jsp
===================================================================
--- trunk/webapp/selfregistration.jsp	2016-12-08 17:41:18 UTC (rev 1506)
+++ trunk/webapp/selfregistration.jsp	2016-12-12 17:09:13 UTC (rev 1507)
@@ -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()">



From scribe at crosswire.org  Mon Dec 12 10:13:03 2016
From: scribe at crosswire.org (scribe at crosswire.org)
Date: Mon, 12 Dec 2016 10:13:03 -0700
Subject: [Ils-source] r1508 - in branches/1.6: . webapp
Message-ID: <E1cGU9v-0000bI-Gc@crosswire.org>

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()">



From scribe at crosswire.org  Sun Dec 18 10:11:26 2016
From: scribe at crosswire.org (scribe at crosswire.org)
Date: Sun, 18 Dec 2016 10:11:26 -0700
Subject: [Ils-source] r1509 - trunk/webapp
Message-ID: <E1cIeze-00034N-Tv@crosswire.org>

Author: scribe
Date: 2016-12-18 10:11:26 -0700 (Sun, 18 Dec 2016)
New Revision: 1509

Modified:
   trunk/webapp/lms_style.css
   trunk/webapp/report_employeecourseatt.jsp
Log:
Updates from Dominick for style


Modified: trunk/webapp/lms_style.css
===================================================================
--- trunk/webapp/lms_style.css	2016-12-12 17:13:03 UTC (rev 1508)
+++ trunk/webapp/lms_style.css	2016-12-18 17:11:26 UTC (rev 1509)
@@ -1,788 +1,842 @@
-td {
-	text-align: left;
-}
-body {
-	padding-top: 10px;
-	text-align: center;
-}
-.blockMsg h3 {
-	color: #666666 !important;
-	font-family: Arial, Helvetica, sans-serif !important;
-}
-.tableDataListStudentRecords {
-	font-weight: bold;
-}
-.curriculumHeader {
-	background: #bbbbbb;
-	font-weight: bold;
-}
-.subCurriculumDetail {
-	background: #d2d2d2 !important;
-}
-.subCurriculumDetail td {
-
-}
-.subCourseDetail {
-	/*background: #e6e5e5 !important;*/
-	background: #FFF !important;
-}
-.subCourseDetail td, .subCourseDetail td a {
-	font-style:italic !important;
-	font-weight:normal !important;
-	color:#a8a8a8 !important;
-	text-align:right !important;
-}
-.subCourseDetail td:last-child {
-	text-align:left !important;
-}
-.curHeader, .courseHeader {
-	cursor: pointer;
-}
-.dropdown {
-	background-image:none !important;
-	background-color:rgba(255, 255, 255, 0.9) !important;
-	border:1px #666666 solid !important;
-	left: -1px !important;
-	top: 33px !important;
-	width: 200px !important;
-}
-.dropdown li a {
-	color:#666666 !important;
-}
-.dropdown li a:hover {
-	text-decoration:underline !important;
-}
-.coursecomplete {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	font-weight: bold;
-	text-transform: uppercase;
-	color: #666666;
-	padding-left: 6px;
-}
-.inProgress {
-	font-style: italic;
-	font-weight: bold;
-}
-.courseName {
-	font-weight: bold;
-}
-.centered {
-	margin:auto;
-	alignment:center;
-	text-align:center;
-}
-a {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #666666;
-}
-font {
-	font-family: Arial, Helvetica, sans-serif;
-	color: #666666;
-}
-a:link {
-	text-decoration: none;
-}
-a:visited {
-	text-decoration: none;
-}
-a:hover {
-	text-decoration: underline;
-}
-a:active {
-	text-decoration: none;
-}
-.courselnk a {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	font-weight: bold;
-	color: #666666;
-}
-.instructiontxt {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #FF0000;
-	text-transform: uppercase;
-}
-.word-layer a {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	font-weight: bold;
-	color: #7D7D7D;
-}
-.word-layer p, td {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	color: #7D7D7D;
-}
-.word-layer {
-     visibility: hidden;
-     position:absolute;
-     left:131px;
-     top:214px;
-     width:300px;
-     background-color: #EBEBEB;
-     margin-left : 0;
-     overflow: visible;
-     z-index:6;
-     border: 2px #91AC79;
-     border-style: solid;
-     padding: 7px 7px 7px 7px;
-     color : #7D7D7D;
-	 font-family:Arial, Helvetica, sans-serif ;
-     font-size : 11px;
-     font-style : normal;
-     font-weight : normal;
-     font-variant : normal;
-     word-spacing : normal;
-     letter-spacing : normal;
-     vertical-align : baseline;
-     text-transform : none;
-     text-align : left;
-     text-indent : 0;
-     line-height : normal;
-}
-.word-layer div {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	color: #7D7D7D;
-}
-/* browse box */
-.list-layer {
-     visibility: hidden;
-     position:absolute;
-     left:50px;
-     top:50px;
-     width:220px;
-/*     background-color: #fff3cf; */
-	background-color: #E2E2E2;
-     margin-left : 0;
-     overflow: visible;
-     z-index:6;
-     border: 1px #000000;
-     border-style: solid;
-     padding: 7px 7px 7px 7px;
-     color : #000000;
-	 font-family: Arial, Helvetica, sans-serif;
-     font-size : x-small;
-     font-style : normal;
-     font-weight : normal;
-     font-variant : normal;
-     word-spacing : normal;
-     letter-spacing : normal;
-     vertical-align : baseline;
-     text-transform : none;
-     text-align : left;
-     text-indent : 0;
-     line-height : normal;
-}
-/* Calendar */
-
-.caldays {
-	color: #333333;
-}
-.caldaylink {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	text-transform: none;
-	padding: 4px 4px 8px;
-	font-weight: bold;
-	text-decoration: none;
-	border: none;
-}
-.formbtn:hover {
-	text-decoration: underline;
-}
-.cal-layer {
-     visibility: hidden;
-     position:absolute;
-     left:50px;
-     top:50px;
-     width:200px;
-     background-color: #FFFFFF;
-     margin-left : 0;
-     overflow: visible;
-     z-index:6;
-     border: 1px #91AC79;
-     border-style: solid;
-     padding: 7px 7px 7px 7px;
-     color : #000000;
-	 font-family: Arial, Helvetica, sans-serif;
-     font-size : x-small;
-     font-style : normal;
-     font-weight : normal;
-     font-variant : normal;
-     word-spacing : normal;
-     letter-spacing : normal;
-     vertical-align : baseline;
-     text-transform : none;
-     text-align : left;
-     text-indent : 0;
-     line-height : normal;
-}
-.cal-layer h2 {
-	margin: 0;
-}
-/* day cells */
-
-tr.cal {
-}
-td.cal {
-padding: 0 1px 1px;
-margin-left: 0;
-text-align: right;
-color: #333333;
-}
-td.cal a{
-color: #333333;
-}
-td.caloth a{
-color: #666666;
-}
-/* Not current month cells */
-td.caloth {
-padding: 0 1px 1px;
-margin-left: 0;
-text-align: right;
-color: #666666;
-}
-/* course list */
-td.clist {
-padding: 0 1px 1px;
-margin-left: 0;
-text-align: center;
-}
-td.clist li {
-list-style: none;
-margin: 0;
-border-top: 1px solid #222;
-border-bottom: 1px solid #222;
-border-left: 1px solid #222;
-border-right: 1px solid #222;
-}
-td.clist li a {
-display: block;
-background: #666666;
-text-decoration: none;
-}
-td.clist ul {
-text-indent: 0em;
-padding: 0px;
-margin: 0px
-}
-td.clist li a:link {
-	color: #000;
-}
-td.clist li a:visited {
-	color: #000;
-}
-td.clist li a:hover {
-border-color: #81693F;
-color: #8A0010;
-background : #FFFFCC
-}
-.shim-layer {
-	visibility: hidden;
-	position:absolute;
-	left:5px;
-	top:5px;
-	width:2px;
-	/*     background-color: #ABABAB;*/
-     frameborder: 0;
-	scrolling: no;
-	overflow: hidden;
-	z-index:8;
-}
-.mainmenu {
-	background-image: url(images/sidemenu_bg.jpg);
-	background-repeat: repeat-y;
-	background-position: left;
-	width: 122px;
-}
-/* Everything is new from this point on. When finished, some of the above styles can be deleted. */
-
-#pageContainer{
-	width: 858px;
-	border:1px solid #C6C5C5;
-	border-top: none;
-	margin-right: auto;
-	margin-left: auto;
-	background-color: #F7F7F7;
-	text-align: center;/*margin-top: -50px;*/
-	}
-#pageHeaderContainer {
-	width: 858px;
-	margin-top: -10px;
-	margin-right: auto;
-	margin-left: auto;
-	background-color: #F7F7F7;
-	border: 1px solid #C6C5C5;
-	border-bottom: none;
-	padding: 10px 0;
-}
-#pageHeaderContainer table{
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 10px;
-	font-weight: bold;
-	color: #7D7D7D;
-	text-align: left;
-	float: right;
-}
-#pageHeaderContainer td{
-	text-align: center;
-	vertical-align: middle;
-	margin: 5px;
-	padding: 5px;
-}
-#pageHeaderLogo {
-	position: relative;
-	text-align: left;
-	top: 93px;
-	left: 0px;
-	width: 858px;
-	margin: auto;
-	/*margin-left: 2px;*/
-	margin-top: -45px;
-	padding: 0px;
-}
-#pageHeaderBtns, #pageHeaderText {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	color: #7D7D7D;
-	font-weight: bold;
-	float: right;
-	text-align: left;
-	/*padding: 0 10px;*/
-	margin: -26px 10px 0 10px;
-}
-#pageHeaderBtns img {
-	margin: 0 3px;
-}
-#Banner {
-	background-image: url(images/banner.jpg);
-	background-repeat: no-repeat;
-	background-position: right;
-	/*border-right-width: 1px;
-	border-left-width: 1px;
-	border-right-style: solid;
-	border-left-style: solid;
-	border-right-color: #C6C5C5;
-	border-left-color: #C6C5C5;*/ 
-	clear: both;
-	height: 90px;
-	width: 858px;
-	text-align:left;
-	background-color: #fff;
-}
-/* There are two instances of the "logged in verbiage", one is always Display None, depending on the design.*/
-
-.loggedinTop {
-	/*display: none;*/
-}
-.loggedinBar {
-	display: none;
-}
-#MainMenu {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	font-weight: bold;
-	color: #FFFFFF;
-	background-repeat: repeat-x;
-	background-position: left bottom;
-	height: 34px;
-	width: 858px;
-	margin-bottom:20px;
-	/*border-right-width: 1px;
-	border-left-width: 1px;
-	border-right-style: solid;
-	border-left-style: solid;
-	border-right-color: #C6C5C5;
-	border-left-color: #C6C5C5;*/
-	background-color: #FFFFFF;
-	background-image: url(images/bggradient.jpg);
-}
-#MainMenu a {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #ffffff;
-}
-#MainMenu a:link {
-	text-decoration: none;
-}
-#MainMenu a:visited {
-	text-decoration: none;
-}
-#MainMenu a:hover {
-	text-decoration: underline;
-}
-#MainMenu a:active {
-	text-decoration: none;
-}
-#ulMainNav {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 10px;
-	font-weight: bold;
-	text-align:left;
-	margin: 0px;
-	padding: 0px;
-	list-style-type: none;
-	width: 858px;
-	height: 34px;
-	background-image:url(images/bggradient.jpg);
-	background-position:left bottom;
-	background-repeat:repeat-x;
-}
-#ulMainNav li{
-	/*background-image:url(images/bggradient.jpg);
-	background-position:left bottom;
-	background-repeat:repeat-x;*/
-	border-right:1px solid #FFFFFF;
-	display:inline;
-	float:left;
-	font-family:Arial,Helvetica,sans-serif;
-	font-size:10px;
-	font-weight:bold;
-	height:34px;
-	line-height:11px;
-	list-style-type:none;
-	margin:0px;
-	padding-top:5px;
-	padding-left:5px;
-	padding-right:5px;
-	/*white-space:pre;*/
-	width:auto;
-}
-.tableMain {
-	border: 1px solid #666666;
-	width: 838px;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #666666;
-	background:#FFFFFF;
-	margin-top: auto;
-	margin-right: auto;
-	margin-bottom: 10px;
-	margin-left: auto;
-}
-.tableMain th{
-	border-bottom-width: 1px;
-	border-bottom-style: solid;
-	border-bottom-color: #666666;
-	background-image:url(images/tablehdr_bg.jpg);
-	background-position:left bottom;
-	background-repeat:repeat-y;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	font-weight:bold;
-	text-transform:uppercase;
-	text-align:left;
-	color: #FFFFFF;
-	padding-left: 5px;
-}
-.tableMain caption {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 16px;
-	color: #666666;
-	padding: 2px;
-	font-weight: bold;
-	text-align: left;
-}
-.tableMain a{
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #666666;
-	padding: 5px;
-}
-.tableData {
-	width: 100%;
-	border-collapse: collapse;
-}
-.tableData th {
-	background-color: #9A9697;
-	background-image:url(images/reporthdr_bg.jpg);
-	background-repeat:repeat-x;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 10px;
-	font-weight: bold;
-	line-height: 10px;
-	text-transform: uppercase;
-	color: #FFFFFF;
-	text-align: left;
-	height: 22px;
-	border-right-width: 1px;
-	border-right-style: solid;
-	border-right-color: #FFFFFF;
-}
-.tableData th a  {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 10px;
-	font-weight: bold;
-	line-height: 10px;
-	text-transform: uppercase;
-	color: #FFFFFF;
-	text-align: left;
-	height: 22px;
-}
-.tableData td{
-	border: 1px solid #CCCCCC;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #666666;
-	margin: 0px;
-	padding-top: 2px;
-	padding-right: 2px;
-	padding-bottom: 2px;
-	padding-left: 2px;
-}
-.tableData a{
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #666666;
-	padding: 5px;
-}
-.tableData a:hover{
-	text-decoration:underline;
-}
-.tableDataList {
-	width: 100%;
-	border-collapse: collapse;
-}
-.tableDataList th {
-	background-color: #9A9697;
-	background-image:url(images/reporthdr_bg.jpg);
-	background-repeat:repeat-x;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 10px;
-	font-weight: bold;
-	line-height: 10px;
-	text-transform: uppercase;
-	color: #FFFFFF;
-	text-align: left;
-	height: 22px;
-	border-right-width: 1px;
-	border-right-style: solid;
-	border-right-color: #FFFFFF;
-}
-.tableDataList th a  {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 10px;
-	font-weight: bold;
-	line-height: 10px;
-	text-transform: uppercase;
-	color: #FFFFFF;
-	text-align: left;
-	height: 22px;
-}
-.tableDataList td{
-	border: 1px solid #CCCCCC;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #666666;
-	padding-top: 0px;
-	padding-right: 5px;
-	padding-bottom: 0px;
-	padding-left: 5px;
-	text-align:left;
-}
-.tableDataList a{
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #666666;
-	text-align: left;
-	margin-left:0px;
-	padding-left:0px;
-}
-.tableDataList a:hover{
-	text-decoration:underline;
-}
-.tableDataList p{
-}
-#tableFormLogin {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	width: 370px;
-	border: 1px solid #666666;
-	margin-top: 20px;
-	margin-left: 80px;
-}
-#tableFormLogin th{
-	border-bottom-width: 1px;
-	border-bottom-style: solid;
-	border-bottom-color: #666666;
-	background-image:url(images/tablehdr_bg.jpg);
-	background-position:bottom;
-	background-repeat:repeat-y;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	font-weight:bold;
-	text-transform:uppercase;
-	text-align:left;
-	color: #FFFFFF;
-}
-#tableFormLogin td{
-	border: none;
-}
-#tableFormDataLogin {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #666666;
-	/*padding: 5px;*/
-	width: 100%;
-	border:none;
-}
-#tableForm, .tableForm{
-	border: 1px solid #666666;
-	width: 838px;
-	margin-right: auto;
-	margin-left: auto;
-	background-color: #FFFFFF;
-	margin-bottom: 10px;
-}
-#tableForm td, .tableForm td{
-	padding-top:0px;
-}
-#tableForm th, .tableForm th{
-	border-bottom-width: 1px;
-	border-bottom-style: solid;
-	border-bottom-color: #666666;
-	background-image:url(images/tablehdr_bg.jpg);
-	background-position:bottom;
-	background-repeat:repeat-y;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	font-weight:bold;
-	text-transform:uppercase;
-	text-align:left;
-	color: #FFFFFF;
-	padding-left: 5px;
-}
-#tableFormData, .tableFormData{
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #666666;
-	padding: 3px;
-	width: 100%;
-}
-.formHeadings{
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	color: #666666;
-	padding: 5px;
-	width: 250px;
-	font-weight: bold;
-	text-align: right;
-	text-transform: capitalize;
-	/*background-color: #FFFFFF;*/
-	background-position: top;
-	vertical-align: top;
-}
-.formHeadingsTitle {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	color: #666666;
-	padding: 5px;
-	width: 250px;
-	font-weight: bold;
-	text-transform: capitalize;
-	background-position: top;
-	vertical-align: top;
-	text-decoration:underline;
-	text-align: left;
-}
-.formButtons, .formButtons a, .formButtons a:visited{
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #666666;
-	float: left;
-	width: 90px;
-	display: block;
-	vertical-align: text-bottom;
-}
-.formButtons a:hover{
-text-decoration:underline;
-}
-#tableLogData {
-	border:none;
-	width: 320px;
-}
-#copyright {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	font-style: normal;
-	text-transform: uppercase;
-	color: #333333;
-	background-color: #CCCCCC;
-	text-align: center;
-	height: 15px;
-	width: 858px;/*border: 1px solid #C6C5C5;
-	border-top: none;*//*margin: 0px 0 0 0;*/
-}
-#pageTitles {
-	width: 858px;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 16px;
-	color: #666666;
-	padding: 10px;
-	font-weight: bold;
-	text-align: left;
-	}
-#loginHeader {
-	height: 90px;
-	width: 525px;
-	border: 1px solid #C6C5C5;
-	border-bottom: none;
-	text-align: left;
-	background-image: url(images/login_hdr.jpg);
-}
-#loginContainer {
-	width: 525px;
-	border: 1px solid #C6C5C5;
-}
-#loginTitles {
-	width: 500px;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 16px;
-	color: #666666;
-	padding: 2px;
-	font-weight: bold;
-	text-align: left;
-	}
-.PageNumbertxt {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #666666;
-}
-.PageNumberNum, PageNumberNum a {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 13px;
-	font-weight:bold;
-	color: #4A854D;
-	padding: 3px;
-}
-.PageNumberNum a:hover, a:active {
-	text-decoration:underline;
-}
-.courseName {
-	font-weight: bold;
-}
-.TableMain .TableDataList .Assign {
-	text-transform: uppercase;
-	color: #E2252B;
-	font-weight: bold;
-	margin: 0px;
-	padding: 0px;
-}
-#pageContainer #content .tableMain .tableDataList .Assign {
-	color: #E1272C;
-	text-transform: uppercase;
-	font-weight: bold;
-}
-h1 {
-	font-family: Arial, Helvetica, sans-serif;
-	color: #666666;
-	border-bottom-width: 1px;
-	border-bottom-style: solid;
-	border-bottom-color: #990000;
-	float: left;
-}
+td {
+	text-align: left;
+}
+body {
+	padding-top: 10px;
+	text-align: center;
+}
+.blockMsg h3 {
+	color: #666666 !important;
+	font-family: Arial, Helvetica, sans-serif !important;
+}
+.tableDataListStudentRecords {
+	font-weight: bold;
+}
+.tableDataListStudentRecords td {
+	padding: 0px !important;
+	padding-left: 5px !important;
+}
+.courseHeaderRow {
+	
+}
+.courseHeaderRow td:last-child {
+	text-align: center !important;
+}
+.courseDetailRow {
+	background: #FFF !important;
+}
+.courseDetailRow td, .courseDetailRow td a {
+	font-style:italic !important;
+	font-weight:normal !important;
+	color:#a8a8a8 !important;
+	text-align:right !important;
+}
+.courseDetailRow td {
+	padding-right: 5px !important;
+	padding-top: 5px !important;
+	padding-bottom: 5px !important;
+}
+.courseDetailRow td:last-child {}
+.curriculumHeaderRow {
+	background: #bbbbbb;
+	font-weight: bold;
+	height: 30px !important;
+}
+.curriculumHeaderRow span.curHeader {
+	line-height: 12px;
+}
+.curriculumDetailRow {
+	background: #FFF !important;
+}
+.curriculumDetailRow td, .curriculumDetailRow td a {
+	font-style:italic !important;
+	font-weight:normal !important;
+	color:#a8a8a8 !important;
+	text-align:right !important;
+}
+.curriculumDetailRow td {
+	padding-right: 5px !important;
+	padding-top: 5px !important;
+	padding-bottom: 5px !important;
+}
+.curriculumDetailRow td:last-child {}
+.subCourseHeaderRow {
+	background: #d2d2d2;
+	font-weight: bold;
+}
+.subCourseHeaderRow td {}
+.subCourseHeaderRow span.courseHeader {
+	padding-left: 10px !important;
+	font-weight: bold !important;
+    font-size: 17px !important;
+	width: 100% !important;
+}
+.subCourseDetailRow {
+	background: #FFF !important;
+}
+.subCourseDetailRow td, .subCourseDetailRow td a {
+	font-style:italic !important;
+	font-weight:normal !important;
+	color:#a8a8a8 !important;
+	text-align:right !important;
+}
+.subCourseDetailRow td {
+	padding-right: 5px !important;
+	padding-top: 5px !important;
+	padding-bottom: 5px !important;
+}
+.subCourseDetailRow td:last-child {}
+.curHeader, .courseHeader {
+	cursor: pointer;
+	font-weight: bold !important;
+    font-size: 17px !important;
+	width: 100% !important;
+}
+.dropdown {
+	background-image:none !important;
+	background-color:rgba(255, 255, 255, 0.9) !important;
+	border:1px #666666 solid !important;
+	left: -1px !important;
+	top: 33px !important;
+	width: 200px !important;
+}
+.dropdown li a {
+	color:#666666 !important;
+}
+.dropdown li a:hover {
+	text-decoration:underline !important;
+}
+.coursecomplete {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	font-weight: bold;
+	text-transform: uppercase;
+	color: #666666;
+	padding-left: 6px;
+}
+.inProgress {
+	font-style: italic;
+	font-weight: bold;
+}
+.courseName {
+	font-weight: bold;
+}
+.centered {
+	margin:auto;
+	alignment:center;
+	text-align:center;
+}
+a {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #666666;
+}
+font {
+	font-family: Arial, Helvetica, sans-serif;
+	color: #666666;
+}
+a:link {
+	text-decoration: none;
+}
+a:visited {
+	text-decoration: none;
+}
+a:hover {
+	text-decoration: underline;
+}
+a:active {
+	text-decoration: none;
+}
+.courselnk a {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	font-weight: bold;
+	color: #666666;
+}
+.instructiontxt {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #FF0000;
+	text-transform: uppercase;
+}
+.word-layer a {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	font-weight: bold;
+	color: #7D7D7D;
+}
+.word-layer p, td {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	color: #7D7D7D;
+}
+.word-layer {
+	visibility: hidden;
+	position:absolute;
+	left:131px;
+	top:214px;
+	width:300px;
+	background-color: #EBEBEB;
+	margin-left : 0;
+	overflow: visible;
+	z-index:6;
+	border: 2px #91AC79;
+	border-style: solid;
+	padding: 7px 7px 7px 7px;
+	color : #7D7D7D;
+	font-family:Arial, Helvetica, sans-serif;
+	font-size : 11px;
+	font-style : normal;
+	font-weight : normal;
+	font-variant : normal;
+	word-spacing : normal;
+	letter-spacing : normal;
+	vertical-align : baseline;
+	text-transform : none;
+	text-align : left;
+	text-indent : 0;
+	line-height : normal;
+}
+.word-layer div {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	color: #7D7D7D;
+}
+/* browse box */
+.list-layer {
+	visibility: hidden;
+	position:absolute;
+	left:50px;
+	top:50px;
+	width:220px;
+	/*     background-color: #fff3cf; */
+	background-color: #E2E2E2;
+	margin-left : 0;
+	overflow: visible;
+	z-index:6;
+	border: 1px #000000;
+	border-style: solid;
+	padding: 7px 7px 7px 7px;
+	color : #000000;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size : x-small;
+	font-style : normal;
+	font-weight : normal;
+	font-variant : normal;
+	word-spacing : normal;
+	letter-spacing : normal;
+	vertical-align : baseline;
+	text-transform : none;
+	text-align : left;
+	text-indent : 0;
+	line-height : normal;
+}
+/* Calendar */
+
+.caldays {
+	color: #333333;
+}
+.caldaylink {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	text-transform: none;
+	padding: 4px 4px 8px;
+	font-weight: bold;
+	text-decoration: none;
+	border: none;
+}
+.formbtn:hover {
+	text-decoration: underline;
+}
+.cal-layer {
+	visibility: hidden;
+	position:absolute;
+	left:50px;
+	top:50px;
+	width:200px;
+	background-color: #FFFFFF;
+	margin-left : 0;
+	overflow: visible;
+	z-index:6;
+	border: 1px #91AC79;
+	border-style: solid;
+	padding: 7px 7px 7px 7px;
+	color : #000000;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size : x-small;
+	font-style : normal;
+	font-weight : normal;
+	font-variant : normal;
+	word-spacing : normal;
+	letter-spacing : normal;
+	vertical-align : baseline;
+	text-transform : none;
+	text-align : left;
+	text-indent : 0;
+	line-height : normal;
+}
+.cal-layer h2 {
+	margin: 0;
+}
+/* day cells */
+
+tr.cal {
+}
+td.cal {
+	padding: 0 1px 1px;
+	margin-left: 0;
+	text-align: right;
+	color: #333333;
+}
+td.cal a {
+	color: #333333;
+}
+td.caloth a {
+	color: #666666;
+}
+/* Not current month cells */
+td.caloth {
+	padding: 0 1px 1px;
+	margin-left: 0;
+	text-align: right;
+	color: #666666;
+}
+/* course list */
+td.clist {
+	padding: 0 1px 1px;
+	margin-left: 0;
+	text-align: center;
+}
+td.clist li {
+	list-style: none;
+	margin: 0;
+	border-top: 1px solid #222;
+	border-bottom: 1px solid #222;
+	border-left: 1px solid #222;
+	border-right: 1px solid #222;
+}
+td.clist li a {
+	display: block;
+	background: #666666;
+	text-decoration: none;
+}
+td.clist ul {
+	text-indent: 0em;
+	padding: 0px;
+	margin: 0px
+}
+td.clist li a:link {
+	color: #000;
+}
+td.clist li a:visited {
+	color: #000;
+}
+td.clist li a:hover {
+	border-color: #81693F;
+	color: #8A0010;
+	background : #FFFFCC
+}
+.shim-layer {
+	visibility: hidden;
+	position:absolute;
+	left:5px;
+	top:5px;
+	width:2px;
+	/*     background-color: #ABABAB;*/
+     frameborder: 0;
+	scrolling: no;
+	overflow: hidden;
+	z-index:8;
+}
+.mainmenu {
+	background-image: url(images/sidemenu_bg.jpg);
+	background-repeat: repeat-y;
+	background-position: left;
+	width: 122px;
+}
+/* Everything is new from this point on. When finished, some of the above styles can be deleted. */
+
+#pageContainer {
+	width: 858px;
+	border:1px solid #C6C5C5;
+	border-top: none;
+	margin-right: auto;
+	margin-left: auto;
+	background-color: #F7F7F7;
+	text-align: center;/*margin-top: -50px;*/
+}
+#pageHeaderContainer {
+	width: 858px;
+	margin-top: -10px;
+	margin-right: auto;
+	margin-left: auto;
+	background-color: #F7F7F7;
+	border: 1px solid #C6C5C5;
+	border-bottom: none;
+	padding: 10px 0;
+}
+#pageHeaderContainer table {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 10px;
+	font-weight: bold;
+	color: #7D7D7D;
+	text-align: left;
+	float: right;
+}
+#pageHeaderContainer td {
+	text-align: center;
+	vertical-align: middle;
+	margin: 5px;
+	padding: 5px;
+}
+#pageHeaderLogo {
+	position: relative;
+	text-align: left;
+	top: 93px;
+	left: 0px;
+	width: 858px;
+	margin: auto;
+	/*margin-left: 2px;*/
+	margin-top: -45px;
+	padding: 0px;
+}
+#pageHeaderBtns, #pageHeaderText {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	color: #7D7D7D;
+	font-weight: bold;
+	float: right;
+	text-align: left;
+	/*padding: 0 10px;*/
+	margin: -26px 10px 0 10px;
+}
+#pageHeaderBtns img {
+	margin: 0 3px;
+}
+#Banner {
+	background-image: url(images/banner.jpg);
+	background-repeat: no-repeat;
+	background-position: right;
+	/*border-right-width: 1px;
+	border-left-width: 1px;
+	border-right-style: solid;
+	border-left-style: solid;
+	border-right-color: #C6C5C5;
+	border-left-color: #C6C5C5;*/ 
+	clear: both;
+	height: 90px;
+	width: 858px;
+	text-align:left;
+	background-color: #fff;
+}
+/* There are two instances of the "logged in verbiage", one is always Display None, depending on the design.*/
+
+.loggedinTop {
+/*display: none;*/
+}
+.loggedinBar {
+	display: none;
+}
+#MainMenu {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	font-weight: bold;
+	color: #FFFFFF;
+	background-repeat: repeat-x;
+	background-position: left bottom;
+	height: 34px;
+	width: 858px;
+	margin-bottom:20px;
+	/*border-right-width: 1px;
+	border-left-width: 1px;
+	border-right-style: solid;
+	border-left-style: solid;
+	border-right-color: #C6C5C5;
+	border-left-color: #C6C5C5;*/
+	background-color: #FFFFFF;
+	background-image: url(images/bggradient.jpg);
+}
+#MainMenu a {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #ffffff;
+}
+#MainMenu a:link {
+	text-decoration: none;
+}
+#MainMenu a:visited {
+	text-decoration: none;
+}
+#MainMenu a:hover {
+	text-decoration: underline;
+}
+#MainMenu a:active {
+	text-decoration: none;
+}
+#ulMainNav {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 10px;
+	font-weight: bold;
+	text-align:left;
+	margin: 0px;
+	padding: 0px;
+	list-style-type: none;
+	width: 858px;
+	height: 34px;
+	background-image:url(images/bggradient.jpg);
+	background-position:left bottom;
+	background-repeat:repeat-x;
+}
+#ulMainNav li {
+	/*background-image:url(images/bggradient.jpg);
+	background-position:left bottom;
+	background-repeat:repeat-x;*/
+	border-right:1px solid #FFFFFF;
+	display:inline;
+	float:left;
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:10px;
+	font-weight:bold;
+	height:34px;
+	line-height:11px;
+	list-style-type:none;
+	margin:0px;
+	padding-top:5px;
+	padding-left:5px;
+	padding-right:5px;
+	/*white-space:pre;*/
+	width:auto;
+}
+.tableMain {
+	border: 1px solid #666666;
+	width: 838px;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #666666;
+	background:#FFFFFF;
+	margin-top: auto;
+	margin-right: auto;
+	margin-bottom: 10px;
+	margin-left: auto;
+}
+.tableMain th {
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+	border-bottom-color: #666666;
+	background-image:url(images/tablehdr_bg.jpg);
+	background-position:left bottom;
+	background-repeat:repeat-y;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	font-weight:bold;
+	text-transform:uppercase;
+	text-align:left;
+	color: #FFFFFF;
+	padding-left: 5px;
+}
+.tableMain caption {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 16px;
+	color: #666666;
+	padding: 2px;
+	font-weight: bold;
+	text-align: left;
+}
+.tableMain a {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #666666;
+	padding: 5px;
+}
+.tableData {
+	width: 100%;
+	border-collapse: collapse;
+}
+.tableData th {
+	background-color: #9A9697;
+	background-image:url(images/reporthdr_bg.jpg);
+	background-repeat:repeat-x;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 10px;
+	font-weight: bold;
+	line-height: 10px;
+	text-transform: uppercase;
+	color: #FFFFFF;
+	text-align: left;
+	height: 22px;
+	border-right-width: 1px;
+	border-right-style: solid;
+	border-right-color: #FFFFFF;
+}
+.tableData th a {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 10px;
+	font-weight: bold;
+	line-height: 10px;
+	text-transform: uppercase;
+	color: #FFFFFF;
+	text-align: left;
+	height: 22px;
+}
+.tableData td {
+	border: 1px solid #CCCCCC;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #666666;
+	margin: 0px;
+	padding-top: 2px;
+	padding-right: 2px;
+	padding-bottom: 2px;
+	padding-left: 2px;
+}
+.tableData a {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #666666;
+	padding: 5px;
+}
+.tableData a:hover {
+	text-decoration:underline;
+}
+.tableDataList {
+	width: 100%;
+	border-collapse: collapse;
+}
+.tableDataList th {
+	background-color: #9A9697;
+	background-image:url(images/reporthdr_bg.jpg);
+	background-repeat:repeat-x;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 10px;
+	font-weight: bold;
+	line-height: 10px;
+	text-transform: uppercase;
+	color: #FFFFFF;
+	text-align: left;
+	height: 22px;
+	border-right-width: 1px;
+	border-right-style: solid;
+	border-right-color: #FFFFFF;
+}
+.tableDataList th a {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 10px;
+	font-weight: bold;
+	line-height: 10px;
+	text-transform: uppercase;
+	color: #FFFFFF;
+	text-align: left;
+	height: 22px;
+}
+.tableDataList td {
+	border: 1px solid #CCCCCC;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #666666;
+	padding-top: 0px;
+	padding-right: 5px;
+	padding-bottom: 0px;
+	padding-left: 5px;
+	text-align:left;
+}
+.tableDataList a {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #666666;
+	text-align: left;
+	margin-left:0px;
+	padding-left:0px;
+}
+.tableDataList a:hover {
+	text-decoration:underline;
+}
+.tableDataList p {
+}
+#tableFormLogin {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	width: 370px;
+	border: 1px solid #666666;
+	margin-top:20px;
+	margin-left: 80px;
+}
+#tableFormLogin th {
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+	border-bottom-color: #666666;
+	background-image:url(images/tablehdr_bg.jpg);
+	background-position:bottom;
+	background-repeat:repeat-y;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	font-weight:bold;
+	text-transform:uppercase;
+	text-align:left;
+	color: #FFFFFF;
+}
+#tableFormLogin td {
+	border: none;
+}
+#tableFormDataLogin {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #666666;
+	/*padding: 5px;*/
+	width: 100%;
+	border:none;
+}
+#tableForm, .tableForm {
+	border: 1px solid #666666;
+	width: 838px;
+	margin-right: auto;
+	margin-left: auto;
+	background-color: #FFFFFF;
+	margin-bottom: 10px;
+}
+#tableForm td, .tableForm td {
+	padding-top:0px;
+}
+#tableForm th, .tableForm th {
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+	border-bottom-color: #666666;
+	background-image:url(images/tablehdr_bg.jpg);
+	background-position:bottom;
+	background-repeat:repeat-y;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	font-weight:bold;
+	text-transform:uppercase;
+	text-align:left;
+	color: #FFFFFF;
+	padding-left: 5px;
+}
+#tableFormData, .tableFormData {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #666666;
+	padding: 3px;
+	width: 100%;
+}
+.formHeadings {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	color: #666666;
+	padding: 5px;
+	width: 250px;
+	font-weight: bold;
+	text-align: right;
+	text-transform: capitalize;
+	/*background-color: #FFFFFF;*/
+	background-position: top;
+	vertical-align: top;
+}
+.formHeadingsTitle {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	color: #666666;
+	padding: 5px;
+	width: 250px;
+	font-weight: bold;
+	text-transform: capitalize;
+	background-position: top;
+	vertical-align: top;
+	text-decoration:underline;
+	text-align: left;
+}
+.formButtons, .formButtons a, .formButtons a:visited {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #666666;
+	float: left;
+	width: 90px;
+	display: block;
+	vertical-align: text-bottom;
+}
+.formButtons a:hover {
+	text-decoration:underline;
+}
+#tableLogData {
+	border:none;
+	width: 320px;
+}
+#copyright {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	font-style: normal;
+	text-transform: uppercase;
+	color: #333333;
+	background-color: #CCCCCC;
+	text-align: center;
+	height: 15px;
+	width: 858px;/*border: 1px solid #C6C5C5;
+	border-top: none;*//*margin: 0px 0 0 0;*/
+}
+#pageTitles {
+	width: 858px;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 16px;
+	color: #666666;
+	padding: 10px;
+	font-weight: bold;
+	text-align: left;
+}
+#loginHeader {
+	height: 90px;
+	width: 525px;
+	border: 1px solid #C6C5C5;
+	border-bottom: none;
+	text-align: left;
+	background-image: url(images/login_hdr.jpg);
+}
+#loginContainer {
+	width: 525px;
+	border: 1px solid #C6C5C5;
+}
+#loginTitles {
+	width: 500px;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 16px;
+	color: #666666;
+	padding: 2px;
+	font-weight: bold;
+	text-align: left;
+}
+.PageNumbertxt {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #666666;
+}
+.PageNumberNum, PageNumberNum a {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 13px;
+	font-weight:bold;
+	color: #4A854D;
+	padding: 3px;
+}
+.PageNumberNum a:hover, a:active {
+	text-decoration:underline;
+}
+.courseName {
+	font-weight: bold;
+}
+.TableMain .TableDataList .Assign {
+	text-transform: uppercase;
+	color: #E2252B;
+	font-weight: bold;
+	margin: 0px;
+	padding: 0px;
+}
+#pageContainer #content .tableMain .tableDataList .Assign {
+	color: #E1272C;
+	text-transform: uppercase;
+	font-weight: bold;
+}
+h1 {
+	font-family: Arial, Helvetica, sans-serif;
+	color: #666666;
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+	border-bottom-color: #990000;
+	float: left;
+}

Modified: trunk/webapp/report_employeecourseatt.jsp
===================================================================
--- trunk/webapp/report_employeecourseatt.jsp	2016-12-12 17:13:03 UTC (rev 1508)
+++ trunk/webapp/report_employeecourseatt.jsp	2016-12-18 17:11:26 UTC (rev 1509)
@@ -196,6 +196,7 @@
 <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">
 var rcid=0;
 function retake(inCID) {
@@ -231,26 +232,26 @@
 }
 function toggleCourseDetails(courseID) {
 	if ($('.subCourseID_'+courseID+':first').is(":visible")) {
-		$('#courseHeader_'+courseID).html('?');
+		$('#courseHeader_'+courseID).html('+');
 		$('.subCourseID_'+courseID).hide();
 	}
 	else {
-		$('#courseHeader_'+courseID).html('?');
+		$('#courseHeader_'+courseID).html('&ndash;');
 		$('.subCourseID_'+courseID).show();
 	}
 }
 function toggleCurriculumDetails(courseID) {
 	if ($('.subCurriculumID_'+courseID+':first').is(":visible")) {
-		$('#curriculumHeader_'+courseID).html('?');
+		$('#curriculumHeader_'+courseID).html('?<br>?');
 		$('.subCurriculumID_'+courseID).hide();
 		$('.historyDetail').hide();
-		$('.courseHeader').html('?');
+		$('.courseHeader').html('+');
 	}
 	else {
-		$('#curriculumHeader_'+courseID).html('?');
+		$('#curriculumHeader_'+courseID).html('?<br>?');
 		$('.subCurriculumID_'+courseID).show();
 		$('.historyDetail').hide();
-		$('.courseHeader').html('?');
+		$('.courseHeader').html('+');
 	}
 }
 
@@ -287,7 +288,6 @@
                                     <td><a class="formButtons" href="javascript:void(window.print())" target="_top">Print Report</a></td>
                                   </tr>
                               </table></td>
-                              <td width="75%">&nbsp;</td>
                             </tr>
                           </table>
                         </td>
@@ -296,19 +296,19 @@
                         <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>
+                              <th style="width: 16px !important;" title="Hide/Show Courses within Curriculum"></th>
+                              <th style="width: 22px !important;" title="Hide/Show All History for an Item"></th>
 <% if (managing) { %>                            
-                              <th>Comments</th>
+                              <th style="width: 160px !important;">Comments</th>
 <% } %>                              
-                              <th>Status</th>
-                              <th>No.</th>
-                              <th>Course Name</th>
-                              <th>Timeframe</th>
-                              <th>Start Date </th>
-                              <th>End Date</th>
-                              <th>Score %</th>
-                              <th>Cert</th>
+                              <th style="width: 60px !important;">Status</th>
+                              <th style="width: 60px !important;">No.</th>
+                              <th style="width: 160px !important;">Course Name</th>
+                              <th style="width: 70px !important;">Timeframe</th>
+                              <th style="width: 70px !important;">Start Date </th>
+                              <th style="width: 70px !important;">End Date</th>
+                              <th style="width: 50px !important;">Score %</th>
+                              <th style="width: 35px !important;">Cert</th>
                             </tr>
 				</thead>
 				<tbody>
@@ -396,7 +396,7 @@
 	if (headerAddition != null) out.write(headerAddition);
 	out.write("</td><td>");
 	if (moreHTML.length() > 0) {
-		out.write("<span class=\"courseHeader\" title=\"Show / Hide history for this item.\" id=\"courseHeader_"+ca.getCourseAttemptCourseID()+"\" onclick=\"toggleCourseDetails('"+ca.getCourseAttemptCourseID()+"');return false;\"> ? </span>");
+		out.write("<span class=\"courseHeader\" title=\"Show / Hide history for this record.\" id=\"courseHeader_"+ca.getCourseAttemptCourseID()+"\" onclick=\"toggleCourseDetails('"+ca.getCourseAttemptCourseID()+"');return false;\">&ndash;</span>");
 	}
 	out.write("</td>");
 	out.write(html);
@@ -411,7 +411,7 @@
 	Logger logger = Logger.getLogger("getCurriculumHTML");
 
 	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 headerAddition = ("<span class=\"curHeader\" id=\"curriculumHeader_"+caCur.getCourseAttemptCourseID()+"\" title=\"Show / Hide Courses within this Curriculum\" onclick=\"toggleCurriculumDetails('"+caCur.getCourseAttemptCourseID()+"');return false;\">?<br>?</span>");
 	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) {



From scribe at crosswire.org  Sun Dec 18 10:38:14 2016
From: scribe at crosswire.org (scribe at crosswire.org)
Date: Sun, 18 Dec 2016 10:38:14 -0700
Subject: [Ils-source] r1510 - in trunk/webapp: . META-INF WEB-INF/classes
Message-ID: <E1cIfPa-0003MG-L1@crosswire.org>

Author: scribe
Date: 2016-12-18 10:38:14 -0700 (Sun, 18 Dec 2016)
New Revision: 1510

Modified:
   trunk/webapp/META-INF/context.xml
   trunk/webapp/WEB-INF/classes/log4j.properties
   trunk/webapp/admin_announceedit.jsp
   trunk/webapp/admin_complianceedit.jsp
   trunk/webapp/admin_coursemanagement.jsp
   trunk/webapp/admin_coursenew.jsp
   trunk/webapp/admin_curricnew.jsp
   trunk/webapp/admin_groupmanagement.jsp
   trunk/webapp/admin_permpresetedit.jsp
   trunk/webapp/admin_profile.jsp
   trunk/webapp/admin_profilemanagement.jsp
   trunk/webapp/admin_resourceedit.jsp
   trunk/webapp/admin_rolemanagement.jsp
   trunk/webapp/admin_sendemail.jsp
   trunk/webapp/admin_studentrecords.jsp
   trunk/webapp/admin_systemmanagement.jsp
   trunk/webapp/admin_utilities_addecourse.jsp
   trunk/webapp/admin_utilities_addthirdparty.jsp
   trunk/webapp/admin_utilities_managecourses.jsp
   trunk/webapp/employee.jsp
   trunk/webapp/manager_authorization.jsp
   trunk/webapp/report_employeecourseatt.jsp
   trunk/webapp/report_pending_summary.jsp
   trunk/webapp/report_recurrent_training.jsp
Log:
moved script sections below include header so all global js imports will be available


Modified: trunk/webapp/META-INF/context.xml
===================================================================
--- trunk/webapp/META-INF/context.xml	2016-12-18 17:11:26 UTC (rev 1509)
+++ trunk/webapp/META-INF/context.xml	2016-12-18 17:38:14 UTC (rev 1510)
@@ -28,8 +28,7 @@
    
 -->
 
-  <Environment name="testSQLPath" type="java.lang.String" value="$WEBAPPBASE/sql" description="" />
-  <Resource    name="testSQLPath" type="java.lang.String" value="$WEBAPPBASE/sql" />
+  <Environment name="testSQLPath" type="java.lang.String" value="/home/trunk-devel/sites/trunk-devel/sql" description="" />
 
   <Resource
     name="storeDB"
@@ -38,9 +37,9 @@
     maxIdle="5"
     maxWait="5000"
     validationQuery="SELECT COMPANYID FROM SYSCONF"
-    username="$DBUSER"
-    password="$DBPASSWD"
-    url="jdbc:sqlserver://10.134.51.131:1433;user=$DBUSER;password=$DBPASSWD;"
+    username="trunkdevel"
+    password="trunkdevel"
+    url="jdbc:sqlserver://10.134.51.131:1433;"
     maxActive="10"/>
 
 

Modified: trunk/webapp/WEB-INF/classes/log4j.properties
===================================================================
--- trunk/webapp/WEB-INF/classes/log4j.properties	2016-12-18 17:11:26 UTC (rev 1509)
+++ trunk/webapp/WEB-INF/classes/log4j.properties	2016-12-18 17:38:14 UTC (rev 1510)
@@ -1,26 +1,26 @@
-#Last updated by admin
-#Mon Dec 13 15:19:02 GMT-07:00 2010
-log4j.appender.S.MaxFileSize=500KB
-log4j.appender.E=org.apache.log4j.RollingFileAppender
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.A=org.apache.log4j.RollingFileAppender
-log4j.appender.E.layout.ConversionPattern=%p %d{dd-MMM-yyyy HH\:mm} %c{1} - %m%n
-log4j.appender.E.MaxBackupIndex=5
-log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F\:%L) - %m%n
-log4j.appender.E.layout=org.apache.log4j.PatternLayout
-log4j.appender.A.MaxBackupIndex=5
-log4j.appender.A.File=C\:\\ils\\trunk-devel\\webapp\\log\\aicc.log
-log4j.appender.E.MaxFileSize=500KB
-log4j.appender.S.MaxBackupIndex=5
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.logger.AICC=INFO, A
-log4j.appender.S.layout.ConversionPattern=%p %d{dd-MMM-yyyy HH\:mm} %c - %m%n
-log4j.appender.S=org.apache.log4j.RollingFileAppender
-log4j.appender.A.layout.ConversionPattern=%c - %d{dd-MMM HH\:mm} %m%n
-log4j.appender.S.File=C\:\\ils\\trunk-devel\\webapp\\log\\system.log
-log4j.appender.A.MaxFileSize=500KB
-log4j.appender.A.layout=org.apache.log4j.PatternLayout
-log4j.logger.EVENTS=INFO, E
-log4j.appender.S.layout=org.apache.log4j.PatternLayout
-log4j.rootLogger=DEBUG, stdout, S
-log4j.appender.E.File=C\:\\ils\\trunk-devel\\webapp\\log\\events.log
+#Last updated by admin
+#Thu Apr 07 19:58:58 GMT 2016
+log4j.appender.S.MaxFileSize=500KB
+log4j.appender.E=org.apache.log4j.RollingFileAppender
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.A=org.apache.log4j.RollingFileAppender
+log4j.appender.E.layout.ConversionPattern=%p %d{dd-MMM-yyyy HH\:mm} %c{1} - %m%n
+log4j.appender.E.MaxBackupIndex=5
+log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F\:%L) - %m%n
+log4j.appender.E.layout=org.apache.log4j.PatternLayout
+log4j.appender.A.MaxBackupIndex=5
+log4j.appender.A.File=/home/trunk-devel/sites/trunk-devel/webapp/log/aicc.log
+log4j.appender.E.MaxFileSize=500KB
+log4j.appender.S.MaxBackupIndex=5
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.logger.AICC=INFO, A
+log4j.appender.S.layout.ConversionPattern=%p %d{dd-MMM-yyyy HH\:mm} %c - %m%n
+log4j.appender.S=org.apache.log4j.RollingFileAppender
+log4j.appender.A.layout.ConversionPattern=%c - %d{dd-MMM HH\:mm} %m%n
+log4j.appender.S.File=/home/trunk-devel/sites/trunk-devel/webapp/log/system.log
+log4j.appender.A.MaxFileSize=500KB
+log4j.appender.A.layout=org.apache.log4j.PatternLayout
+log4j.logger.EVENTS=INFO, E
+log4j.appender.S.layout=org.apache.log4j.PatternLayout
+log4j.rootLogger=INFO, stdout, S
+log4j.appender.E.File=/home/trunk-devel/sites/trunk-devel/webapp/log/events.log

Modified: trunk/webapp/admin_announceedit.jsp
===================================================================
--- trunk/webapp/admin_announceedit.jsp	2016-12-18 17:11:26 UTC (rev 1509)
+++ trunk/webapp/admin_announceedit.jsp	2016-12-18 17:38:14 UTC (rev 1510)
@@ -130,16 +130,16 @@
     <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" language="JavaScript">
+</head>
+<body>
+ <%@ include file="header.jsp" %>
+<script type="text/javascript" language="JavaScript">
 <!--
 function rD(val) {
     document.announcesave.expire.value = val;
 }
 // -->
-    </script>
-</head>
-<body>
- <%@ include file="header.jsp" %>
+</script>
 <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">

Modified: trunk/webapp/admin_complianceedit.jsp
===================================================================
--- trunk/webapp/admin_complianceedit.jsp	2016-12-18 17:11:26 UTC (rev 1509)
+++ trunk/webapp/admin_complianceedit.jsp	2016-12-18 17:38:14 UTC (rev 1510)
@@ -76,7 +76,13 @@
     <title><%= ilsSession.getCurrentCompany().getCompanyName() %> eLearning Portal</title>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
 
-    <script type="text/javascript" language="JavaScript">
+
+    <link href="lms_style.css" rel="stylesheet" type="text/css"/>
+  </head>
+
+  <body>
+<%@ include file="header.jsp" %>
+<script type="text/javascript" language="JavaScript">
     <!--
     function confirmSubmit(form) {
         if (confirm("Are you sure you would like to delete the selected Certifications?")) {
@@ -85,13 +91,7 @@
     }
 
     // -->
-    </script>
-
-    <link href="lms_style.css" rel="stylesheet" type="text/css"/>
-  </head>
-
-  <body>
-<%@ include file="header.jsp" %>
+</script>
 <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">

Modified: trunk/webapp/admin_coursemanagement.jsp
===================================================================
--- trunk/webapp/admin_coursemanagement.jsp	2016-12-18 17:11:26 UTC (rev 1509)
+++ trunk/webapp/admin_coursemanagement.jsp	2016-12-18 17:38:14 UTC (rev 1510)
@@ -114,6 +114,11 @@
 <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">
+
+</head>
+
+<body>
+<%@ include file="header.jsp" %>
 <script type="text/javascript" language="JavaScript">
 <!--
 function confirmSubmit(form, boxid) {
@@ -131,11 +136,6 @@
 
 // -->
 </script>
-
-</head>
-
-<body>
-<%@ include file="header.jsp" %>
   <div id="pageContainer">
 
 <%@ include file="menu.jsp" %>

Modified: trunk/webapp/admin_coursenew.jsp
===================================================================
--- trunk/webapp/admin_coursenew.jsp	2016-12-18 17:11:26 UTC (rev 1509)
+++ trunk/webapp/admin_coursenew.jsp	2016-12-18 17:38:14 UTC (rev 1510)
@@ -237,15 +237,19 @@
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
     <link href="lms_style.css" rel="stylesheet" type="text/css"/>
 
-<style>
+    <style>
 
 .almostFull {
 	color : red;
 }
 
-</style>
+    </style>
 
-    <script type="text/javascript" language="JavaScript">
+  </head>
+
+  <body>
+<%@ include file="header.jsp" %>
+<script type="text/javascript" language="JavaScript">
 //<!--
 function rD(val) {
     document.coursesave.activeDate.value = val;
@@ -281,10 +285,6 @@
 
 
 </script>
-  </head>
-
-  <body>
-<%@ include file="header.jsp" %>
   <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">

Modified: trunk/webapp/admin_curricnew.jsp
===================================================================
--- trunk/webapp/admin_curricnew.jsp	2016-12-18 17:11:26 UTC (rev 1509)
+++ trunk/webapp/admin_curricnew.jsp	2016-12-18 17:38:14 UTC (rev 1510)
@@ -147,7 +147,12 @@
   <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" language="JavaScript">
+
+</head>
+
+<body>
+<%@ include file="header.jsp" %>
+<script type="text/javascript" language="JavaScript">
 <!--
 function confirmRevoke() {
     if (confirm("Running this routine will assign this curriculum as recurrent training to all applicable users.  Are you sure?")) {
@@ -173,12 +178,7 @@
 });
 
 // -->
-  </script>
-
-</head>
-
-<body>
-<%@ include file="header.jsp" %>
+</script>
   <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">

Modified: trunk/webapp/admin_groupmanagement.jsp
===================================================================
--- trunk/webapp/admin_groupmanagement.jsp	2016-12-18 17:11:26 UTC (rev 1509)
+++ trunk/webapp/admin_groupmanagement.jsp	2016-12-18 17:38:14 UTC (rev 1510)
@@ -76,6 +76,10 @@
 <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">
+</head>
+
+<body>
+<%@ include file="header.jsp" %>
 <script type="text/javascript" language="JavaScript">
 <!--
 function confirmSubmit(form, boxid) {
@@ -92,10 +96,6 @@
 }
 // -->
 </script>
-</head>
-
-<body>
-<%@ include file="header.jsp" %>
   <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">

Modified: trunk/webapp/admin_permpresetedit.jsp
===================================================================
--- trunk/webapp/admin_permpresetedit.jsp	2016-12-18 17:11:26 UTC (rev 1509)
+++ trunk/webapp/admin_permpresetedit.jsp	2016-12-18 17:38:14 UTC (rev 1510)
@@ -88,22 +88,21 @@
     <title><%= ilsSession.getCurrentCompany().getCompanyName() %> eLearning Portal</title>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
 
-    <script type="text/javascript" language="JavaScript">
-    <!--
+    <link href="lms_style.css" rel="stylesheet" type="text/css"/>
+  </head>
+
+  <body>
+<%@ include file="header.jsp" %>
+<script type="text/javascript" language="JavaScript">
+<!--
     function confirmSubmit(form) {
         if (confirm("Are you sure you would like to delete the selected Preset?")) {
           form.submit();
         }
     }
 
-    // -->
-    </script>
-
-    <link href="lms_style.css" rel="stylesheet" type="text/css"/>
-  </head>
-
-  <body>
-<%@ include file="header.jsp" %>
+// -->
+</script>
 <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">

Modified: trunk/webapp/admin_profile.jsp
===================================================================
--- trunk/webapp/admin_profile.jsp	2016-12-18 17:11:26 UTC (rev 1509)
+++ trunk/webapp/admin_profile.jsp	2016-12-18 17:38:14 UTC (rev 1510)
@@ -404,7 +404,11 @@
     <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" language="JavaScript">
+</head>
+
+<body>
+<%@ include file="header.jsp" %>
+<script type="text/javascript" language="JavaScript">
 <!--
 var rdCtl = null;
 
@@ -446,15 +450,14 @@
   }
 }
 
-function init() {
-  if (<%= newMgr %>) {
-    var selBox = document.getElementById("defPrivsChoice");
-    selBox.selectedIndex = 1;
-    setDefPrivs();
-  }
-}
-
 $(document).ready(function() {
+
+	if (<%= newMgr %>) {
+		var selBox = document.getElementById("defPrivsChoice");
+		selBox.selectedIndex = 1;
+		setDefPrivs();
+	}
+
 	$('#locationSelect').attr('data-placeholder', $('#selectWorkgroup').text());
 	$('#roleSelect').attr('data-placeholder', $('#selectRole').text());
 	$('#roleSelect').chosen();
@@ -466,11 +469,7 @@
 });
 
 // -->
-    </script>
-</head>
-
-<body onLoad="init()">
-<%@ include file="header.jsp" %>
+</script>
   <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">

Modified: trunk/webapp/admin_profilemanagement.jsp
===================================================================
--- trunk/webapp/admin_profilemanagement.jsp	2016-12-18 17:11:26 UTC (rev 1509)
+++ trunk/webapp/admin_profilemanagement.jsp	2016-12-18 17:38:14 UTC (rev 1510)
@@ -257,8 +257,22 @@
 	<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" language="JavaScript">
+<style type="text/css">
 <!--
+.style1 {font-size: 10px}
+.style2 {
+    font-size: 12px;
+    font-weight: bold;
+}
+.style3 {font-size: 12px}
+-->
+</style>
+</head>
+
+<body onLoad="scrollToReport()">
+<%@ include file="header.jsp" %>
+<script type="text/javascript" language="JavaScript">
+<!--
 var rdCtl = null;
 
 function rD(val) {
@@ -282,20 +296,6 @@
 
 // -->
 </script>
-<style type="text/css">
-<!--
-.style1 {font-size: 10px}
-.style2 {
-    font-size: 12px;
-    font-weight: bold;
-}
-.style3 {font-size: 12px}
--->
-</style>
-</head>
-
-<body onLoad="scrollToReport()">
-<%@ include file="header.jsp" %>
   <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">

Modified: trunk/webapp/admin_resourceedit.jsp
===================================================================
--- trunk/webapp/admin_resourceedit.jsp	2016-12-18 17:11:26 UTC (rev 1509)
+++ trunk/webapp/admin_resourceedit.jsp	2016-12-18 17:38:14 UTC (rev 1510)
@@ -138,17 +138,17 @@
     <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" language="JavaScript">
+  </head>
+
+  <body>
+<%@ include file="header.jsp" %>
+<script type="text/javascript" language="JavaScript">
 <!--
 function rD(val) {
     document.resourcesave.expire.value = val;
 }
 // -->
-    </script>
-  </head>
-
-  <body>
-<%@ include file="header.jsp" %>
+</script>
   <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">

Modified: trunk/webapp/admin_rolemanagement.jsp
===================================================================
--- trunk/webapp/admin_rolemanagement.jsp	2016-12-18 17:11:26 UTC (rev 1509)
+++ trunk/webapp/admin_rolemanagement.jsp	2016-12-18 17:38:14 UTC (rev 1510)
@@ -75,6 +75,10 @@
 <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">
+</head>
+
+<body>
+<%@ include file="header.jsp" %>
 <script type="text/javascript" language="JavaScript">
 <!--
 function confirmSubmit(form, boxid) {
@@ -91,10 +95,6 @@
 }
 // -->
 </script>
-</head>
-
-<body>
-<%@ include file="header.jsp" %>
   <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">

Modified: trunk/webapp/admin_sendemail.jsp
===================================================================
--- trunk/webapp/admin_sendemail.jsp	2016-12-18 17:11:26 UTC (rev 1509)
+++ trunk/webapp/admin_sendemail.jsp	2016-12-18 17:38:14 UTC (rev 1510)
@@ -75,15 +75,15 @@
   <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" language="JavaScript">
-<!--
-// -->
-  </script>
 
 </head>
 
 <body>
 <%@ include file="header.jsp" %>
+  <script type="text/javascript" language="JavaScript">
+<!--
+// -->
+  </script>
   <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">

Modified: trunk/webapp/admin_studentrecords.jsp
===================================================================
--- trunk/webapp/admin_studentrecords.jsp	2016-12-18 17:11:26 UTC (rev 1509)
+++ trunk/webapp/admin_studentrecords.jsp	2016-12-18 17:38:14 UTC (rev 1510)
@@ -374,8 +374,25 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
 	<link rel="stylesheet" href="css/chosen/chosen.min.css">
 	<link href="lms_style.css" rel="stylesheet" type="text/css"/>
-	<script type="text/javascript" language="JavaScript">
+   <!-- <style type="text/css">
 <!--
+<!--.style1 {font-size: 12px}
+<!--.style2 {text-transform: none; color: #3F7ABA; padding: 4px 4px 8px; font-weight: bold; text-decoration: none; border: none; font-family: Arial, Helvetica, sans-serif;}
+<!--.style3 {font-size: 10px}
+<!--.style6 {font-size: 12px; text-transform: none; font-weight: bold; text-decoration: none; border: none; font-family: Arial, Helvetica, sans-serif;}
+-->
+   <!-- </style>// -->
+   <style type="text/css">
+<!--
+.style1 {color: #9A9697}
+-->
+   </style>
+</head>
+
+<body onLoad="scrollToReport()">
+<%@ include file="header.jsp" %>
+<script type="text/javascript" language="JavaScript">
+<!--
 var rdCtl = null;
 
 function rD(val) {
@@ -397,24 +414,8 @@
 });
 
 // -->
-    </script>
-   <!-- <style type="text/css">
-<!--
-<!--.style1 {font-size: 12px}
-<!--.style2 {text-transform: none; color: #3F7ABA; padding: 4px 4px 8px; font-weight: bold; text-decoration: none; border: none; font-family: Arial, Helvetica, sans-serif;}
-<!--.style3 {font-size: 10px}
-<!--.style6 {font-size: 12px; text-transform: none; font-weight: bold; text-decoration: none; border: none; font-family: Arial, Helvetica, sans-serif;}
--->
-   <!-- </style>// -->
-   <style type="text/css">
-<!--
-.style1 {color: #9A9697}
--->
-   </style>
-</head>
+</script>
 
-<body onLoad="scrollToReport()">
-<%@ include file="header.jsp" %>
   <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">

Modified: trunk/webapp/admin_systemmanagement.jsp
===================================================================
--- trunk/webapp/admin_systemmanagement.jsp	2016-12-18 17:11:26 UTC (rev 1509)
+++ trunk/webapp/admin_systemmanagement.jsp	2016-12-18 17:38:14 UTC (rev 1510)
@@ -913,6 +913,10 @@
 </style>
 
 <link href="lms_style.css" rel="stylesheet" type="text/css" />
+</head>
+
+<body onLoad="initPage()">
+<%@ include file="header.jsp" %>
 <script type="text/javascript">
 <!--
 function confirmSubmit(form, boxid) {
@@ -970,10 +974,6 @@
 
 // -->
 </script>
-</head>
-
-<body onLoad="initPage()">
-<%@ include file="header.jsp" %>
   <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">

Modified: trunk/webapp/admin_utilities_addecourse.jsp
===================================================================
--- trunk/webapp/admin_utilities_addecourse.jsp	2016-12-18 17:11:26 UTC (rev 1509)
+++ trunk/webapp/admin_utilities_addecourse.jsp	2016-12-18 17:38:14 UTC (rev 1510)
@@ -120,6 +120,10 @@
 }
 -->
 </style>
+</head>
+
+<body>
+<%@ include file="header.jsp" %>
 <script type="text/javascript" language="JavaScript">
 <!--
 function confirmSubmit() {
@@ -145,10 +149,6 @@
 
 // -->
 </script>
-</head>
-
-<body>
-<%@ include file="header.jsp" %>
   <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">

Modified: trunk/webapp/admin_utilities_addthirdparty.jsp
===================================================================
--- trunk/webapp/admin_utilities_addthirdparty.jsp	2016-12-18 17:11:26 UTC (rev 1509)
+++ trunk/webapp/admin_utilities_addthirdparty.jsp	2016-12-18 17:38:14 UTC (rev 1510)
@@ -171,6 +171,9 @@
 -->
 </style>
 
+</head>
+<body>
+  <%@ include file="header.jsp" %>
 <script type="text/javascript" language="JavaScript">
 <!--
 function confirmSubmit() {
@@ -197,9 +200,6 @@
 // -->
 </script>
 
-</head>
-<body>
-  <%@ include file="header.jsp" %>
   <div id="pageContainer">
     <%@ include file="menu.jsp" %>
     <div id="content">

Modified: trunk/webapp/admin_utilities_managecourses.jsp
===================================================================
--- trunk/webapp/admin_utilities_managecourses.jsp	2016-12-18 17:11:26 UTC (rev 1509)
+++ trunk/webapp/admin_utilities_managecourses.jsp	2016-12-18 17:38:14 UTC (rev 1510)
@@ -145,8 +145,12 @@
 		}
 		-->
 		</style>
-	<script type="text/javascript" language="JavaScript">
-	<!--
+</head>
+
+<body>
+<%@ include file="header.jsp" %>
+<script type="text/javascript" language="JavaScript">
+<!--
 function confirmSubmit(form, boxid) {
 	box=document.getElementById(boxid);
 	choice = box.options[box.selectedIndex].value;
@@ -189,11 +193,8 @@
 }
 	
 // -->
-	</script>
-</head>
+</script>
 
-<body>
-	<%@ include file="header.jsp" %>
 	<div id="pageContainer">
 	<%@ include file="menu.jsp" %>
 	<div id="content">

Modified: trunk/webapp/employee.jsp
===================================================================
--- trunk/webapp/employee.jsp	2016-12-18 17:11:26 UTC (rev 1509)
+++ trunk/webapp/employee.jsp	2016-12-18 17:38:14 UTC (rev 1510)
@@ -59,6 +59,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link href="lms_style.css" rel="stylesheet" type="text/css">
 
+</head>
+
+<body>
+<%@ include file="header.jsp" %>
+
 <script type="text/javascript">
 <!--
 
@@ -71,10 +76,6 @@
 -->
 </script>
 
-</head>
-
-<body>
-<%@ include file="header.jsp" %>
 <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">

Modified: trunk/webapp/manager_authorization.jsp
===================================================================
--- trunk/webapp/manager_authorization.jsp	2016-12-18 17:11:26 UTC (rev 1509)
+++ trunk/webapp/manager_authorization.jsp	2016-12-18 17:38:14 UTC (rev 1510)
@@ -115,7 +115,13 @@
     <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" language="JavaScript">
+  </head>
+
+ <body>
+
+<%@ include file="header.jsp" %>
+
+<script type="text/javascript" language="JavaScript">
 <!--
 function rD(val) {
     document.coursesave.activeDate.value = val;
@@ -124,11 +130,8 @@
     document.coursesave.locURL.value = 'courses/'+val+'/frameset.htm';
 }
 // -->
-    </script>
-  </head>
+</script>
 
- <body>
-<%@ include file="header.jsp" %>
   <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">

Modified: trunk/webapp/report_employeecourseatt.jsp
===================================================================
--- trunk/webapp/report_employeecourseatt.jsp	2016-12-18 17:11:26 UTC (rev 1509)
+++ trunk/webapp/report_employeecourseatt.jsp	2016-12-18 17:38:14 UTC (rev 1510)
@@ -196,7 +196,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <link href="lms_style.css" rel="stylesheet" type="text/css">
 
-
+</head>
+<body>
+
+<%@ include file="header.jsp" %>
+
 <script type="text/javascript">
 var rcid=0;
 function retake(inCID) {
@@ -262,9 +266,7 @@
 
 
 </script>
-</head>
-<body>
-<%@ include file="header.jsp" %>
+
   <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">

Modified: trunk/webapp/report_pending_summary.jsp
===================================================================
--- trunk/webapp/report_pending_summary.jsp	2016-12-18 17:11:26 UTC (rev 1509)
+++ trunk/webapp/report_pending_summary.jsp	2016-12-18 17:38:14 UTC (rev 1510)
@@ -181,7 +181,13 @@
 	<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">
+</head>
+
+<body>
+
+<%@ include file="header.jsp" %>
+
+<script type="text/javascript">
 <!--
 var rdCtl = null;
 
@@ -189,11 +195,8 @@
     rdCtl.value = val;
 }
 // -->
-    </script>
-</head>
+</script>
 
-<body>
-<%@ include file="header.jsp" %>
   <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">

Modified: trunk/webapp/report_recurrent_training.jsp
===================================================================
--- trunk/webapp/report_recurrent_training.jsp	2016-12-18 17:11:26 UTC (rev 1509)
+++ trunk/webapp/report_recurrent_training.jsp	2016-12-18 17:38:14 UTC (rev 1510)
@@ -107,8 +107,27 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
 	<link rel="stylesheet" href="css/chosen/chosen.min.css">
 	<link href="lms_style.css" rel="stylesheet" type="text/css"/>
-	<script type="text/javascript" language="JavaScript">
+   <!-- <style type="text/css">
 <!--
+<!--.style1 {font-size: 12px}
+<!--.style2 {text-transform: none; color: #3F7ABA; padding: 4px 4px 8px; font-weight: bold; text-decoration: none; border: none; font-family: Arial, Helvetica, sans-serif;}
+<!--.style3 {font-size: 10px}
+<!--.style6 {font-size: 12px; text-transform: none; font-weight: bold; text-decoration: none; border: none; font-family: Arial, Helvetica, sans-serif;}
+-->
+   <!-- </style>// -->
+   <style type="text/css">
+<!--
+.style1 {color: #9A9697}
+-->
+   </style>
+</head>
+
+<body onLoad="scrollToReport()">
+
+<%@ include file="header.jsp" %>
+
+<script type="text/javascript" language="JavaScript">
+<!--
 var rdCtl = null;
 
 function rD(val) {
@@ -130,24 +149,8 @@
 });
 
 // -->
-    </script>
-   <!-- <style type="text/css">
-<!--
-<!--.style1 {font-size: 12px}
-<!--.style2 {text-transform: none; color: #3F7ABA; padding: 4px 4px 8px; font-weight: bold; text-decoration: none; border: none; font-family: Arial, Helvetica, sans-serif;}
-<!--.style3 {font-size: 10px}
-<!--.style6 {font-size: 12px; text-transform: none; font-weight: bold; text-decoration: none; border: none; font-family: Arial, Helvetica, sans-serif;}
--->
-   <!-- </style>// -->
-   <style type="text/css">
-<!--
-.style1 {color: #9A9697}
--->
-   </style>
-</head>
+</script>
 
-<body onLoad="scrollToReport()">
-<%@ include file="header.jsp" %>
   <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">



From scribe at crosswire.org  Sun Dec 18 10:43:52 2016
From: scribe at crosswire.org (scribe at crosswire.org)
Date: Sun, 18 Dec 2016 10:43:52 -0700
Subject: [Ils-source] r1511 - in branches/1.6: . webapp
Message-ID: <E1cIfV2-0003Qo-7G@crosswire.org>

Author: scribe
Date: 2016-12-18 10:43:51 -0700 (Sun, 18 Dec 2016)
New Revision: 1511

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_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_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_addecourse.jsp
   branches/1.6/webapp/admin_utilities_addthirdparty.jsp
   branches/1.6/webapp/admin_utilities_managecourses.jsp
   branches/1.6/webapp/employee.jsp
   branches/1.6/webapp/lms_style.css
   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
Log:
merged Dominics updated styles and script relocation to after header include



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

Modified: branches/1.6/webapp/admin_announceedit.jsp
===================================================================
--- branches/1.6/webapp/admin_announceedit.jsp	2016-12-18 17:38:14 UTC (rev 1510)
+++ branches/1.6/webapp/admin_announceedit.jsp	2016-12-18 17:43:51 UTC (rev 1511)
@@ -130,16 +130,16 @@
     <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" language="JavaScript">
+</head>
+<body>
+ <%@ include file="header.jsp" %>
+<script type="text/javascript" language="JavaScript">
 <!--
 function rD(val) {
     document.announcesave.expire.value = val;
 }
 // -->
-    </script>
-</head>
-<body>
- <%@ include file="header.jsp" %>
+</script>
 <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">

Modified: branches/1.6/webapp/admin_complianceedit.jsp
===================================================================
--- branches/1.6/webapp/admin_complianceedit.jsp	2016-12-18 17:38:14 UTC (rev 1510)
+++ branches/1.6/webapp/admin_complianceedit.jsp	2016-12-18 17:43:51 UTC (rev 1511)
@@ -76,7 +76,13 @@
     <title><%= ilsSession.getCurrentCompany().getCompanyName() %> eLearning Portal</title>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
 
-    <script type="text/javascript" language="JavaScript">
+
+    <link href="lms_style.css" rel="stylesheet" type="text/css"/>
+  </head>
+
+  <body>
+<%@ include file="header.jsp" %>
+<script type="text/javascript" language="JavaScript">
     <!--
     function confirmSubmit(form) {
         if (confirm("Are you sure you would like to delete the selected Certifications?")) {
@@ -85,13 +91,7 @@
     }
 
     // -->
-    </script>
-
-    <link href="lms_style.css" rel="stylesheet" type="text/css"/>
-  </head>
-
-  <body>
-<%@ include file="header.jsp" %>
+</script>
 <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">

Modified: branches/1.6/webapp/admin_coursemanagement.jsp
===================================================================
--- branches/1.6/webapp/admin_coursemanagement.jsp	2016-12-18 17:38:14 UTC (rev 1510)
+++ branches/1.6/webapp/admin_coursemanagement.jsp	2016-12-18 17:43:51 UTC (rev 1511)
@@ -114,6 +114,11 @@
 <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">
+
+</head>
+
+<body>
+<%@ include file="header.jsp" %>
 <script type="text/javascript" language="JavaScript">
 <!--
 function confirmSubmit(form, boxid) {
@@ -131,11 +136,6 @@
 
 // -->
 </script>
-
-</head>
-
-<body>
-<%@ include file="header.jsp" %>
   <div id="pageContainer">
 
 <%@ include file="menu.jsp" %>

Modified: branches/1.6/webapp/admin_coursenew.jsp
===================================================================
--- branches/1.6/webapp/admin_coursenew.jsp	2016-12-18 17:38:14 UTC (rev 1510)
+++ branches/1.6/webapp/admin_coursenew.jsp	2016-12-18 17:43:51 UTC (rev 1511)
@@ -237,15 +237,19 @@
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
     <link href="lms_style.css" rel="stylesheet" type="text/css"/>
 
-<style>
+    <style>
 
 .almostFull {
 	color : red;
 }
 
-</style>
+    </style>
 
-    <script type="text/javascript" language="JavaScript">
+  </head>
+
+  <body>
+<%@ include file="header.jsp" %>
+<script type="text/javascript" language="JavaScript">
 //<!--
 function rD(val) {
     document.coursesave.activeDate.value = val;
@@ -281,10 +285,6 @@
 
 
 </script>
-  </head>
-
-  <body>
-<%@ include file="header.jsp" %>
   <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">

Modified: branches/1.6/webapp/admin_curricnew.jsp
===================================================================
--- branches/1.6/webapp/admin_curricnew.jsp	2016-12-18 17:38:14 UTC (rev 1510)
+++ branches/1.6/webapp/admin_curricnew.jsp	2016-12-18 17:43:51 UTC (rev 1511)
@@ -147,7 +147,12 @@
   <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" language="JavaScript">
+
+</head>
+
+<body>
+<%@ include file="header.jsp" %>
+<script type="text/javascript" language="JavaScript">
 <!--
 function confirmRevoke() {
     if (confirm("Running this routine will assign this curriculum as recurrent training to all applicable users.  Are you sure?")) {
@@ -173,12 +178,7 @@
 });
 
 // -->
-  </script>
-
-</head>
-
-<body>
-<%@ include file="header.jsp" %>
+</script>
   <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">

Modified: branches/1.6/webapp/admin_groupmanagement.jsp
===================================================================
--- branches/1.6/webapp/admin_groupmanagement.jsp	2016-12-18 17:38:14 UTC (rev 1510)
+++ branches/1.6/webapp/admin_groupmanagement.jsp	2016-12-18 17:43:51 UTC (rev 1511)
@@ -76,6 +76,10 @@
 <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">
+</head>
+
+<body>
+<%@ include file="header.jsp" %>
 <script type="text/javascript" language="JavaScript">
 <!--
 function confirmSubmit(form, boxid) {
@@ -92,10 +96,6 @@
 }
 // -->
 </script>
-</head>
-
-<body>
-<%@ include file="header.jsp" %>
   <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">

Modified: branches/1.6/webapp/admin_permpresetedit.jsp
===================================================================
--- branches/1.6/webapp/admin_permpresetedit.jsp	2016-12-18 17:38:14 UTC (rev 1510)
+++ branches/1.6/webapp/admin_permpresetedit.jsp	2016-12-18 17:43:51 UTC (rev 1511)
@@ -88,22 +88,21 @@
     <title><%= ilsSession.getCurrentCompany().getCompanyName() %> eLearning Portal</title>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
 
-    <script type="text/javascript" language="JavaScript">
-    <!--
+    <link href="lms_style.css" rel="stylesheet" type="text/css"/>
+  </head>
+
+  <body>
+<%@ include file="header.jsp" %>
+<script type="text/javascript" language="JavaScript">
+<!--
     function confirmSubmit(form) {
         if (confirm("Are you sure you would like to delete the selected Preset?")) {
           form.submit();
         }
     }
 
-    // -->
-    </script>
-
-    <link href="lms_style.css" rel="stylesheet" type="text/css"/>
-  </head>
-
-  <body>
-<%@ include file="header.jsp" %>
+// -->
+</script>
 <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">

Modified: branches/1.6/webapp/admin_profile.jsp
===================================================================
--- branches/1.6/webapp/admin_profile.jsp	2016-12-18 17:38:14 UTC (rev 1510)
+++ branches/1.6/webapp/admin_profile.jsp	2016-12-18 17:43:51 UTC (rev 1511)
@@ -404,7 +404,11 @@
     <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" language="JavaScript">
+</head>
+
+<body>
+<%@ include file="header.jsp" %>
+<script type="text/javascript" language="JavaScript">
 <!--
 var rdCtl = null;
 
@@ -446,15 +450,14 @@
   }
 }
 
-function init() {
-  if (<%= newMgr %>) {
-    var selBox = document.getElementById("defPrivsChoice");
-    selBox.selectedIndex = 1;
-    setDefPrivs();
-  }
-}
-
 $(document).ready(function() {
+
+	if (<%= newMgr %>) {
+		var selBox = document.getElementById("defPrivsChoice");
+		selBox.selectedIndex = 1;
+		setDefPrivs();
+	}
+
 	$('#locationSelect').attr('data-placeholder', $('#selectWorkgroup').text());
 	$('#roleSelect').attr('data-placeholder', $('#selectRole').text());
 	$('#roleSelect').chosen();
@@ -466,11 +469,7 @@
 });
 
 // -->
-    </script>
-</head>
-
-<body onLoad="init()">
-<%@ include file="header.jsp" %>
+</script>
   <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">

Modified: branches/1.6/webapp/admin_profilemanagement.jsp
===================================================================
--- branches/1.6/webapp/admin_profilemanagement.jsp	2016-12-18 17:38:14 UTC (rev 1510)
+++ branches/1.6/webapp/admin_profilemanagement.jsp	2016-12-18 17:43:51 UTC (rev 1511)
@@ -257,8 +257,22 @@
 	<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" language="JavaScript">
+<style type="text/css">
 <!--
+.style1 {font-size: 10px}
+.style2 {
+    font-size: 12px;
+    font-weight: bold;
+}
+.style3 {font-size: 12px}
+-->
+</style>
+</head>
+
+<body onLoad="scrollToReport()">
+<%@ include file="header.jsp" %>
+<script type="text/javascript" language="JavaScript">
+<!--
 var rdCtl = null;
 
 function rD(val) {
@@ -282,20 +296,6 @@
 
 // -->
 </script>
-<style type="text/css">
-<!--
-.style1 {font-size: 10px}
-.style2 {
-    font-size: 12px;
-    font-weight: bold;
-}
-.style3 {font-size: 12px}
--->
-</style>
-</head>
-
-<body onLoad="scrollToReport()">
-<%@ include file="header.jsp" %>
   <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">

Modified: branches/1.6/webapp/admin_resourceedit.jsp
===================================================================
--- branches/1.6/webapp/admin_resourceedit.jsp	2016-12-18 17:38:14 UTC (rev 1510)
+++ branches/1.6/webapp/admin_resourceedit.jsp	2016-12-18 17:43:51 UTC (rev 1511)
@@ -138,17 +138,17 @@
     <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" language="JavaScript">
+  </head>
+
+  <body>
+<%@ include file="header.jsp" %>
+<script type="text/javascript" language="JavaScript">
 <!--
 function rD(val) {
     document.resourcesave.expire.value = val;
 }
 // -->
-    </script>
-  </head>
-
-  <body>
-<%@ include file="header.jsp" %>
+</script>
   <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">

Modified: branches/1.6/webapp/admin_rolemanagement.jsp
===================================================================
--- branches/1.6/webapp/admin_rolemanagement.jsp	2016-12-18 17:38:14 UTC (rev 1510)
+++ branches/1.6/webapp/admin_rolemanagement.jsp	2016-12-18 17:43:51 UTC (rev 1511)
@@ -75,6 +75,10 @@
 <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">
+</head>
+
+<body>
+<%@ include file="header.jsp" %>
 <script type="text/javascript" language="JavaScript">
 <!--
 function confirmSubmit(form, boxid) {
@@ -91,10 +95,6 @@
 }
 // -->
 </script>
-</head>
-
-<body>
-<%@ include file="header.jsp" %>
   <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">

Modified: branches/1.6/webapp/admin_sendemail.jsp
===================================================================
--- branches/1.6/webapp/admin_sendemail.jsp	2016-12-18 17:38:14 UTC (rev 1510)
+++ branches/1.6/webapp/admin_sendemail.jsp	2016-12-18 17:43:51 UTC (rev 1511)
@@ -75,15 +75,15 @@
   <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" language="JavaScript">
-<!--
-// -->
-  </script>
 
 </head>
 
 <body>
 <%@ include file="header.jsp" %>
+  <script type="text/javascript" language="JavaScript">
+<!--
+// -->
+  </script>
   <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">

Modified: branches/1.6/webapp/admin_studentrecords.jsp
===================================================================
--- branches/1.6/webapp/admin_studentrecords.jsp	2016-12-18 17:38:14 UTC (rev 1510)
+++ branches/1.6/webapp/admin_studentrecords.jsp	2016-12-18 17:43:51 UTC (rev 1511)
@@ -374,8 +374,25 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
 	<link rel="stylesheet" href="css/chosen/chosen.min.css">
 	<link href="lms_style.css" rel="stylesheet" type="text/css"/>
-	<script type="text/javascript" language="JavaScript">
+   <!-- <style type="text/css">
 <!--
+<!--.style1 {font-size: 12px}
+<!--.style2 {text-transform: none; color: #3F7ABA; padding: 4px 4px 8px; font-weight: bold; text-decoration: none; border: none; font-family: Arial, Helvetica, sans-serif;}
+<!--.style3 {font-size: 10px}
+<!--.style6 {font-size: 12px; text-transform: none; font-weight: bold; text-decoration: none; border: none; font-family: Arial, Helvetica, sans-serif;}
+-->
+   <!-- </style>// -->
+   <style type="text/css">
+<!--
+.style1 {color: #9A9697}
+-->
+   </style>
+</head>
+
+<body onLoad="scrollToReport()">
+<%@ include file="header.jsp" %>
+<script type="text/javascript" language="JavaScript">
+<!--
 var rdCtl = null;
 
 function rD(val) {
@@ -397,24 +414,8 @@
 });
 
 // -->
-    </script>
-   <!-- <style type="text/css">
-<!--
-<!--.style1 {font-size: 12px}
-<!--.style2 {text-transform: none; color: #3F7ABA; padding: 4px 4px 8px; font-weight: bold; text-decoration: none; border: none; font-family: Arial, Helvetica, sans-serif;}
-<!--.style3 {font-size: 10px}
-<!--.style6 {font-size: 12px; text-transform: none; font-weight: bold; text-decoration: none; border: none; font-family: Arial, Helvetica, sans-serif;}
--->
-   <!-- </style>// -->
-   <style type="text/css">
-<!--
-.style1 {color: #9A9697}
--->
-   </style>
-</head>
+</script>
 
-<body onLoad="scrollToReport()">
-<%@ include file="header.jsp" %>
   <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">

Modified: branches/1.6/webapp/admin_systemmanagement.jsp
===================================================================
--- branches/1.6/webapp/admin_systemmanagement.jsp	2016-12-18 17:38:14 UTC (rev 1510)
+++ branches/1.6/webapp/admin_systemmanagement.jsp	2016-12-18 17:43:51 UTC (rev 1511)
@@ -913,6 +913,10 @@
 </style>
 
 <link href="lms_style.css" rel="stylesheet" type="text/css" />
+</head>
+
+<body onLoad="initPage()">
+<%@ include file="header.jsp" %>
 <script type="text/javascript">
 <!--
 function confirmSubmit(form, boxid) {
@@ -970,10 +974,6 @@
 
 // -->
 </script>
-</head>
-
-<body onLoad="initPage()">
-<%@ include file="header.jsp" %>
   <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">

Modified: branches/1.6/webapp/admin_utilities_addecourse.jsp
===================================================================
--- branches/1.6/webapp/admin_utilities_addecourse.jsp	2016-12-18 17:38:14 UTC (rev 1510)
+++ branches/1.6/webapp/admin_utilities_addecourse.jsp	2016-12-18 17:43:51 UTC (rev 1511)
@@ -120,6 +120,10 @@
 }
 -->
 </style>
+</head>
+
+<body>
+<%@ include file="header.jsp" %>
 <script type="text/javascript" language="JavaScript">
 <!--
 function confirmSubmit() {
@@ -145,10 +149,6 @@
 
 // -->
 </script>
-</head>
-
-<body>
-<%@ include file="header.jsp" %>
   <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">

Modified: branches/1.6/webapp/admin_utilities_addthirdparty.jsp
===================================================================
--- branches/1.6/webapp/admin_utilities_addthirdparty.jsp	2016-12-18 17:38:14 UTC (rev 1510)
+++ branches/1.6/webapp/admin_utilities_addthirdparty.jsp	2016-12-18 17:43:51 UTC (rev 1511)
@@ -171,6 +171,9 @@
 -->
 </style>
 
+</head>
+<body>
+  <%@ include file="header.jsp" %>
 <script type="text/javascript" language="JavaScript">
 <!--
 function confirmSubmit() {
@@ -197,9 +200,6 @@
 // -->
 </script>
 
-</head>
-<body>
-  <%@ include file="header.jsp" %>
   <div id="pageContainer">
     <%@ include file="menu.jsp" %>
     <div id="content">

Modified: branches/1.6/webapp/admin_utilities_managecourses.jsp
===================================================================
--- branches/1.6/webapp/admin_utilities_managecourses.jsp	2016-12-18 17:38:14 UTC (rev 1510)
+++ branches/1.6/webapp/admin_utilities_managecourses.jsp	2016-12-18 17:43:51 UTC (rev 1511)
@@ -145,8 +145,12 @@
 		}
 		-->
 		</style>
-	<script type="text/javascript" language="JavaScript">
-	<!--
+</head>
+
+<body>
+<%@ include file="header.jsp" %>
+<script type="text/javascript" language="JavaScript">
+<!--
 function confirmSubmit(form, boxid) {
 	box=document.getElementById(boxid);
 	choice = box.options[box.selectedIndex].value;
@@ -189,11 +193,8 @@
 }
 	
 // -->
-	</script>
-</head>
+</script>
 
-<body>
-	<%@ include file="header.jsp" %>
 	<div id="pageContainer">
 	<%@ include file="menu.jsp" %>
 	<div id="content">

Modified: branches/1.6/webapp/employee.jsp
===================================================================
--- branches/1.6/webapp/employee.jsp	2016-12-18 17:38:14 UTC (rev 1510)
+++ branches/1.6/webapp/employee.jsp	2016-12-18 17:43:51 UTC (rev 1511)
@@ -59,6 +59,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link href="lms_style.css" rel="stylesheet" type="text/css">
 
+</head>
+
+<body>
+<%@ include file="header.jsp" %>
+
 <script type="text/javascript">
 <!--
 
@@ -71,10 +76,6 @@
 -->
 </script>
 
-</head>
-
-<body>
-<%@ include file="header.jsp" %>
 <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">

Modified: branches/1.6/webapp/lms_style.css
===================================================================
--- branches/1.6/webapp/lms_style.css	2016-12-18 17:38:14 UTC (rev 1510)
+++ branches/1.6/webapp/lms_style.css	2016-12-18 17:43:51 UTC (rev 1511)
@@ -1,788 +1,842 @@
-td {
-	text-align: left;
-}
-body {
-	padding-top: 10px;
-	text-align: center;
-}
-.blockMsg h3 {
-	color: #666666 !important;
-	font-family: Arial, Helvetica, sans-serif !important;
-}
-.tableDataListStudentRecords {
-	font-weight: bold;
-}
-.curriculumHeader {
-	background: #bbbbbb;
-	font-weight: bold;
-}
-.subCurriculumDetail {
-	background: #d2d2d2 !important;
-}
-.subCurriculumDetail td {
-
-}
-.subCourseDetail {
-	/*background: #e6e5e5 !important;*/
-	background: #FFF !important;
-}
-.subCourseDetail td, .subCourseDetail td a {
-	font-style:italic !important;
-	font-weight:normal !important;
-	color:#a8a8a8 !important;
-	text-align:right !important;
-}
-.subCourseDetail td:last-child {
-	text-align:left !important;
-}
-.curHeader, .courseHeader {
-	cursor: pointer;
-}
-.dropdown {
-	background-image:none !important;
-	background-color:rgba(255, 255, 255, 0.9) !important;
-	border:1px #666666 solid !important;
-	left: -1px !important;
-	top: 33px !important;
-	width: 200px !important;
-}
-.dropdown li a {
-	color:#666666 !important;
-}
-.dropdown li a:hover {
-	text-decoration:underline !important;
-}
-.coursecomplete {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	font-weight: bold;
-	text-transform: uppercase;
-	color: #666666;
-	padding-left: 6px;
-}
-.inProgress {
-	font-style: italic;
-	font-weight: bold;
-}
-.courseName {
-	font-weight: bold;
-}
-.centered {
-	margin:auto;
-	alignment:center;
-	text-align:center;
-}
-a {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #666666;
-}
-font {
-	font-family: Arial, Helvetica, sans-serif;
-	color: #666666;
-}
-a:link {
-	text-decoration: none;
-}
-a:visited {
-	text-decoration: none;
-}
-a:hover {
-	text-decoration: underline;
-}
-a:active {
-	text-decoration: none;
-}
-.courselnk a {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	font-weight: bold;
-	color: #666666;
-}
-.instructiontxt {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #FF0000;
-	text-transform: uppercase;
-}
-.word-layer a {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	font-weight: bold;
-	color: #7D7D7D;
-}
-.word-layer p, td {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	color: #7D7D7D;
-}
-.word-layer {
-     visibility: hidden;
-     position:absolute;
-     left:131px;
-     top:214px;
-     width:300px;
-     background-color: #EBEBEB;
-     margin-left : 0;
-     overflow: visible;
-     z-index:6;
-     border: 2px #91AC79;
-     border-style: solid;
-     padding: 7px 7px 7px 7px;
-     color : #7D7D7D;
-	 font-family:Arial, Helvetica, sans-serif ;
-     font-size : 11px;
-     font-style : normal;
-     font-weight : normal;
-     font-variant : normal;
-     word-spacing : normal;
-     letter-spacing : normal;
-     vertical-align : baseline;
-     text-transform : none;
-     text-align : left;
-     text-indent : 0;
-     line-height : normal;
-}
-.word-layer div {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	color: #7D7D7D;
-}
-/* browse box */
-.list-layer {
-     visibility: hidden;
-     position:absolute;
-     left:50px;
-     top:50px;
-     width:220px;
-/*     background-color: #fff3cf; */
-	background-color: #E2E2E2;
-     margin-left : 0;
-     overflow: visible;
-     z-index:6;
-     border: 1px #000000;
-     border-style: solid;
-     padding: 7px 7px 7px 7px;
-     color : #000000;
-	 font-family: Arial, Helvetica, sans-serif;
-     font-size : x-small;
-     font-style : normal;
-     font-weight : normal;
-     font-variant : normal;
-     word-spacing : normal;
-     letter-spacing : normal;
-     vertical-align : baseline;
-     text-transform : none;
-     text-align : left;
-     text-indent : 0;
-     line-height : normal;
-}
-/* Calendar */
-
-.caldays {
-	color: #333333;
-}
-.caldaylink {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	text-transform: none;
-	padding: 4px 4px 8px;
-	font-weight: bold;
-	text-decoration: none;
-	border: none;
-}
-.formbtn:hover {
-	text-decoration: underline;
-}
-.cal-layer {
-     visibility: hidden;
-     position:absolute;
-     left:50px;
-     top:50px;
-     width:200px;
-     background-color: #FFFFFF;
-     margin-left : 0;
-     overflow: visible;
-     z-index:6;
-     border: 1px #91AC79;
-     border-style: solid;
-     padding: 7px 7px 7px 7px;
-     color : #000000;
-	 font-family: Arial, Helvetica, sans-serif;
-     font-size : x-small;
-     font-style : normal;
-     font-weight : normal;
-     font-variant : normal;
-     word-spacing : normal;
-     letter-spacing : normal;
-     vertical-align : baseline;
-     text-transform : none;
-     text-align : left;
-     text-indent : 0;
-     line-height : normal;
-}
-.cal-layer h2 {
-	margin: 0;
-}
-/* day cells */
-
-tr.cal {
-}
-td.cal {
-padding: 0 1px 1px;
-margin-left: 0;
-text-align: right;
-color: #333333;
-}
-td.cal a{
-color: #333333;
-}
-td.caloth a{
-color: #666666;
-}
-/* Not current month cells */
-td.caloth {
-padding: 0 1px 1px;
-margin-left: 0;
-text-align: right;
-color: #666666;
-}
-/* course list */
-td.clist {
-padding: 0 1px 1px;
-margin-left: 0;
-text-align: center;
-}
-td.clist li {
-list-style: none;
-margin: 0;
-border-top: 1px solid #222;
-border-bottom: 1px solid #222;
-border-left: 1px solid #222;
-border-right: 1px solid #222;
-}
-td.clist li a {
-display: block;
-background: #666666;
-text-decoration: none;
-}
-td.clist ul {
-text-indent: 0em;
-padding: 0px;
-margin: 0px
-}
-td.clist li a:link {
-	color: #000;
-}
-td.clist li a:visited {
-	color: #000;
-}
-td.clist li a:hover {
-border-color: #81693F;
-color: #8A0010;
-background : #FFFFCC
-}
-.shim-layer {
-	visibility: hidden;
-	position:absolute;
-	left:5px;
-	top:5px;
-	width:2px;
-	/*     background-color: #ABABAB;*/
-     frameborder: 0;
-	scrolling: no;
-	overflow: hidden;
-	z-index:8;
-}
-.mainmenu {
-	background-image: url(images/sidemenu_bg.jpg);
-	background-repeat: repeat-y;
-	background-position: left;
-	width: 122px;
-}
-/* Everything is new from this point on. When finished, some of the above styles can be deleted. */
-
-#pageContainer{
-	width: 858px;
-	border:1px solid #C6C5C5;
-	border-top: none;
-	margin-right: auto;
-	margin-left: auto;
-	background-color: #F7F7F7;
-	text-align: center;/*margin-top: -50px;*/
-	}
-#pageHeaderContainer {
-	width: 858px;
-	margin-top: -10px;
-	margin-right: auto;
-	margin-left: auto;
-	background-color: #F7F7F7;
-	border: 1px solid #C6C5C5;
-	border-bottom: none;
-	padding: 10px 0;
-}
-#pageHeaderContainer table{
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 10px;
-	font-weight: bold;
-	color: #7D7D7D;
-	text-align: left;
-	float: right;
-}
-#pageHeaderContainer td{
-	text-align: center;
-	vertical-align: middle;
-	margin: 5px;
-	padding: 5px;
-}
-#pageHeaderLogo {
-	position: relative;
-	text-align: left;
-	top: 93px;
-	left: 0px;
-	width: 858px;
-	margin: auto;
-	/*margin-left: 2px;*/
-	margin-top: -45px;
-	padding: 0px;
-}
-#pageHeaderBtns, #pageHeaderText {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	color: #7D7D7D;
-	font-weight: bold;
-	float: right;
-	text-align: left;
-	/*padding: 0 10px;*/
-	margin: -26px 10px 0 10px;
-}
-#pageHeaderBtns img {
-	margin: 0 3px;
-}
-#Banner {
-	background-image: url(images/banner.jpg);
-	background-repeat: no-repeat;
-	background-position: right;
-	/*border-right-width: 1px;
-	border-left-width: 1px;
-	border-right-style: solid;
-	border-left-style: solid;
-	border-right-color: #C6C5C5;
-	border-left-color: #C6C5C5;*/ 
-	clear: both;
-	height: 90px;
-	width: 858px;
-	text-align:left;
-	background-color: #fff;
-}
-/* There are two instances of the "logged in verbiage", one is always Display None, depending on the design.*/
-
-.loggedinTop {
-	/*display: none;*/
-}
-.loggedinBar {
-	display: none;
-}
-#MainMenu {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	font-weight: bold;
-	color: #FFFFFF;
-	background-repeat: repeat-x;
-	background-position: left bottom;
-	height: 34px;
-	width: 858px;
-	margin-bottom:20px;
-	/*border-right-width: 1px;
-	border-left-width: 1px;
-	border-right-style: solid;
-	border-left-style: solid;
-	border-right-color: #C6C5C5;
-	border-left-color: #C6C5C5;*/
-	background-color: #FFFFFF;
-	background-image: url(images/bggradient.jpg);
-}
-#MainMenu a {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #ffffff;
-}
-#MainMenu a:link {
-	text-decoration: none;
-}
-#MainMenu a:visited {
-	text-decoration: none;
-}
-#MainMenu a:hover {
-	text-decoration: underline;
-}
-#MainMenu a:active {
-	text-decoration: none;
-}
-#ulMainNav {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 10px;
-	font-weight: bold;
-	text-align:left;
-	margin: 0px;
-	padding: 0px;
-	list-style-type: none;
-	width: 858px;
-	height: 34px;
-	background-image:url(images/bggradient.jpg);
-	background-position:left bottom;
-	background-repeat:repeat-x;
-}
-#ulMainNav li{
-	/*background-image:url(images/bggradient.jpg);
-	background-position:left bottom;
-	background-repeat:repeat-x;*/
-	border-right:1px solid #FFFFFF;
-	display:inline;
-	float:left;
-	font-family:Arial,Helvetica,sans-serif;
-	font-size:10px;
-	font-weight:bold;
-	height:34px;
-	line-height:11px;
-	list-style-type:none;
-	margin:0px;
-	padding-top:5px;
-	padding-left:5px;
-	padding-right:5px;
-	/*white-space:pre;*/
-	width:auto;
-}
-.tableMain {
-	border: 1px solid #666666;
-	width: 838px;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #666666;
-	background:#FFFFFF;
-	margin-top: auto;
-	margin-right: auto;
-	margin-bottom: 10px;
-	margin-left: auto;
-}
-.tableMain th{
-	border-bottom-width: 1px;
-	border-bottom-style: solid;
-	border-bottom-color: #666666;
-	background-image:url(images/tablehdr_bg.jpg);
-	background-position:left bottom;
-	background-repeat:repeat-y;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	font-weight:bold;
-	text-transform:uppercase;
-	text-align:left;
-	color: #FFFFFF;
-	padding-left: 5px;
-}
-.tableMain caption {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 16px;
-	color: #666666;
-	padding: 2px;
-	font-weight: bold;
-	text-align: left;
-}
-.tableMain a{
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #666666;
-	padding: 5px;
-}
-.tableData {
-	width: 100%;
-	border-collapse: collapse;
-}
-.tableData th {
-	background-color: #9A9697;
-	background-image:url(images/reporthdr_bg.jpg);
-	background-repeat:repeat-x;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 10px;
-	font-weight: bold;
-	line-height: 10px;
-	text-transform: uppercase;
-	color: #FFFFFF;
-	text-align: left;
-	height: 22px;
-	border-right-width: 1px;
-	border-right-style: solid;
-	border-right-color: #FFFFFF;
-}
-.tableData th a  {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 10px;
-	font-weight: bold;
-	line-height: 10px;
-	text-transform: uppercase;
-	color: #FFFFFF;
-	text-align: left;
-	height: 22px;
-}
-.tableData td{
-	border: 1px solid #CCCCCC;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #666666;
-	margin: 0px;
-	padding-top: 2px;
-	padding-right: 2px;
-	padding-bottom: 2px;
-	padding-left: 2px;
-}
-.tableData a{
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #666666;
-	padding: 5px;
-}
-.tableData a:hover{
-	text-decoration:underline;
-}
-.tableDataList {
-	width: 100%;
-	border-collapse: collapse;
-}
-.tableDataList th {
-	background-color: #9A9697;
-	background-image:url(images/reporthdr_bg.jpg);
-	background-repeat:repeat-x;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 10px;
-	font-weight: bold;
-	line-height: 10px;
-	text-transform: uppercase;
-	color: #FFFFFF;
-	text-align: left;
-	height: 22px;
-	border-right-width: 1px;
-	border-right-style: solid;
-	border-right-color: #FFFFFF;
-}
-.tableDataList th a  {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 10px;
-	font-weight: bold;
-	line-height: 10px;
-	text-transform: uppercase;
-	color: #FFFFFF;
-	text-align: left;
-	height: 22px;
-}
-.tableDataList td{
-	border: 1px solid #CCCCCC;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #666666;
-	padding-top: 0px;
-	padding-right: 5px;
-	padding-bottom: 0px;
-	padding-left: 5px;
-	text-align:left;
-}
-.tableDataList a{
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #666666;
-	text-align: left;
-	margin-left:0px;
-	padding-left:0px;
-}
-.tableDataList a:hover{
-	text-decoration:underline;
-}
-.tableDataList p{
-}
-#tableFormLogin {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	width: 370px;
-	border: 1px solid #666666;
-	margin-top: 20px;
-	margin-left: 80px;
-}
-#tableFormLogin th{
-	border-bottom-width: 1px;
-	border-bottom-style: solid;
-	border-bottom-color: #666666;
-	background-image:url(images/tablehdr_bg.jpg);
-	background-position:bottom;
-	background-repeat:repeat-y;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	font-weight:bold;
-	text-transform:uppercase;
-	text-align:left;
-	color: #FFFFFF;
-}
-#tableFormLogin td{
-	border: none;
-}
-#tableFormDataLogin {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #666666;
-	/*padding: 5px;*/
-	width: 100%;
-	border:none;
-}
-#tableForm, .tableForm{
-	border: 1px solid #666666;
-	width: 838px;
-	margin-right: auto;
-	margin-left: auto;
-	background-color: #FFFFFF;
-	margin-bottom: 10px;
-}
-#tableForm td, .tableForm td{
-	padding-top:0px;
-}
-#tableForm th, .tableForm th{
-	border-bottom-width: 1px;
-	border-bottom-style: solid;
-	border-bottom-color: #666666;
-	background-image:url(images/tablehdr_bg.jpg);
-	background-position:bottom;
-	background-repeat:repeat-y;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	font-weight:bold;
-	text-transform:uppercase;
-	text-align:left;
-	color: #FFFFFF;
-	padding-left: 5px;
-}
-#tableFormData, .tableFormData{
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #666666;
-	padding: 3px;
-	width: 100%;
-}
-.formHeadings{
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	color: #666666;
-	padding: 5px;
-	width: 250px;
-	font-weight: bold;
-	text-align: right;
-	text-transform: capitalize;
-	/*background-color: #FFFFFF;*/
-	background-position: top;
-	vertical-align: top;
-}
-.formHeadingsTitle {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 11px;
-	color: #666666;
-	padding: 5px;
-	width: 250px;
-	font-weight: bold;
-	text-transform: capitalize;
-	background-position: top;
-	vertical-align: top;
-	text-decoration:underline;
-	text-align: left;
-}
-.formButtons, .formButtons a, .formButtons a:visited{
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #666666;
-	float: left;
-	width: 90px;
-	display: block;
-	vertical-align: text-bottom;
-}
-.formButtons a:hover{
-text-decoration:underline;
-}
-#tableLogData {
-	border:none;
-	width: 320px;
-}
-#copyright {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	font-style: normal;
-	text-transform: uppercase;
-	color: #333333;
-	background-color: #CCCCCC;
-	text-align: center;
-	height: 15px;
-	width: 858px;/*border: 1px solid #C6C5C5;
-	border-top: none;*//*margin: 0px 0 0 0;*/
-}
-#pageTitles {
-	width: 858px;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 16px;
-	color: #666666;
-	padding: 10px;
-	font-weight: bold;
-	text-align: left;
-	}
-#loginHeader {
-	height: 90px;
-	width: 525px;
-	border: 1px solid #C6C5C5;
-	border-bottom: none;
-	text-align: left;
-	background-image: url(images/login_hdr.jpg);
-}
-#loginContainer {
-	width: 525px;
-	border: 1px solid #C6C5C5;
-}
-#loginTitles {
-	width: 500px;
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 16px;
-	color: #666666;
-	padding: 2px;
-	font-weight: bold;
-	text-align: left;
-	}
-.PageNumbertxt {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #666666;
-}
-.PageNumberNum, PageNumberNum a {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 13px;
-	font-weight:bold;
-	color: #4A854D;
-	padding: 3px;
-}
-.PageNumberNum a:hover, a:active {
-	text-decoration:underline;
-}
-.courseName {
-	font-weight: bold;
-}
-.TableMain .TableDataList .Assign {
-	text-transform: uppercase;
-	color: #E2252B;
-	font-weight: bold;
-	margin: 0px;
-	padding: 0px;
-}
-#pageContainer #content .tableMain .tableDataList .Assign {
-	color: #E1272C;
-	text-transform: uppercase;
-	font-weight: bold;
-}
-h1 {
-	font-family: Arial, Helvetica, sans-serif;
-	color: #666666;
-	border-bottom-width: 1px;
-	border-bottom-style: solid;
-	border-bottom-color: #990000;
-	float: left;
-}
+td {
+	text-align: left;
+}
+body {
+	padding-top: 10px;
+	text-align: center;
+}
+.blockMsg h3 {
+	color: #666666 !important;
+	font-family: Arial, Helvetica, sans-serif !important;
+}
+.tableDataListStudentRecords {
+	font-weight: bold;
+}
+.tableDataListStudentRecords td {
+	padding: 0px !important;
+	padding-left: 5px !important;
+}
+.courseHeaderRow {
+	
+}
+.courseHeaderRow td:last-child {
+	text-align: center !important;
+}
+.courseDetailRow {
+	background: #FFF !important;
+}
+.courseDetailRow td, .courseDetailRow td a {
+	font-style:italic !important;
+	font-weight:normal !important;
+	color:#a8a8a8 !important;
+	text-align:right !important;
+}
+.courseDetailRow td {
+	padding-right: 5px !important;
+	padding-top: 5px !important;
+	padding-bottom: 5px !important;
+}
+.courseDetailRow td:last-child {}
+.curriculumHeaderRow {
+	background: #bbbbbb;
+	font-weight: bold;
+	height: 30px !important;
+}
+.curriculumHeaderRow span.curHeader {
+	line-height: 12px;
+}
+.curriculumDetailRow {
+	background: #FFF !important;
+}
+.curriculumDetailRow td, .curriculumDetailRow td a {
+	font-style:italic !important;
+	font-weight:normal !important;
+	color:#a8a8a8 !important;
+	text-align:right !important;
+}
+.curriculumDetailRow td {
+	padding-right: 5px !important;
+	padding-top: 5px !important;
+	padding-bottom: 5px !important;
+}
+.curriculumDetailRow td:last-child {}
+.subCourseHeaderRow {
+	background: #d2d2d2;
+	font-weight: bold;
+}
+.subCourseHeaderRow td {}
+.subCourseHeaderRow span.courseHeader {
+	padding-left: 10px !important;
+	font-weight: bold !important;
+    font-size: 17px !important;
+	width: 100% !important;
+}
+.subCourseDetailRow {
+	background: #FFF !important;
+}
+.subCourseDetailRow td, .subCourseDetailRow td a {
+	font-style:italic !important;
+	font-weight:normal !important;
+	color:#a8a8a8 !important;
+	text-align:right !important;
+}
+.subCourseDetailRow td {
+	padding-right: 5px !important;
+	padding-top: 5px !important;
+	padding-bottom: 5px !important;
+}
+.subCourseDetailRow td:last-child {}
+.curHeader, .courseHeader {
+	cursor: pointer;
+	font-weight: bold !important;
+    font-size: 17px !important;
+	width: 100% !important;
+}
+.dropdown {
+	background-image:none !important;
+	background-color:rgba(255, 255, 255, 0.9) !important;
+	border:1px #666666 solid !important;
+	left: -1px !important;
+	top: 33px !important;
+	width: 200px !important;
+}
+.dropdown li a {
+	color:#666666 !important;
+}
+.dropdown li a:hover {
+	text-decoration:underline !important;
+}
+.coursecomplete {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	font-weight: bold;
+	text-transform: uppercase;
+	color: #666666;
+	padding-left: 6px;
+}
+.inProgress {
+	font-style: italic;
+	font-weight: bold;
+}
+.courseName {
+	font-weight: bold;
+}
+.centered {
+	margin:auto;
+	alignment:center;
+	text-align:center;
+}
+a {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #666666;
+}
+font {
+	font-family: Arial, Helvetica, sans-serif;
+	color: #666666;
+}
+a:link {
+	text-decoration: none;
+}
+a:visited {
+	text-decoration: none;
+}
+a:hover {
+	text-decoration: underline;
+}
+a:active {
+	text-decoration: none;
+}
+.courselnk a {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	font-weight: bold;
+	color: #666666;
+}
+.instructiontxt {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #FF0000;
+	text-transform: uppercase;
+}
+.word-layer a {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	font-weight: bold;
+	color: #7D7D7D;
+}
+.word-layer p, td {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	color: #7D7D7D;
+}
+.word-layer {
+	visibility: hidden;
+	position:absolute;
+	left:131px;
+	top:214px;
+	width:300px;
+	background-color: #EBEBEB;
+	margin-left : 0;
+	overflow: visible;
+	z-index:6;
+	border: 2px #91AC79;
+	border-style: solid;
+	padding: 7px 7px 7px 7px;
+	color : #7D7D7D;
+	font-family:Arial, Helvetica, sans-serif;
+	font-size : 11px;
+	font-style : normal;
+	font-weight : normal;
+	font-variant : normal;
+	word-spacing : normal;
+	letter-spacing : normal;
+	vertical-align : baseline;
+	text-transform : none;
+	text-align : left;
+	text-indent : 0;
+	line-height : normal;
+}
+.word-layer div {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	color: #7D7D7D;
+}
+/* browse box */
+.list-layer {
+	visibility: hidden;
+	position:absolute;
+	left:50px;
+	top:50px;
+	width:220px;
+	/*     background-color: #fff3cf; */
+	background-color: #E2E2E2;
+	margin-left : 0;
+	overflow: visible;
+	z-index:6;
+	border: 1px #000000;
+	border-style: solid;
+	padding: 7px 7px 7px 7px;
+	color : #000000;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size : x-small;
+	font-style : normal;
+	font-weight : normal;
+	font-variant : normal;
+	word-spacing : normal;
+	letter-spacing : normal;
+	vertical-align : baseline;
+	text-transform : none;
+	text-align : left;
+	text-indent : 0;
+	line-height : normal;
+}
+/* Calendar */
+
+.caldays {
+	color: #333333;
+}
+.caldaylink {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	text-transform: none;
+	padding: 4px 4px 8px;
+	font-weight: bold;
+	text-decoration: none;
+	border: none;
+}
+.formbtn:hover {
+	text-decoration: underline;
+}
+.cal-layer {
+	visibility: hidden;
+	position:absolute;
+	left:50px;
+	top:50px;
+	width:200px;
+	background-color: #FFFFFF;
+	margin-left : 0;
+	overflow: visible;
+	z-index:6;
+	border: 1px #91AC79;
+	border-style: solid;
+	padding: 7px 7px 7px 7px;
+	color : #000000;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size : x-small;
+	font-style : normal;
+	font-weight : normal;
+	font-variant : normal;
+	word-spacing : normal;
+	letter-spacing : normal;
+	vertical-align : baseline;
+	text-transform : none;
+	text-align : left;
+	text-indent : 0;
+	line-height : normal;
+}
+.cal-layer h2 {
+	margin: 0;
+}
+/* day cells */
+
+tr.cal {
+}
+td.cal {
+	padding: 0 1px 1px;
+	margin-left: 0;
+	text-align: right;
+	color: #333333;
+}
+td.cal a {
+	color: #333333;
+}
+td.caloth a {
+	color: #666666;
+}
+/* Not current month cells */
+td.caloth {
+	padding: 0 1px 1px;
+	margin-left: 0;
+	text-align: right;
+	color: #666666;
+}
+/* course list */
+td.clist {
+	padding: 0 1px 1px;
+	margin-left: 0;
+	text-align: center;
+}
+td.clist li {
+	list-style: none;
+	margin: 0;
+	border-top: 1px solid #222;
+	border-bottom: 1px solid #222;
+	border-left: 1px solid #222;
+	border-right: 1px solid #222;
+}
+td.clist li a {
+	display: block;
+	background: #666666;
+	text-decoration: none;
+}
+td.clist ul {
+	text-indent: 0em;
+	padding: 0px;
+	margin: 0px
+}
+td.clist li a:link {
+	color: #000;
+}
+td.clist li a:visited {
+	color: #000;
+}
+td.clist li a:hover {
+	border-color: #81693F;
+	color: #8A0010;
+	background : #FFFFCC
+}
+.shim-layer {
+	visibility: hidden;
+	position:absolute;
+	left:5px;
+	top:5px;
+	width:2px;
+	/*     background-color: #ABABAB;*/
+     frameborder: 0;
+	scrolling: no;
+	overflow: hidden;
+	z-index:8;
+}
+.mainmenu {
+	background-image: url(images/sidemenu_bg.jpg);
+	background-repeat: repeat-y;
+	background-position: left;
+	width: 122px;
+}
+/* Everything is new from this point on. When finished, some of the above styles can be deleted. */
+
+#pageContainer {
+	width: 858px;
+	border:1px solid #C6C5C5;
+	border-top: none;
+	margin-right: auto;
+	margin-left: auto;
+	background-color: #F7F7F7;
+	text-align: center;/*margin-top: -50px;*/
+}
+#pageHeaderContainer {
+	width: 858px;
+	margin-top: -10px;
+	margin-right: auto;
+	margin-left: auto;
+	background-color: #F7F7F7;
+	border: 1px solid #C6C5C5;
+	border-bottom: none;
+	padding: 10px 0;
+}
+#pageHeaderContainer table {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 10px;
+	font-weight: bold;
+	color: #7D7D7D;
+	text-align: left;
+	float: right;
+}
+#pageHeaderContainer td {
+	text-align: center;
+	vertical-align: middle;
+	margin: 5px;
+	padding: 5px;
+}
+#pageHeaderLogo {
+	position: relative;
+	text-align: left;
+	top: 93px;
+	left: 0px;
+	width: 858px;
+	margin: auto;
+	/*margin-left: 2px;*/
+	margin-top: -45px;
+	padding: 0px;
+}
+#pageHeaderBtns, #pageHeaderText {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	color: #7D7D7D;
+	font-weight: bold;
+	float: right;
+	text-align: left;
+	/*padding: 0 10px;*/
+	margin: -26px 10px 0 10px;
+}
+#pageHeaderBtns img {
+	margin: 0 3px;
+}
+#Banner {
+	background-image: url(images/banner.jpg);
+	background-repeat: no-repeat;
+	background-position: right;
+	/*border-right-width: 1px;
+	border-left-width: 1px;
+	border-right-style: solid;
+	border-left-style: solid;
+	border-right-color: #C6C5C5;
+	border-left-color: #C6C5C5;*/ 
+	clear: both;
+	height: 90px;
+	width: 858px;
+	text-align:left;
+	background-color: #fff;
+}
+/* There are two instances of the "logged in verbiage", one is always Display None, depending on the design.*/
+
+.loggedinTop {
+/*display: none;*/
+}
+.loggedinBar {
+	display: none;
+}
+#MainMenu {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	font-weight: bold;
+	color: #FFFFFF;
+	background-repeat: repeat-x;
+	background-position: left bottom;
+	height: 34px;
+	width: 858px;
+	margin-bottom:20px;
+	/*border-right-width: 1px;
+	border-left-width: 1px;
+	border-right-style: solid;
+	border-left-style: solid;
+	border-right-color: #C6C5C5;
+	border-left-color: #C6C5C5;*/
+	background-color: #FFFFFF;
+	background-image: url(images/bggradient.jpg);
+}
+#MainMenu a {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #ffffff;
+}
+#MainMenu a:link {
+	text-decoration: none;
+}
+#MainMenu a:visited {
+	text-decoration: none;
+}
+#MainMenu a:hover {
+	text-decoration: underline;
+}
+#MainMenu a:active {
+	text-decoration: none;
+}
+#ulMainNav {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 10px;
+	font-weight: bold;
+	text-align:left;
+	margin: 0px;
+	padding: 0px;
+	list-style-type: none;
+	width: 858px;
+	height: 34px;
+	background-image:url(images/bggradient.jpg);
+	background-position:left bottom;
+	background-repeat:repeat-x;
+}
+#ulMainNav li {
+	/*background-image:url(images/bggradient.jpg);
+	background-position:left bottom;
+	background-repeat:repeat-x;*/
+	border-right:1px solid #FFFFFF;
+	display:inline;
+	float:left;
+	font-family:Arial, Helvetica, sans-serif;
+	font-size:10px;
+	font-weight:bold;
+	height:34px;
+	line-height:11px;
+	list-style-type:none;
+	margin:0px;
+	padding-top:5px;
+	padding-left:5px;
+	padding-right:5px;
+	/*white-space:pre;*/
+	width:auto;
+}
+.tableMain {
+	border: 1px solid #666666;
+	width: 838px;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #666666;
+	background:#FFFFFF;
+	margin-top: auto;
+	margin-right: auto;
+	margin-bottom: 10px;
+	margin-left: auto;
+}
+.tableMain th {
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+	border-bottom-color: #666666;
+	background-image:url(images/tablehdr_bg.jpg);
+	background-position:left bottom;
+	background-repeat:repeat-y;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	font-weight:bold;
+	text-transform:uppercase;
+	text-align:left;
+	color: #FFFFFF;
+	padding-left: 5px;
+}
+.tableMain caption {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 16px;
+	color: #666666;
+	padding: 2px;
+	font-weight: bold;
+	text-align: left;
+}
+.tableMain a {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #666666;
+	padding: 5px;
+}
+.tableData {
+	width: 100%;
+	border-collapse: collapse;
+}
+.tableData th {
+	background-color: #9A9697;
+	background-image:url(images/reporthdr_bg.jpg);
+	background-repeat:repeat-x;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 10px;
+	font-weight: bold;
+	line-height: 10px;
+	text-transform: uppercase;
+	color: #FFFFFF;
+	text-align: left;
+	height: 22px;
+	border-right-width: 1px;
+	border-right-style: solid;
+	border-right-color: #FFFFFF;
+}
+.tableData th a {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 10px;
+	font-weight: bold;
+	line-height: 10px;
+	text-transform: uppercase;
+	color: #FFFFFF;
+	text-align: left;
+	height: 22px;
+}
+.tableData td {
+	border: 1px solid #CCCCCC;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #666666;
+	margin: 0px;
+	padding-top: 2px;
+	padding-right: 2px;
+	padding-bottom: 2px;
+	padding-left: 2px;
+}
+.tableData a {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #666666;
+	padding: 5px;
+}
+.tableData a:hover {
+	text-decoration:underline;
+}
+.tableDataList {
+	width: 100%;
+	border-collapse: collapse;
+}
+.tableDataList th {
+	background-color: #9A9697;
+	background-image:url(images/reporthdr_bg.jpg);
+	background-repeat:repeat-x;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 10px;
+	font-weight: bold;
+	line-height: 10px;
+	text-transform: uppercase;
+	color: #FFFFFF;
+	text-align: left;
+	height: 22px;
+	border-right-width: 1px;
+	border-right-style: solid;
+	border-right-color: #FFFFFF;
+}
+.tableDataList th a {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 10px;
+	font-weight: bold;
+	line-height: 10px;
+	text-transform: uppercase;
+	color: #FFFFFF;
+	text-align: left;
+	height: 22px;
+}
+.tableDataList td {
+	border: 1px solid #CCCCCC;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #666666;
+	padding-top: 0px;
+	padding-right: 5px;
+	padding-bottom: 0px;
+	padding-left: 5px;
+	text-align:left;
+}
+.tableDataList a {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #666666;
+	text-align: left;
+	margin-left:0px;
+	padding-left:0px;
+}
+.tableDataList a:hover {
+	text-decoration:underline;
+}
+.tableDataList p {
+}
+#tableFormLogin {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	width: 370px;
+	border: 1px solid #666666;
+	margin-top:20px;
+	margin-left: 80px;
+}
+#tableFormLogin th {
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+	border-bottom-color: #666666;
+	background-image:url(images/tablehdr_bg.jpg);
+	background-position:bottom;
+	background-repeat:repeat-y;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	font-weight:bold;
+	text-transform:uppercase;
+	text-align:left;
+	color: #FFFFFF;
+}
+#tableFormLogin td {
+	border: none;
+}
+#tableFormDataLogin {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #666666;
+	/*padding: 5px;*/
+	width: 100%;
+	border:none;
+}
+#tableForm, .tableForm {
+	border: 1px solid #666666;
+	width: 838px;
+	margin-right: auto;
+	margin-left: auto;
+	background-color: #FFFFFF;
+	margin-bottom: 10px;
+}
+#tableForm td, .tableForm td {
+	padding-top:0px;
+}
+#tableForm th, .tableForm th {
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+	border-bottom-color: #666666;
+	background-image:url(images/tablehdr_bg.jpg);
+	background-position:bottom;
+	background-repeat:repeat-y;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	font-weight:bold;
+	text-transform:uppercase;
+	text-align:left;
+	color: #FFFFFF;
+	padding-left: 5px;
+}
+#tableFormData, .tableFormData {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #666666;
+	padding: 3px;
+	width: 100%;
+}
+.formHeadings {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	color: #666666;
+	padding: 5px;
+	width: 250px;
+	font-weight: bold;
+	text-align: right;
+	text-transform: capitalize;
+	/*background-color: #FFFFFF;*/
+	background-position: top;
+	vertical-align: top;
+}
+.formHeadingsTitle {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 11px;
+	color: #666666;
+	padding: 5px;
+	width: 250px;
+	font-weight: bold;
+	text-transform: capitalize;
+	background-position: top;
+	vertical-align: top;
+	text-decoration:underline;
+	text-align: left;
+}
+.formButtons, .formButtons a, .formButtons a:visited {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #666666;
+	float: left;
+	width: 90px;
+	display: block;
+	vertical-align: text-bottom;
+}
+.formButtons a:hover {
+	text-decoration:underline;
+}
+#tableLogData {
+	border:none;
+	width: 320px;
+}
+#copyright {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	font-style: normal;
+	text-transform: uppercase;
+	color: #333333;
+	background-color: #CCCCCC;
+	text-align: center;
+	height: 15px;
+	width: 858px;/*border: 1px solid #C6C5C5;
+	border-top: none;*//*margin: 0px 0 0 0;*/
+}
+#pageTitles {
+	width: 858px;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 16px;
+	color: #666666;
+	padding: 10px;
+	font-weight: bold;
+	text-align: left;
+}
+#loginHeader {
+	height: 90px;
+	width: 525px;
+	border: 1px solid #C6C5C5;
+	border-bottom: none;
+	text-align: left;
+	background-image: url(images/login_hdr.jpg);
+}
+#loginContainer {
+	width: 525px;
+	border: 1px solid #C6C5C5;
+}
+#loginTitles {
+	width: 500px;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 16px;
+	color: #666666;
+	padding: 2px;
+	font-weight: bold;
+	text-align: left;
+}
+.PageNumbertxt {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	color: #666666;
+}
+.PageNumberNum, PageNumberNum a {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 13px;
+	font-weight:bold;
+	color: #4A854D;
+	padding: 3px;
+}
+.PageNumberNum a:hover, a:active {
+	text-decoration:underline;
+}
+.courseName {
+	font-weight: bold;
+}
+.TableMain .TableDataList .Assign {
+	text-transform: uppercase;
+	color: #E2252B;
+	font-weight: bold;
+	margin: 0px;
+	padding: 0px;
+}
+#pageContainer #content .tableMain .tableDataList .Assign {
+	color: #E1272C;
+	text-transform: uppercase;
+	font-weight: bold;
+}
+h1 {
+	font-family: Arial, Helvetica, sans-serif;
+	color: #666666;
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+	border-bottom-color: #990000;
+	float: left;
+}

Modified: branches/1.6/webapp/manager_authorization.jsp
===================================================================
--- branches/1.6/webapp/manager_authorization.jsp	2016-12-18 17:38:14 UTC (rev 1510)
+++ branches/1.6/webapp/manager_authorization.jsp	2016-12-18 17:43:51 UTC (rev 1511)
@@ -115,7 +115,13 @@
     <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" language="JavaScript">
+  </head>
+
+ <body>
+
+<%@ include file="header.jsp" %>
+
+<script type="text/javascript" language="JavaScript">
 <!--
 function rD(val) {
     document.coursesave.activeDate.value = val;
@@ -124,11 +130,8 @@
     document.coursesave.locURL.value = 'courses/'+val+'/frameset.htm';
 }
 // -->
-    </script>
-  </head>
+</script>
 
- <body>
-<%@ include file="header.jsp" %>
   <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">

Modified: branches/1.6/webapp/report_employeecourseatt.jsp
===================================================================
--- branches/1.6/webapp/report_employeecourseatt.jsp	2016-12-18 17:38:14 UTC (rev 1510)
+++ branches/1.6/webapp/report_employeecourseatt.jsp	2016-12-18 17:43:51 UTC (rev 1511)
@@ -196,6 +196,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <link href="lms_style.css" rel="stylesheet" type="text/css">
 
+</head>
+<body>
+
+<%@ include file="header.jsp" %>
+
 <script type="text/javascript">
 var rcid=0;
 function retake(inCID) {
@@ -231,26 +236,26 @@
 }
 function toggleCourseDetails(courseID) {
 	if ($('.subCourseID_'+courseID+':first').is(":visible")) {
-		$('#courseHeader_'+courseID).html('?');
+		$('#courseHeader_'+courseID).html('+');
 		$('.subCourseID_'+courseID).hide();
 	}
 	else {
-		$('#courseHeader_'+courseID).html('?');
+		$('#courseHeader_'+courseID).html('&ndash;');
 		$('.subCourseID_'+courseID).show();
 	}
 }
 function toggleCurriculumDetails(courseID) {
 	if ($('.subCurriculumID_'+courseID+':first').is(":visible")) {
-		$('#curriculumHeader_'+courseID).html('?');
+		$('#curriculumHeader_'+courseID).html('?<br>?');
 		$('.subCurriculumID_'+courseID).hide();
 		$('.historyDetail').hide();
-		$('.courseHeader').html('?');
+		$('.courseHeader').html('+');
 	}
 	else {
-		$('#curriculumHeader_'+courseID).html('?');
+		$('#curriculumHeader_'+courseID).html('?<br>?');
 		$('.subCurriculumID_'+courseID).show();
 		$('.historyDetail').hide();
-		$('.courseHeader').html('?');
+		$('.courseHeader').html('+');
 	}
 }
 
@@ -261,9 +266,7 @@
 
 
 </script>
-</head>
-<body>
-<%@ include file="header.jsp" %>
+
   <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">
@@ -287,7 +290,6 @@
                                     <td><a class="formButtons" href="javascript:void(window.print())" target="_top">Print Report</a></td>
                                   </tr>
                               </table></td>
-                              <td width="75%">&nbsp;</td>
                             </tr>
                           </table>
                         </td>
@@ -296,19 +298,19 @@
                         <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>
+                              <th style="width: 16px !important;" title="Hide/Show Courses within Curriculum"></th>
+                              <th style="width: 22px !important;" title="Hide/Show All History for an Item"></th>
 <% if (managing) { %>                            
-                              <th>Comments</th>
+                              <th style="width: 160px !important;">Comments</th>
 <% } %>                              
-                              <th>Status</th>
-                              <th>No.</th>
-                              <th>Course Name</th>
-                              <th>Timeframe</th>
-                              <th>Start Date </th>
-                              <th>End Date</th>
-                              <th>Score %</th>
-                              <th>Cert</th>
+                              <th style="width: 60px !important;">Status</th>
+                              <th style="width: 60px !important;">No.</th>
+                              <th style="width: 160px !important;">Course Name</th>
+                              <th style="width: 70px !important;">Timeframe</th>
+                              <th style="width: 70px !important;">Start Date </th>
+                              <th style="width: 70px !important;">End Date</th>
+                              <th style="width: 50px !important;">Score %</th>
+                              <th style="width: 35px !important;">Cert</th>
                             </tr>
 				</thead>
 				<tbody>
@@ -396,7 +398,7 @@
 	if (headerAddition != null) out.write(headerAddition);
 	out.write("</td><td>");
 	if (moreHTML.length() > 0) {
-		out.write("<span class=\"courseHeader\" title=\"Show / Hide history for this item.\" id=\"courseHeader_"+ca.getCourseAttemptCourseID()+"\" onclick=\"toggleCourseDetails('"+ca.getCourseAttemptCourseID()+"');return false;\"> ? </span>");
+		out.write("<span class=\"courseHeader\" title=\"Show / Hide history for this record.\" id=\"courseHeader_"+ca.getCourseAttemptCourseID()+"\" onclick=\"toggleCourseDetails('"+ca.getCourseAttemptCourseID()+"');return false;\">&ndash;</span>");
 	}
 	out.write("</td>");
 	out.write(html);
@@ -411,7 +413,7 @@
 	Logger logger = Logger.getLogger("getCurriculumHTML");
 
 	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 headerAddition = ("<span class=\"curHeader\" id=\"curriculumHeader_"+caCur.getCourseAttemptCourseID()+"\" title=\"Show / Hide Courses within this Curriculum\" onclick=\"toggleCurriculumDetails('"+caCur.getCourseAttemptCourseID()+"');return false;\">?<br>?</span>");
 	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) {

Modified: branches/1.6/webapp/report_pending_summary.jsp
===================================================================
--- branches/1.6/webapp/report_pending_summary.jsp	2016-12-18 17:38:14 UTC (rev 1510)
+++ branches/1.6/webapp/report_pending_summary.jsp	2016-12-18 17:43:51 UTC (rev 1511)
@@ -181,7 +181,13 @@
 	<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">
+</head>
+
+<body>
+
+<%@ include file="header.jsp" %>
+
+<script type="text/javascript">
 <!--
 var rdCtl = null;
 
@@ -189,11 +195,8 @@
     rdCtl.value = val;
 }
 // -->
-    </script>
-</head>
+</script>
 
-<body>
-<%@ include file="header.jsp" %>
   <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">

Modified: branches/1.6/webapp/report_recurrent_training.jsp
===================================================================
--- branches/1.6/webapp/report_recurrent_training.jsp	2016-12-18 17:38:14 UTC (rev 1510)
+++ branches/1.6/webapp/report_recurrent_training.jsp	2016-12-18 17:43:51 UTC (rev 1511)
@@ -107,8 +107,27 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
 	<link rel="stylesheet" href="css/chosen/chosen.min.css">
 	<link href="lms_style.css" rel="stylesheet" type="text/css"/>
-	<script type="text/javascript" language="JavaScript">
+   <!-- <style type="text/css">
 <!--
+<!--.style1 {font-size: 12px}
+<!--.style2 {text-transform: none; color: #3F7ABA; padding: 4px 4px 8px; font-weight: bold; text-decoration: none; border: none; font-family: Arial, Helvetica, sans-serif;}
+<!--.style3 {font-size: 10px}
+<!--.style6 {font-size: 12px; text-transform: none; font-weight: bold; text-decoration: none; border: none; font-family: Arial, Helvetica, sans-serif;}
+-->
+   <!-- </style>// -->
+   <style type="text/css">
+<!--
+.style1 {color: #9A9697}
+-->
+   </style>
+</head>
+
+<body onLoad="scrollToReport()">
+
+<%@ include file="header.jsp" %>
+
+<script type="text/javascript" language="JavaScript">
+<!--
 var rdCtl = null;
 
 function rD(val) {
@@ -130,24 +149,8 @@
 });
 
 // -->
-    </script>
-   <!-- <style type="text/css">
-<!--
-<!--.style1 {font-size: 12px}
-<!--.style2 {text-transform: none; color: #3F7ABA; padding: 4px 4px 8px; font-weight: bold; text-decoration: none; border: none; font-family: Arial, Helvetica, sans-serif;}
-<!--.style3 {font-size: 10px}
-<!--.style6 {font-size: 12px; text-transform: none; font-weight: bold; text-decoration: none; border: none; font-family: Arial, Helvetica, sans-serif;}
--->
-   <!-- </style>// -->
-   <style type="text/css">
-<!--
-.style1 {color: #9A9697}
--->
-   </style>
-</head>
+</script>
 
-<body onLoad="scrollToReport()">
-<%@ include file="header.jsp" %>
   <div id="pageContainer">
 <%@ include file="menu.jsp" %>
 <div id="content">



From scribe at crosswire.org  Sun Dec 18 10:44:56 2016
From: scribe at crosswire.org (scribe at crosswire.org)
Date: Sun, 18 Dec 2016 10:44:56 -0700
Subject: [Ils-source] r1512 - in trunk/webapp: META-INF WEB-INF/classes
Message-ID: <E1cIfW4-0003T3-9I@crosswire.org>

Author: scribe
Date: 2016-12-18 10:44:56 -0700 (Sun, 18 Dec 2016)
New Revision: 1512

Modified:
   trunk/webapp/META-INF/context.xml
   trunk/webapp/WEB-INF/classes/log4j.properties
Log:
reverted config files


Modified: trunk/webapp/META-INF/context.xml
===================================================================
--- trunk/webapp/META-INF/context.xml	2016-12-18 17:43:51 UTC (rev 1511)
+++ trunk/webapp/META-INF/context.xml	2016-12-18 17:44:56 UTC (rev 1512)
@@ -28,7 +28,8 @@
    
 -->
 
-  <Environment name="testSQLPath" type="java.lang.String" value="/home/trunk-devel/sites/trunk-devel/sql" description="" />
+  <Environment name="testSQLPath" type="java.lang.String" value="$WEBAPPBASE/sql" description="" />
+  <Resource    name="testSQLPath" type="java.lang.String" value="$WEBAPPBASE/sql" />
 
   <Resource
     name="storeDB"
@@ -37,9 +38,9 @@
     maxIdle="5"
     maxWait="5000"
     validationQuery="SELECT COMPANYID FROM SYSCONF"
-    username="trunkdevel"
-    password="trunkdevel"
-    url="jdbc:sqlserver://10.134.51.131:1433;"
+    username="$DBUSER"
+    password="$DBPASSWD"
+    url="jdbc:sqlserver://10.134.51.131:1433;user=$DBUSER;password=$DBPASSWD;"
     maxActive="10"/>
 
 

Modified: trunk/webapp/WEB-INF/classes/log4j.properties
===================================================================
--- trunk/webapp/WEB-INF/classes/log4j.properties	2016-12-18 17:43:51 UTC (rev 1511)
+++ trunk/webapp/WEB-INF/classes/log4j.properties	2016-12-18 17:44:56 UTC (rev 1512)
@@ -1,26 +1,26 @@
-#Last updated by admin
-#Thu Apr 07 19:58:58 GMT 2016
-log4j.appender.S.MaxFileSize=500KB
-log4j.appender.E=org.apache.log4j.RollingFileAppender
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.A=org.apache.log4j.RollingFileAppender
-log4j.appender.E.layout.ConversionPattern=%p %d{dd-MMM-yyyy HH\:mm} %c{1} - %m%n
-log4j.appender.E.MaxBackupIndex=5
-log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F\:%L) - %m%n
-log4j.appender.E.layout=org.apache.log4j.PatternLayout
-log4j.appender.A.MaxBackupIndex=5
-log4j.appender.A.File=/home/trunk-devel/sites/trunk-devel/webapp/log/aicc.log
-log4j.appender.E.MaxFileSize=500KB
-log4j.appender.S.MaxBackupIndex=5
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.logger.AICC=INFO, A
-log4j.appender.S.layout.ConversionPattern=%p %d{dd-MMM-yyyy HH\:mm} %c - %m%n
-log4j.appender.S=org.apache.log4j.RollingFileAppender
-log4j.appender.A.layout.ConversionPattern=%c - %d{dd-MMM HH\:mm} %m%n
-log4j.appender.S.File=/home/trunk-devel/sites/trunk-devel/webapp/log/system.log
-log4j.appender.A.MaxFileSize=500KB
-log4j.appender.A.layout=org.apache.log4j.PatternLayout
-log4j.logger.EVENTS=INFO, E
-log4j.appender.S.layout=org.apache.log4j.PatternLayout
-log4j.rootLogger=INFO, stdout, S
-log4j.appender.E.File=/home/trunk-devel/sites/trunk-devel/webapp/log/events.log
+#Last updated by admin
+#Mon Dec 13 15:19:02 GMT-07:00 2010
+log4j.appender.S.MaxFileSize=500KB
+log4j.appender.E=org.apache.log4j.RollingFileAppender
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.A=org.apache.log4j.RollingFileAppender
+log4j.appender.E.layout.ConversionPattern=%p %d{dd-MMM-yyyy HH\:mm} %c{1} - %m%n
+log4j.appender.E.MaxBackupIndex=5
+log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F\:%L) - %m%n
+log4j.appender.E.layout=org.apache.log4j.PatternLayout
+log4j.appender.A.MaxBackupIndex=5
+log4j.appender.A.File=C\:\\ils\\trunk-devel\\webapp\\log\\aicc.log
+log4j.appender.E.MaxFileSize=500KB
+log4j.appender.S.MaxBackupIndex=5
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.logger.AICC=INFO, A
+log4j.appender.S.layout.ConversionPattern=%p %d{dd-MMM-yyyy HH\:mm} %c - %m%n
+log4j.appender.S=org.apache.log4j.RollingFileAppender
+log4j.appender.A.layout.ConversionPattern=%c - %d{dd-MMM HH\:mm} %m%n
+log4j.appender.S.File=C\:\\ils\\trunk-devel\\webapp\\log\\system.log
+log4j.appender.A.MaxFileSize=500KB
+log4j.appender.A.layout=org.apache.log4j.PatternLayout
+log4j.logger.EVENTS=INFO, E
+log4j.appender.S.layout=org.apache.log4j.PatternLayout
+log4j.rootLogger=DEBUG, stdout, S
+log4j.appender.E.File=C\:\\ils\\trunk-devel\\webapp\\log\\events.log



From scribe at crosswire.org  Sun Dec 18 10:45:47 2016
From: scribe at crosswire.org (scribe at crosswire.org)
Date: Sun, 18 Dec 2016 10:45:47 -0700
Subject: [Ils-source] r1513 - branches/1.6
Message-ID: <E1cIfWt-0003UR-7E@crosswire.org>

Author: scribe
Date: 2016-12-18 10:45:47 -0700 (Sun, 18 Dec 2016)
New Revision: 1513

Modified:
   branches/1.6/
Log:



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



