Index: lams_tool_scratchie/web/pages/learning/results.jsp =================================================================== diff -u -r81f928586161dd03042b6353f68c7d7b8279ccde -r086bcbb89357b4de91858bc01d534fcee53c1390 --- lams_tool_scratchie/web/pages/learning/results.jsp (.../results.jsp) (revision 81f928586161dd03042b6353f68c7d7b8279ccde) +++ lams_tool_scratchie/web/pages/learning/results.jsp (.../results.jsp) (revision 086bcbb89357b4de91858bc01d534fcee53c1390) @@ -34,6 +34,18 @@ visibility: hidden; } + #burning-questions-container { + .ui-jqgrid.ui-jqgrid-bootstrap .ui-jqgrid-caption { + padding: 1rem; + } + .ui-jqgrid-title { + font-size: 1.2rem !important; + } + .ui-jqgrid .ui-jqgrid-labels th.ui-th-column, .ui-jqgrid .ui-jqgrid-legacy-subgrid .ui-th-subgrid, .ui-jqgrid-labels .ui-th-column-header { + text-align: left; + } + } + /* hide edit button background */ div.btn.ui-inline-edit { background-color:rgba(0, 0, 0, 0) !important; @@ -108,11 +120,9 @@ } }); } - } $(document).ready(function(){ - @@ -131,14 +141,14 @@ 'isUserAuthor', "", "", - "", - "" + "", + "" ], colModel:[ {name:'id', index:'id', width:0, sorttype:"int", hidden: true}, {name:'isUserAuthor', width:0, hidden: true}, {name:'groupName', index:'groupName', width:100, title: false}, - {name:'burningQuestion', index:'burningQuestion', width:501, edittype: 'textarea', title: false, editoptions:{rows:"8"}, + {name:'burningQuestion', index:'burningQuestion', width:401, edittype: 'textarea', title: false, editoptions:{rows:"8"}, formatter:function(cellvalue, options, rowObject, event) { if (event == "edit") { cellvalue = cellvalue.replace(/\n/g, '\n
'); @@ -159,32 +169,36 @@ return ${isUserLeader} && eval(item.isUserAuthor); } }, - {name:'like', index:'like', width:60, align: "center", + {name:'like', index:'like', width:30, align: "right", formatter:function(cellvalue, options, rowObject) { return cellvalue; } }, - {name:'count', index:'count', width:50, align:"right", title: false} + {name:'count', index:'count', width:40, align:"left", title: false} ], - caption: - <%-- General burning question --%> - "" - - - <%-- Regular burning question --%> - - <%-- If we hide titles, we just display a link for "Question 1)" --%> - - " ${i.count})" - - <%-- If we show titles, we display question number and then a link with question title --%> - - "${i.count}) " - - - - - + " [${fn:length(burningQuestionItemDto.burningQuestionDtos)}]", + caption: + + <%-- General burning question --%> + + "" + + + + <%-- Regular burning question --%> + + <%-- If we hide titles, we just display a link for "Question 1)" --%> + + " ${i.count})" + + + <%-- If we show titles, we display question number and then a link with question title --%> + + "${i.count}) " + + + + + + " [${fn:length(burningQuestionItemDto.burningQuestionDtos)}]", editurl: '?sessionId=${toolSessionID}&itemUid=${scratchieItemUid}', inlineEditing: { keys: true, defaultFocusField: "burningQuestion", focusField: "burningQuestion" }, onSelectRow: function (rowid, status, e) { @@ -382,9 +396,9 @@
-
+

-

+