Index: lams_central/web/qb/collection.jsp =================================================================== diff -u -r9ebb0762842cde9a358626a248132bc7ca650f3c -r0b3c5ce0f18b9e4a4195dc8144dc02784c6e3997 --- lams_central/web/qb/collection.jsp (.../collection.jsp) (revision 9ebb0762842cde9a358626a248132bc7ca650f3c) +++ lams_central/web/qb/collection.jsp (.../collection.jsp) (revision 0b3c5ce0f18b9e4a4195dc8144dc02784c6e3997) @@ -7,7 +7,7 @@ - Collection + <fmt:message key="label.qb.collection" /> @@ -93,7 +93,7 @@ collectionGrid.jqGrid({ guiStyle: "bootstrap", iconSet: 'fontAwesome', - caption: "Questions", + caption: '', datatype: "xml", url: "qb/collection/getCollectionGridData.do?view=single&collectionUid=${collection.uid}", height: "100%", @@ -111,13 +111,13 @@ recordpos: "left", hidegrid: false, colNames:[ - "ID", - "Name", + '', + '', "questionType", "questionVersion", - "Learning Outcomes", - "Used in
lessons", - "Actions", + '', + '', + '', "hasVersions" ], colModel:[ @@ -141,7 +141,7 @@ }, loadError: function(xhr,st,err) { collectionGrid.clearGridData(); - alert("Error!"); + alert(''); }, subGrid : true, subGridOptions: { @@ -166,13 +166,13 @@ cellEdit:false, pager: false, colNames: [ - "ID", - "Name", + '', + '', "questionType", "questionVersion", - "Learning Outcomes", - "Used in
lessons", - "Actions" + '', + '', + '' ], colModel: [ {name:'id', index:'question_id', sortable:false, hidden:true, width: 10}, @@ -186,7 +186,7 @@ ], loadError: function(xhr,st,err) { jQuery("#"+subgrid_table_id).clearGridData(); - alert("Error!"); + alert(''); } }); } @@ -204,13 +204,13 @@ //close editing area on validation failure if (!value.trim()) { $('.editable-open').editableContainer('hide', 'cancel'); - return 'Can not be empty!'; + return ''; } }, //assume server response: 200 Ok {status: 'error', msg: 'field cannot be empty!'} success: function(response, newValue) { if (response.created == 'false') { - alert('Collection with such name already exists'); + alert(''); } } //hide and show pencil on showing and hiding editing widget @@ -253,7 +253,7 @@ // auxiliary formatter for jqGrid's question statistics column function actionsFormatter(cellvalue){ var cellhtml = ""; + + "\", \"_blank\")' title=''>"; cellhtml += "' href='?qbQuestionUid=" + cellvalue + "&oldCollectionUid=${collection.uid}&KeepThis=true&TB_iframe=true&modal=true' class='thickbox'>"; @@ -312,7 +312,11 @@ // remove a collection function removeCollection() { - if (confirm('Are you sure you want to remove "${collection.name}" collection?')) { + + + + + if (confirm('${label.qb.collection.remove.confirm}')) { $.ajax({ 'url' : 'qb/collection/removeCollection.do', 'type' : 'POST', @@ -411,7 +415,7 @@
@@ -429,7 +433,7 @@ - Private collection + @@ -442,14 +446,14 @@