[Ils-source] r1504 - trunk/webapp
scribe at crosswire.org
scribe at crosswire.org
Wed Nov 30 10:33:52 MST 2016
Author: scribe
Date: 2016-11-30 10:33:51 -0700 (Wed, 30 Nov 2016)
New Revision: 1504
Modified:
trunk/webapp/admin_coursenew.jsp
trunk/webapp/admin_curricnew.jsp
trunk/webapp/report_employeecourseatt.jsp
Log:
style updates from Dominick
Modified: trunk/webapp/admin_coursenew.jsp
===================================================================
--- trunk/webapp/admin_coursenew.jsp 2016-11-08 19:10:12 UTC (rev 1503)
+++ trunk/webapp/admin_coursenew.jsp 2016-11-30 17:33:51 UTC (rev 1504)
@@ -402,6 +402,14 @@
<td><input name="pass" type="text" value="<%=current.getCoursePass()%>" size="6"/> % </td>
</tr>
<tr>
+ <td> </td>
+ <td colspan="2"> </td>
+ </tr>
+ <tr>
+ <td class="formHeadingsTitle">Course Certificate Settings</td>
+ <td colspan="2"> </td>
+ </tr>
+ <tr>
<td class="formHeadings">Course Certificate</td>
<td>
<input id="dontStoreCert" name="certstore" type="radio" <%=!current.isCourseCertificateStore()?"checked=\"true\"":""%> value="0" />
@@ -432,6 +440,15 @@
</td>
</tr>
<tr>
+ <td> </td>
+ <td colspan="2"> </td>
+ </tr>
+ <tr>
+ <td class="formHeadingsTitle">Recurrent Training Settings</td>
+ <td colspan="2"> </td>
+ </tr>
+ <tr>
+ <tr>
<td class="formHeadings">Course Certificate Expires After </td>
<td><input name="passexp" type="text" value="<%=current.getCoursePassExpireDays()%>" size="6"/> Days</td>
</tr>
@@ -444,6 +461,15 @@
<td><a href="#" onClick="confirmRevoke(); return false;"><img border="0" src="images/run_btn.gif" width="51" height="24" alt="Perform Action"/></a></td>
</tr>
<tr>
+ <td> </td>
+ <td colspan="2"> </td>
+ </tr>
+ <tr>
+ <td class="formHeadingsTitle">Manager Approval Settings</td>
+ <td colspan="2"> </td>
+ </tr>
+ <tr>
+ <tr>
<td class="formHeadings">Requires Management Approval for Completion: </td>
<td colspan="2">
<select name="mgrApprvl">
Modified: trunk/webapp/admin_curricnew.jsp
===================================================================
--- trunk/webapp/admin_curricnew.jsp 2016-11-08 19:10:12 UTC (rev 1503)
+++ trunk/webapp/admin_curricnew.jsp 2016-11-30 17:33:51 UTC (rev 1504)
@@ -227,12 +227,25 @@
<option value="0" <%=(!current.isCourseActive())?"selected=\"true\"":""%>>Inactive</option>
</select></td>
</tr>
+ <tr>
+ <td class="formHeadings">Enable Curriculum Partial Retake :</td>
+ <td><input type="checkbox" <%=(current.isCourseAllowCurriculumPartRetake())?"checked=\"checked\"":""%> name="curricPartRetake" value="true" /></td>
+ </tr>
<tr>
+ <td> </td>
+ <td colspan="2"> </td>
+ </tr>
+ <tr>
+ <td class="formHeadingsTitle">Cirriculum Certificate Settings</td>
+ <td colspan="2"> </td>
+ </tr>
+ <tr>
+ <tr>
<td class="formHeadings">Enable Curriculum Certificate :</td>
- <td><input onclick="updateCertVisibility();" type="checkbox" <%=(current.isCourseCurriculumCertificate())?"checked=\"checked\"":""%> id="curricCert" name="curricCert" value="true" /></td>
+ <td><input onClick="updateCertVisibility();" type="checkbox" <%=(current.isCourseCurriculumCertificate())?"checked=\"checked\"":""%> id="curricCert" name="curricCert" value="true" /></td>
</tr>
<tr>
- <td class="formHeadings">Curriculum Certificate</td>
+ <td class="formHeadings">Curriculum Certificate :</td>
<td>
<input id="dontStoreCert" name="certstore" type="radio" <%=!current.isCourseCertificateStore()?"checked=\"true\"":""%> value="0" />
<label for="dontStoreCert">Displays Current Template and Data</label>
@@ -241,7 +254,7 @@
</td>
</tr>
<tr>
- <td class="formHeadings">Curriculum Certificate Generator </td>
+ <td class="formHeadings">Curriculum Certificate Type :</td>
<td>
<select id="certgen" name="certgen">
<option value="">default</option>
@@ -261,10 +274,14 @@
</select>
</td>
</tr>
- <tr>
- <td class="formHeadings">Enable Curriculum Part Retake :</td>
- <td><input type="checkbox" <%=(current.isCourseAllowCurriculumPartRetake())?"checked=\"checked\"":""%> name="curricPartRetake" value="true" /></td>
- </tr>
+ <tr>
+ <td> </td>
+ <td colspan="2"> </td>
+ </tr>
+ <tr>
+ <td class="formHeadingsTitle">Recurrent Training Settings</td>
+ <td colspan="2"> </td>
+ </tr>
<tr>
<td class="formHeadings">Curriculum Certificate Expires After </td>
<td><input name="passexp" type="text" value="<%=current.getCoursePassExpireDays()%>" size="6"/> Days</td>
Modified: trunk/webapp/report_employeecourseatt.jsp
===================================================================
--- trunk/webapp/report_employeecourseatt.jsp 2016-11-08 19:10:12 UTC (rev 1503)
+++ trunk/webapp/report_employeecourseatt.jsp 2016-11-30 17:33:51 UTC (rev 1504)
@@ -195,16 +195,6 @@
<title><%= ilsSession.getCurrentCompany().getCompanyName() %> eLearning Portal</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link href="lms_style.css" rel="stylesheet" type="text/css">
-<style>
- .curriculumHeader {
- background: lightgrey;
- }
-
- .curHeader, .courseHeader {
- cursor: pointer;
- }
-</style>
-
<script type="text/javascript" src="crosswire.js"></script>
<script type="text/javascript" src="js/jquery/jquery.min.js"></script>
<script type="text/javascript" src="js/jquery/jquery.blockUI.js"></script>
@@ -306,10 +296,10 @@
</td>
</tr>
<tr>
- <td><table class="tableDataList">
+ <td><table class="tableDataList tableDataListStudentRecords">
<tr>
- <th title="Hide/Show Courses within Curriculum">C</th>
- <th title="Hide/Show All History for an Item">H</th>
+ <th title="Hide/Show Courses within Curriculum"></th>
+ <th title="Hide/Show All History for an Item"></th>
<% if (managing) { %>
<th>Comments</th>
<% } %>
@@ -491,7 +481,7 @@
out.write("<td>");
if ("Passed".equals(status)) {
if (!ca.isCourseAttemptExpired() && !supressRetake) {
- out.write("<a href=\"#\" onClick=\"retake("+ca.getCourseAttemptID()+");return false;\" class=\"Assign\">Assign Retake</a>");
+ out.write("<a href=\"#\" onClick=\"retake("+ca.getCourseAttemptID()+");return false;\" class=\"Assign\">Assign Retake</a><br>");
}
}
else if (!"Awaiting <t:t>Manager</t:t> Approval".equals(status) && user.getUserProfileAccessLevel() > UserProfile.ACCESS_MANAGER || user.hasAccess(UserProfile.ACCESS_MODE_STUDENTREC_PASS_OVERRIDE)) {
@@ -513,7 +503,7 @@
out.write("<td>"+status+"</td>");
out.write("<td>"+ca.getStringValue("coursenum")+"</td>");
- out.write("<td><a href=\"#\" onclick=\"p('course','"+ca.getCourseAttemptCourseID()+"','"+wordNum+"');\"><strong>"+ca.getStringValue("coursename")+"</strong></a></td>");
+ out.write("<td><a href=\"#\" onclick=\"p('course','"+ca.getCourseAttemptCourseID()+"','"+wordNum+"');\">"+ca.getStringValue("coursename")+"</a></td>");
out.write("<td>"+ca.getStringValue("seattimetext")+"</td>");
out.write("<td>"+startDate+"</td>");
out.write("<td>"+endDate+"</td>");
More information about the Ils-source
mailing list