[Ils-source] r1506 - in branches/1.6: . webapp
scribe at crosswire.org
scribe at crosswire.org
Thu Dec 8 10:41:18 MST 2016
Author: scribe
Date: 2016-12-08 10:41:18 -0700 (Thu, 08 Dec 2016)
New Revision: 1506
Modified:
branches/1.6/
branches/1.6/webapp/admin_coursenew.jsp
branches/1.6/webapp/admin_curricnew.jsp
branches/1.6/webapp/lms_style.css
branches/1.6/webapp/report_employeecourseatt.jsp
Log:
merged aesthetic improvements from Dominick
Property changes on: branches/1.6
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:796-1502
+ /trunk:796-1502,1504-1505
Modified: branches/1.6/webapp/admin_coursenew.jsp
===================================================================
--- branches/1.6/webapp/admin_coursenew.jsp 2016-12-08 17:38:47 UTC (rev 1505)
+++ branches/1.6/webapp/admin_coursenew.jsp 2016-12-08 17:41:18 UTC (rev 1506)
@@ -356,7 +356,7 @@
</select></td>
</tr>
<tr>
- <td class="formHeadings">URL / File Path: </td>
+ <td class="formHeadings">URL / File Path :</td>
<td><table>
<tr>
<td><input name="locURL" type="text" value="<%=current.getCourseURL()%>" size="40"/> </td>
@@ -370,7 +370,7 @@
</table></td>
</tr>
<tr>
- <td class="formHeadings">Certification:</td>
+ <td class="formHeadings">Certification :</td>
<td><table>
<tr>
<td width="130"><select name="cert">
@@ -402,7 +402,15 @@
<td><input name="pass" type="text" value="<%=current.getCoursePass()%>" size="6"/> % </td>
</tr>
<tr>
- <td class="formHeadings">Course Certificate</td>
+ <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" />
<label for="dontStoreCert">Displays Current Template and Data</label>
@@ -411,7 +419,7 @@
</td>
</tr>
<tr>
- <td class="formHeadings">Course Certificate Generator </td>
+ <td class="formHeadings">Course Certificate Type :</td>
<td>
<select name="certgen">
<option value="">default</option>
@@ -432,19 +440,37 @@
</td>
</tr>
<tr>
- <td class="formHeadings">Course Certificate Expires After </td>
+ <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>
<tr>
- <td class="formHeadings">Reassign As Recurrent Training </td>
+ <td class="formHeadings">Reassign As Recurrent Training :</td>
<td><input name="passreassign" type="text" value="<%=current.getCourseReassignBeforeDays()%>" size="6"/> Days Before Expiration</td>
</tr>
<tr>
- <td class="formHeadings">Reassign Now As Recurrent Training To All Applicable Users</td>
+ <td class="formHeadings">Reassign Now As Recurrent Training :<br/>To All Applicable Users </td>
<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 class="formHeadings">Requires Management Approval for Completion: </td>
+ <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 :<br/>Approval for Completion </td>
<td colspan="2">
<select name="mgrApprvl">
<option value="0" <%=(!current.isCourseRequiresManagerApproval())?"selected=\"true\"":""%>>No</option>
@@ -455,7 +481,7 @@
- <td class="formHeadings">Approval Checklist: </td>
+ <td class="formHeadings">Approval Checklist :</td>
<td>
<% if ((current.getCourseChecklistURL() != null) && (current.getCourseChecklistURL().length() > 0)) { %>
Modified: branches/1.6/webapp/admin_curricnew.jsp
===================================================================
--- branches/1.6/webapp/admin_curricnew.jsp 2016-12-08 17:38:47 UTC (rev 1505)
+++ branches/1.6/webapp/admin_curricnew.jsp 2016-12-08 17:41:18 UTC (rev 1506)
@@ -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">Curriculum 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,20 +274,24 @@
</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 class="formHeadings">Curriculum Certificate Expires After :</td>
<td><input name="passexp" type="text" value="<%=current.getCoursePassExpireDays()%>" size="6"/> Days</td>
</tr>
<tr>
- <td class="formHeadings">Reassign As Recurrent Training </td>
+ <td class="formHeadings">Reassign As Recurrent Training :</td>
<td><input name="passreassign" type="text" value="<%=current.getCourseReassignBeforeDays()%>" size="6"/> Days Before Expiration</td>
</tr>
<tr>
- <td class="formHeadings">Reassign Now As Recurrent Training To All Applicable Users</td>
+ <td class="formHeadings">Reassign Now As Recurrent Training :<br/>To All Applicable Users </td>
<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>
Modified: branches/1.6/webapp/lms_style.css
===================================================================
--- branches/1.6/webapp/lms_style.css 2016-12-08 17:38:47 UTC (rev 1505)
+++ branches/1.6/webapp/lms_style.css 2016-12-08 17:41:18 UTC (rev 1506)
@@ -1,12 +1,57 @@
td {
text-align: left;
}
-body
-{
+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;
@@ -27,7 +72,6 @@
alignment:center;
text-align:center;
}
-
a {
font-family: Arial, Helvetica, sans-serif;
font-size: 12px;
@@ -49,21 +93,18 @@
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;
@@ -107,8 +148,6 @@
font-size: 11px;
color: #7D7D7D;
}
-
-
/* browse box */
.list-layer {
visibility: hidden;
@@ -138,11 +177,11 @@
text-indent : 0;
line-height : normal;
}
-
/* Calendar */
-.caldays {color: #333333;}
-
+.caldays {
+ color: #333333;
+}
.caldaylink {
font-family: Arial, Helvetica, sans-serif;
font-size: 12px;
@@ -152,11 +191,9 @@
text-decoration: none;
border: none;
}
-
.formbtn:hover {
text-decoration: underline;
}
-
.cal-layer {
visibility: hidden;
position:absolute;
@@ -184,28 +221,22 @@
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;
}
@@ -216,16 +247,12 @@
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;
@@ -234,28 +261,27 @@
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: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;
@@ -268,29 +294,25 @@
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: 860px;
+ width: 858px;
border:1px solid #C6C5C5;
border-top: none;
margin-right: auto;
margin-left: auto;
background-color: #F7F7F7;
- text-align: center;
- /*margin-top: -50px;*/
+ text-align: center;/*margin-top: -50px;*/
}
-
#pageHeaderContainer {
- width: 864px;
+ width: 858px;
margin-top: -10px;
margin-right: auto;
margin-left: auto;
@@ -313,20 +335,18 @@
margin: 5px;
padding: 5px;
}
-#pageHeaderLogo
-{
+#pageHeaderLogo {
position: relative;
text-align: left;
top: 93px;
left: 0px;
- width: 859px;
+ width: 858px;
margin: auto;
- margin-left: 2px;
+ /*margin-left: 2px;*/
margin-top: -45px;
padding: 0px;
}
-#pageHeaderBtns, #pageHeaderText
-{
+#pageHeaderBtns, #pageHeaderText {
font-family: Arial, Helvetica, sans-serif;
font-size: 11px;
color: #7D7D7D;
@@ -336,8 +356,7 @@
/*padding: 0 10px;*/
margin: -26px 10px 0 10px;
}
-#pageHeaderBtns img
-{
+#pageHeaderBtns img {
margin: 0 3px;
}
#Banner {
@@ -352,21 +371,18 @@
border-left-color: #C6C5C5;*/
clear: both;
height: 90px;
- width: 862px;
+ 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
-{
+.loggedinTop {
/*display: none;*/
}
-.loggedinBar
-{
+.loggedinBar {
display: none;
}
-
#MainMenu {
font-family: Arial, Helvetica, sans-serif;
font-size: 12px;
@@ -375,13 +391,14 @@
background-repeat: repeat-x;
background-position: left bottom;
height: 34px;
- width: 860px;
- border-right-width: 1px;
+ 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;
+ border-left-color: #C6C5C5;*/
background-color: #FFFFFF;
background-image: url(images/bggradient.jpg);
}
@@ -402,7 +419,6 @@
#MainMenu a:active {
text-decoration: none;
}
-
#ulMainNav {
font-family: Arial, Helvetica, sans-serif;
font-size: 10px;
@@ -411,13 +427,12 @@
margin: 0px;
padding: 0px;
list-style-type: none;
- width: 860px;
+ 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;
@@ -428,16 +443,16 @@
font-family:Arial,Helvetica,sans-serif;
font-size:10px;
font-weight:bold;
- height:26px;
+ height:34px;
line-height:11px;
list-style-type:none;
margin:0px;
- padding:4px 8px;
- white-space:pre;
+ padding-top:5px;
+ padding-left:5px;
+ padding-right:5px;
+ /*white-space:pre;*/
width:auto;
}
-
-
.tableMain {
border: 1px solid #666666;
width: 838px;
@@ -482,9 +497,7 @@
.tableData {
width: 100%;
border-collapse: collapse;
-
}
-
.tableData th {
background-color: #9A9697;
background-image:url(images/reporthdr_bg.jpg);
@@ -531,14 +544,10 @@
.tableData a:hover{
text-decoration:underline;
}
-
-
.tableDataList {
width: 100%;
border-collapse: collapse;
-
}
-
.tableDataList th {
background-color: #9A9697;
background-image:url(images/reporthdr_bg.jpg);
@@ -575,8 +584,6 @@
padding-bottom: 0px;
padding-left: 5px;
text-align:left;
-
-
}
.tableDataList a{
font-family: Arial, Helvetica, sans-serif;
@@ -590,15 +597,10 @@
text-decoration:underline;
}
.tableDataList p{
-
}
-
-
-
#tableFormLogin {
font-family: Arial, Helvetica, sans-serif;
font-size: 12px;
- padding: 5px;
width: 370px;
border: 1px solid #666666;
margin-top: 20px;
@@ -617,7 +619,6 @@
text-transform:uppercase;
text-align:left;
color: #FFFFFF;
-
}
#tableFormLogin td{
border: none;
@@ -626,14 +627,13 @@
font-family: Arial, Helvetica, sans-serif;
font-size: 12px;
color: #666666;
- padding: 5px;
+ /*padding: 5px;*/
width: 100%;
border:none;
}
-
#tableForm, .tableForm{
border: 1px solid #666666;
- width: 700px;
+ width: 838px;
margin-right: auto;
margin-left: auto;
background-color: #FFFFFF;
@@ -664,8 +664,6 @@
padding: 3px;
width: 100%;
}
-
-
.formHeadings{
font-family: Arial, Helvetica, sans-serif;
font-size: 11px;
@@ -679,6 +677,19 @@
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;
@@ -687,7 +698,6 @@
width: 90px;
display: block;
vertical-align: text-bottom;
-
}
.formButtons a:hover{
text-decoration:underline;
@@ -696,8 +706,6 @@
border:none;
width: 320px;
}
-
-
#copyright {
font-family: Arial, Helvetica, sans-serif;
font-size: 12px;
@@ -707,13 +715,11 @@
background-color: #CCCCCC;
text-align: center;
height: 15px;
- width: 862px;
- border: 1px solid #C6C5C5;
- border-top: none;
- margin: 0px 0 0 0;
+ width: 858px;/*border: 1px solid #C6C5C5;
+ border-top: none;*//*margin: 0px 0 0 0;*/
}
#pageTitles {
- width: 860px;
+ width: 858px;
font-family: Arial, Helvetica, sans-serif;
font-size: 16px;
color: #666666;
@@ -721,7 +727,6 @@
font-weight: bold;
text-align: left;
}
-
#loginHeader {
height: 90px;
width: 525px;
@@ -729,12 +734,10 @@
border-bottom: none;
text-align: left;
background-image: url(images/login_hdr.jpg);
-
}
#loginContainer {
width: 525px;
border: 1px solid #C6C5C5;
-
}
#loginTitles {
width: 500px;
@@ -749,7 +752,6 @@
font-family: Arial, Helvetica, sans-serif;
font-size: 12px;
color: #666666;
-
}
.PageNumberNum, PageNumberNum a {
font-family: Arial, Helvetica, sans-serif;
@@ -758,7 +760,6 @@
color: #4A854D;
padding: 3px;
}
-
.PageNumberNum a:hover, a:active {
text-decoration:underline;
}
@@ -772,7 +773,6 @@
margin: 0px;
padding: 0px;
}
-
#pageContainer #content .tableMain .tableDataList .Assign {
color: #E1272C;
text-transform: uppercase;
Modified: branches/1.6/webapp/report_employeecourseatt.jsp
===================================================================
--- branches/1.6/webapp/report_employeecourseatt.jsp 2016-12-08 17:38:47 UTC (rev 1505)
+++ branches/1.6/webapp/report_employeecourseatt.jsp 2016-12-08 17:41:18 UTC (rev 1506)
@@ -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