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

scribe at crosswire.org scribe at crosswire.org
Sun Dec 18 10:43:52 MST 2016


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




More information about the Ils-source mailing list