[Ils-source] r1611 - in branches/1.6: . webapp webapp/WEB-INF/classes

[scribe at crosswire.org]

Author: scribe
Date: 2018-07-29 04:35:12 -0700 (Sun, 29 Jul 2018)
New Revision: 1611

Modified:
   branches/1.6/
   branches/1.6/webapp/WEB-INF/classes/versions.properties
   branches/1.6/webapp/admin_profile.jsp
   branches/1.6/webapp/admin_systemmanagement.jsp
Log:
Release 1.82.0



Property changes on: branches/1.6
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:796-1502,1504-1505,1507,1509-1510,1512,1514-1515,1517-1563,1565,1567,1569-1580,1582-1608
   + /trunk:796-1502,1504-1505,1507,1509-1510,1512,1514-1515,1517-1563,1565,1567,1569-1580,1582-1608,1610

Modified: branches/1.6/webapp/WEB-INF/classes/versions.properties
===================================================================
--- branches/1.6/webapp/WEB-INF/classes/versions.properties	2018-07-29 11:33:29 UTC (rev 1610)
+++ branches/1.6/webapp/WEB-INF/classes/versions.properties	2018-07-29 11:35:12 UTC (rev 1611)
@@ -1 +1 @@
-LMS=V1.81.5
+LMS=V1.82.0

Modified: branches/1.6/webapp/admin_profile.jsp
===================================================================
--- branches/1.6/webapp/admin_profile.jsp	2018-07-29 11:33:29 UTC (rev 1610)
+++ branches/1.6/webapp/admin_profile.jsp	2018-07-29 11:35:12 UTC (rev 1611)
@@ -576,10 +576,12 @@
     <td width="228"><input <%=(editMisc)?"":"disabled=\"true\""%> name="mgrRecOver" value="true" type="checkbox" <%=current.isMgrRecurEmailOverride()?"checked=\"checked\"":""%> /></td>
   </tr>
 
+<!--
   <tr>
     <td valign="middle" class="formHeadings">Override (Disable) Manager Compliance Report Emails: </td>
     <td width="228"><input <%=(editMisc)?"":"disabled=\"true\""%> name="mgrComOver" value="true" type="checkbox" <%=current.isMgrComplEmailOverride()?"checked=\"checked\"":""%> /></td>
   </tr>
+-->
 
   <tr>
     <td valign="middle" class="formHeadings"><span style="color:red;">*&nbsp</span><t:t>Role</t:t>: </td>

Modified: branches/1.6/webapp/admin_systemmanagement.jsp
===================================================================
--- branches/1.6/webapp/admin_systemmanagement.jsp	2018-07-29 11:33:29 UTC (rev 1610)
+++ branches/1.6/webapp/admin_systemmanagement.jsp	2018-07-29 11:35:12 UTC (rev 1611)
@@ -110,10 +110,12 @@
 	emailTemplates.add(new EMailTemplate("Recurrent Training Report", "Your Employee's Past Due & Upcoming Training",
 			"The attached Recurrent Training Report includes the Past Due & Upcoming Recurrent Training for your employees at {CONAME}."
 		));
+/*
 	// 8
 	emailTemplates.add(new EMailTemplate("Manager Compliance Report", "Your Teams' Compliance",
 			"The attached Team Compliance Report includes the compliance rates for your employees at {CONAME}."
 		));
+*/
 
 	Properties sysConfigProperties = Utils.getSysConfig(session);
 	File sysConfigFile = new File(session.getServletContext().getRealPath("/WEB-INF/sysconfig."+ilsSession.getCompanyID()+".properties"));
@@ -1369,7 +1371,7 @@
 	                              <td colspan="2">&nbsp;</td>
 	                            </tr>
 
-
+<!--
 	                            <tr>
 	                              <td class="formHeadings"></td>
 	                              <td colspan="2"><input name="emailEnableManagerComplReport" type="checkbox" value="on" <%="on".equals(currentEmailEnableManagerComplReport)?"checked=\"checked\"":""%> size="40"/><t:t>Manager</t:t> Compliance Report &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="cursor:pointer;" onclick="showMoreComplReport();" id="moreComplReport">▶ Details...</span></td>
@@ -1422,6 +1424,7 @@
 	                              <td>&nbsp;</td>
 	                              <td colspan="2">&nbsp;</td>
 	                            </tr>
+-->
 	                            <tr>
 	                              <td>Allow Users To Edit Their Email Address in My Profile</td>
 	                              <td colspan="2"><input name="emailEnableUserEdit" type="checkbox" value="on" <%="on".equals(currentEmailEnableUserEdit)?"checked=\"checked\"":""%> size="40"/></td>