[Ils-source] r1516 - in branches/1.6: . webapp

[scribe at crosswire.org]

Author: scribe
Date: 2017-01-05 05:59:57 -0700 (Thu, 05 Jan 2017)
New Revision: 1516

Modified:
   branches/1.6/
   branches/1.6/webapp/report_employeecourseatt.jsp
Log:
merged in latest changes from Dominick for aesthetic improvements to report



Property changes on: branches/1.6
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:796-1502,1504-1505,1507,1509-1510,1512
   + /trunk:796-1502,1504-1505,1507,1509-1510,1512,1514-1515

Modified: branches/1.6/webapp/report_employeecourseatt.jsp
===================================================================
--- branches/1.6/webapp/report_employeecourseatt.jsp	2017-01-05 12:57:22 UTC (rev 1515)
+++ branches/1.6/webapp/report_employeecourseatt.jsp	2017-01-05 12:59:57 UTC (rev 1516)
@@ -236,26 +236,26 @@
 }
 function toggleCourseDetails(courseID) {
 	if ($('.subCourseID_'+courseID+':first').is(":visible")) {
-		$('#courseHeader_'+courseID).html('+');
+		$('#courseHeader_'+courseID).html('+');
 		$('.subCourseID_'+courseID).hide();
 	}
 	else {
-		$('#courseHeader_'+courseID).html('–');
+		$('#courseHeader_'+courseID).html('–');
 		$('.subCourseID_'+courseID).show();
 	}
 }
 function toggleCurriculumDetails(courseID) {
 	if ($('.subCurriculumID_'+courseID+':first').is(":visible")) {
-		$('#curriculumHeader_'+courseID).html('˄<br>˅');
+		$('#curriculumHeader_'+courseID).html('˄<br>˅');
 		$('.subCurriculumID_'+courseID).hide();
 		$('.historyDetail').hide();
-		$('.courseHeader').html('+');
+		$('.courseHeader').html('+');
 	}
 	else {
-		$('#curriculumHeader_'+courseID).html('˅<br>˄');
+		$('#curriculumHeader_'+courseID).html('˅<br>˄');
 		$('.subCurriculumID_'+courseID).show();
 		$('.historyDetail').hide();
-		$('.courseHeader').html('+');
+		$('.courseHeader').html('+');
 	}
 }
 
@@ -298,19 +298,19 @@
                         <td><table class="tableDataList tableDataListStudentRecords">
 				<thead>
                             <tr>
-                              <th style="width: 16px !important;" title="Hide/Show Courses within Curriculum"></th>
-                              <th style="width: 22px !important;" title="Hide/Show All History for an Item"></th>
+                              <th style="width: 16px !important;" title="Hide/Show Courses within Curriculum"></th>
+                              <th style="width: 22px !important;" title="Hide/Show All History for an Item"></th>
 <% if (managing) { %>                            
-                              <th style="width: 160px !important;">Comments</th>
+                              <th style="width: 160px !important;">Comments</th>
 <% } %>                              
-                              <th style="width: 60px !important;">Status</th>
-                              <th style="width: 60px !important;">No.</th>
-                              <th style="width: 160px !important;">Course Name</th>
-                              <th style="width: 70px !important;">Timeframe</th>
-                              <th style="width: 70px !important;">Start Date </th>
-                              <th style="width: 70px !important;">End Date</th>
-                              <th style="width: 50px !important;">Score %</th>
-                              <th style="width: 35px !important;">Cert</th>
+                              <th style="width: 60px !important;">Status</th>
+                              <th style="width: 60px !important;">No.</th>
+                              <th style="width: 160px !important;">Course Name</th>
+                              <th style="width: 70px !important;">Timeframe</th>
+                              <th style="width: 70px !important;">Start Date </th>
+                              <th style="width: 70px !important;">End Date</th>
+                              <th style="width: 50px !important;">Score %</th>
+                              <th style="width: 35px !important;">Cert</th>
                             </tr>
 				</thead>
 				<tbody>
@@ -398,7 +398,7 @@
 	if (headerAddition != null) out.write(headerAddition);
 	out.write("</td><td>");
 	if (moreHTML.length() > 0) {
-		out.write("<span class=\"courseHeader\" title=\"Show / Hide history for this record.\" id=\"courseHeader_"+ca.getCourseAttemptCourseID()+"\" onclick=\"toggleCourseDetails('"+ca.getCourseAttemptCourseID()+"');return false;\">&ndash;</span>");
+		out.write("<span class=\"courseHeader\" title=\"Show / Hide history for this record.\" id=\"courseHeader_"+ca.getCourseAttemptCourseID()+"\" onclick=\"toggleCourseDetails('"+ca.getCourseAttemptCourseID()+"');return false;\">+</span>");
 	}
 	out.write("</td>");
 	out.write(html);
@@ -413,7 +413,7 @@
 	Logger logger = Logger.getLogger("getCurriculumHTML");
 
 	StringWriter out = new StringWriter();
-	String headerAddition = ("<span class=\"curHeader\" id=\"curriculumHeader_"+caCur.getCourseAttemptCourseID()+"\" title=\"Show / Hide Courses within this Curriculum\" onclick=\"toggleCurriculumDetails('"+caCur.getCourseAttemptCourseID()+"');return false;\">˅<br>˄</span>");
+	String headerAddition = ("<span class=\"curHeader\" id=\"curriculumHeader_"+caCur.getCourseAttemptCourseID()+"\" title=\"Show / Hide Courses within this Curriculum\" onclick=\"toggleCurriculumDetails('"+caCur.getCourseAttemptCourseID()+"');return false;\">˄<br>˅</span>");
 	String html = getCourseHTML(courseAttempts, caCur, managing, user, wordNum, headerAddition, null, false, courseCurriculum, curriculaList, courses, courseCourseAttempts);
 	String moreHTML = "";
 	for (int j = 0; j < courseAttempts.size(); ++j) {