[Ils-source] r1510 - in trunk/webapp: . META-INF WEB-INF/classes

scribe at crosswire.org scribe at crosswire.org
Sun Dec 18 10:38:14 MST 2016


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




More information about the Ils-source mailing list