[Ils-source] r1374 - trunk/webapp

[scribe at crosswire.org]

Author: scribe
Date: 2016-01-06 12:43:59 -0700 (Wed, 06 Jan 2016)
New Revision: 1374

Modified:
   trunk/webapp/admin_systemmanagement.jsp
Log:
applied Adams patch with HTML changes to the user interface for the configuration options of new manager recurrent reports


Modified: trunk/webapp/admin_systemmanagement.jsp
===================================================================
--- trunk/webapp/admin_systemmanagement.jsp	2016-01-06 17:34:23 UTC (rev 1373)
+++ trunk/webapp/admin_systemmanagement.jsp	2016-01-06 19:43:59 UTC (rev 1374)
@@ -1161,6 +1161,10 @@
 	                              <td class="formHeadings"></td>
 	                              <td colspan="2"><input name="emailEnableAssignedRetakes" type="checkbox" value="on" <%="on".equals(currentEmailEnableAssignedRetakes)?"checked=\"checked\"":""%> size="40"/>Assigned Retakes</td>
 	                            </tr>
+                                <tr>
+                                    <td>Enable Manager Email Reports</td>
+                                    <td colspan='2'>&nbsp;</td>
+                                </tr>
 	                            <tr>
 	                              <td class="formHeadings"></td>
 	                              <td colspan="2"><input name="emailEnableManagerRecurReport" type="checkbox" value="on" <%="on".equals(currentEmailEnableManagerRecurReport)?"checked=\"checked\"":""%> size="40"/><t:t>Manager</t:t> Recurrent Training Report &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<span style="cursor:pointer;" onclick="showMoreRecurReport();" id="moreRecurReport">▶ Details...</span></td>
@@ -1195,14 +1199,14 @@
 	                            </tr>
 	                            <tr class="recurMore">
 	                              <td class="formHeadings"></td>
-	                              <td colspan="2">Include Upcoming Training for Next: <input type="text" name="recurReportNumDays" value="<%=currentRecurReportNumDays%>" size="4"/>Days</td>
+	                              <td colspan="2">Include Upcoming Training for Next: <input type="text" name="recurReportNumDays" value="<%=currentRecurReportNumDays%>" size="4"/> Days</td>
 	                            </tr>
 	                            <tr>
 	                              <td>&nbsp;</td>
 	                              <td colspan="2">&nbsp;</td>
 	                            </tr>
 	                            <tr>
-	                              <td>Allow Users To Edit Their Email Address</td>
+	                              <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>
 	                            </tr>
 	                            <tr>