Index: lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -rd4022a5f15973e49528bcc3872b6ef4038dc4181 -rb9e5cf0180e43a0827078d30cc1176b16dae66ee --- lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision d4022a5f15973e49528bcc3872b6ef4038dc4181) +++ lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision b9e5cf0180e43a0827078d30cc1176b16dae66ee) @@ -203,9 +203,9 @@ label.monitoring.edit.activity.cancel =Cancel label.monitoring.edit.activity.update =Update label.monitoring.edit.activity.edit =Edit -label.monitoring.summary.results.question =Question results -label.monitoring.summary.see.results =See results for the question -label.monitoring.summary.choose =Choose +label.monitoring.summary.results.question =Detailed question results +label.monitoring.summary.see.results =See results +label.monitoring.summary.choose =Choose... label.monitoring.summary.user.name =User name label.monitoring.summary.total =Total label.monitoring.user.summary.history.responses =User's history of responses Index: lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp =================================================================== diff -u -rd4022a5f15973e49528bcc3872b6ef4038dc4181 -rb9e5cf0180e43a0827078d30cc1176b16dae66ee --- lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp (.../usersummary.jsp) (revision d4022a5f15973e49528bcc3872b6ef4038dc4181) +++ lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp (.../usersummary.jsp) (revision b9e5cf0180e43a0827078d30cc1176b16dae66ee) @@ -2,6 +2,9 @@ "http://www.w3.org/TR/html4/loose.dtd"> <%@ include file="/common/taglibs.jsp"%> +<% pageContext.setAttribute("doublequote", "\""); %> +<% pageContext.setAttribute("singlequote", "'"); %> + <%@ include file="/common/header.jsp"%> @@ -39,14 +42,14 @@ {name:'questionResultUid', index:'questionResultUid', width:0}, {name:'time', index:'time', width:150, sorttype:'date', datefmt:'Y-m-d'}, {name:'response', index:'response', width:200, sortable:false}, - {name:'grade', index:'grade', width:80, sorttype:"float", editable:true, editoptions: {size:4, maxlength: 4}, editrules:{required:false, number:true} } + {name:'grade', index:'grade', width:80, sorttype:"float", editable:true, editoptions: {size:4, maxlength: 4} } ], imgpath: "" + "jqGrid.basic.theme", multiselect: false, - caption: "${question.title}", - editurl: '', - cellEdit: true + caption: "${fn:replace(question.title, doublequote, singlequote)}", + cellurl: '', + cellEdit: true }).hideCol("questionResultUid"); Index: lams_tool_assessment/web/pages/monitoring/summary.jsp =================================================================== diff -u -rd4022a5f15973e49528bcc3872b6ef4038dc4181 -rb9e5cf0180e43a0827078d30cc1176b16dae66ee --- lams_tool_assessment/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision d4022a5f15973e49528bcc3872b6ef4038dc4181) +++ lams_tool_assessment/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision b9e5cf0180e43a0827078d30cc1176b16dae66ee) @@ -1,4 +1,7 @@ <%@ include file="/common/taglibs.jsp"%> +<% pageContext.setAttribute("doublequote", "\""); %> +<% pageContext.setAttribute("singlequote", "'"); %> + @@ -18,7 +21,7 @@ 'userId', '', - '${question.title}', + "${fn:replace(question.title, doublequote, singlequote)}", ''],