Index: lams_tool_daco/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -rfd2dcf51ae6adf6aee088939b8c616b981e9a6d3 --- lams_tool_daco/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 5e63656a12c02f7476564e278b43ff4ce86ac930) +++ lams_tool_daco/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision fd2dcf51ae6adf6aee088939b8c616b981e9a6d3) @@ -253,6 +253,6 @@ label.learning.submit =Finish label.search=Search... label.monitoring.average.number.records.heading=Average Number of Records +label.scroll.hint=(Scroll the columns to see more records.) - #======= End labels: Exported 246 labels for en AU ===== Index: lams_tool_daco/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -r102a93686f5779e8caf5a693f388edda2e01f05d -rfd2dcf51ae6adf6aee088939b8c616b981e9a6d3 --- lams_tool_daco/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 102a93686f5779e8caf5a693f388edda2e01f05d) +++ lams_tool_daco/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision fd2dcf51ae6adf6aee088939b8c616b981e9a6d3) @@ -254,6 +254,6 @@ label.learning.submit =Finish label.search=Search... label.monitoring.average.number.records.heading=Average Number of Records +label.scroll.hint=(Scroll the columns to see more records.) - #======= End labels: Exported 246 labels for en AU ===== Index: lams_tool_daco/web/includes/css/daco.css =================================================================== diff -u -r303ad8a12ec300c1a2a56a9a7ebbf7629dc8c19f -rfd2dcf51ae6adf6aee088939b8c616b981e9a6d3 --- lams_tool_daco/web/includes/css/daco.css (.../daco.css) (revision 303ad8a12ec300c1a2a56a9a7ebbf7629dc8c19f) +++ lams_tool_daco/web/includes/css/daco.css (.../daco.css) (revision fd2dcf51ae6adf6aee088939b8c616b981e9a6d3) @@ -47,13 +47,33 @@ div.bigNumber{ font-weight: bold; font-size: larger; - padding-top: 5px; } + +table#recordListTable td, table#horizontalListTable td { + /* cells must have the same height, otherwise they will be incorrectly aligned in horizontal record list*/ + padding-left: 5px; + vertical-align: middle; + padding-right: 5px; +} + +table#recordListTable td { + background-color:#f9f9f9 +} + + +table#recordListTable td.fixedCellHeight, table#horizontalListTable td.fixedCellHeight { + /* cells must have the same height, otherwise they will be incorrectly aligned in horizontal record list*/ + height: 150px; +} + table#summaryTable table.alternative-color-inner-table{ /* centers the table in the outer table column */ - margin: auto + margin: auto; } +table#recordListTable, table#recordListTable tr, table#recordListTable td{ + border-right: none !important; +} table#summaryTable td.singleSummaryCell { vertical-align: middle; text-align: center; @@ -64,6 +84,6 @@ text-align: center; } -table#recordListTable td.fixedCellWidth{ - width: 160px; -} +border-thick { + border-left-width: 3px; +} \ No newline at end of file Index: lams_tool_daco/web/pages/learning/listRecords.jsp =================================================================== diff -u -rff797553d39ffd161d228e0fd0c9ed736fdb6245 -rfd2dcf51ae6adf6aee088939b8c616b981e9a6d3 --- lams_tool_daco/web/pages/learning/listRecords.jsp (.../listRecords.jsp) (revision ff797553d39ffd161d228e0fd0c9ed736fdb6245) +++ lams_tool_daco/web/pages/learning/listRecords.jsp (.../listRecords.jsp) (revision fd2dcf51ae6adf6aee088939b8c616b981e9a6d3) @@ -66,22 +66,53 @@ - <%-- Link that displays the horizontal record list --%> - - - - - - - -
- -<%-- - --%>
+ +
+
+
+ +
+
+ + +
+
+ +
+
+ + + + + + + + + +
+
${questionStatus.index+1}
+ +
+
+ + <%-- Link that displayes the horizontal record list --%> + + + + + + + + +
+ +
+
+ + + <%-- Vertical view displays records as separate tables of answers. --%> @@ -251,7 +282,7 @@ - +
Index: lams_tool_daco/web/pages/learning/listRecordsHorizontalPart.jsp =================================================================== diff -u -rff797553d39ffd161d228e0fd0c9ed736fdb6245 -rfd2dcf51ae6adf6aee088939b8c616b981e9a6d3 --- lams_tool_daco/web/pages/learning/listRecordsHorizontalPart.jsp (.../listRecordsHorizontalPart.jsp) (revision ff797553d39ffd161d228e0fd0c9ed736fdb6245) +++ lams_tool_daco/web/pages/learning/listRecordsHorizontalPart.jsp (.../listRecordsHorizontalPart.jsp) (revision fd2dcf51ae6adf6aee088939b8c616b981e9a6d3) @@ -48,37 +48,27 @@ -
- +
- - - - - - - <%-- For comments on the structure, see "learning/listRecords.jsp" --%> @@ -92,16 +82,16 @@ - '${selectedMap.answerOption}
'+ + '${selectedMap.answerOption} '+
- '${selectedMap.answerOption}
'+ + '${selectedMap.answerOption} '+
- '${selectedMap.answerOption}
'+ + '${selectedMap.answerOption} '+
- '${selectedMap.answerOption}
'+ + '${selectedMap.answerOption} '+
@@ -117,30 +107,7 @@ -
- - -
-
+
+ ${recordStatus.index+1} - + -
+ <%-- If the record can be edited, display these links. --%> - " + " onclick="javascript:editRecord('${sessionMapID}',${recordStatus.index+1})"> - " + " onclick="javascript:removeRecord('${sessionMapID}',${recordStatus.index+1})"> -
+
-
${questionStatus.index+1}
- -
- <%-- Iframes are displayed differently in some browsers, this code fixes it. - The last cell in a column is shorter to accomodate the horizontal scrollbar. - --%> - - - id="lastHorizontalQuestion" - - - - - - - style="height: 69px;" - - - style="height: 86px" - - - - - - > + @@ -240,10 +207,6 @@
@@ -255,6 +218,9 @@
+ + + @@ -272,6 +238,6 @@ -
+