Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r8b3e6b4da3695b5f3991141890bdffce91f14798 -raee194cea3eb314bc67b143955bec5d730f0faa6
--- lams_tool_assessment/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 8b3e6b4da3695b5f3991141890bdffce91f14798)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision aee194cea3eb314bc67b143955bec5d730f0faa6)
@@ -235,6 +235,8 @@
label.authoring.basic.export.questions = Export
label.authoring.advance.display.summary = Display all questions and answers once the learner finishes.
label.authoring.basic.import.qti = Import IMS QTI
+label.authoring.basic.import.word = MS Word
+label.authoring.basic.import.qti = IMS QTI
advanced.reflectOnActivity = Add a notebook at end of Assessment with the following instructions:
monitor.summary.td.addNotebook = Add a notebook at end of Assessment
monitor.summary.td.notebookInstructions = Notebook instructions
Index: lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r8b3e6b4da3695b5f3991141890bdffce91f14798 -raee194cea3eb314bc67b143955bec5d730f0faa6
--- lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 8b3e6b4da3695b5f3991141890bdffce91f14798)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision aee194cea3eb314bc67b143955bec5d730f0faa6)
@@ -235,6 +235,8 @@
label.authoring.basic.export.questions = Export
label.authoring.advance.display.summary = Display all questions and answers once the learner finishes.
label.authoring.basic.import.qti = Import IMS QTI
+label.authoring.basic.import.word = MS Word
+label.authoring.basic.import.qti = IMS QTI
advanced.reflectOnActivity = Add a notebook at end of Assessment with the following instructions:
monitor.summary.td.addNotebook = Add a notebook at end of Assessment
monitor.summary.td.notebookInstructions = Notebook instructions
Index: lams_tool_assessment/web/pages/authoring/basic.jsp
===================================================================
diff -u -radd24141d43ff78942c251760e1614925db89464 -raee194cea3eb314bc67b143955bec5d730f0faa6
--- lams_tool_assessment/web/pages/authoring/basic.jsp (.../basic.jsp) (revision add24141d43ff78942c251760e1614925db89464)
+++ lams_tool_assessment/web/pages/authoring/basic.jsp (.../basic.jsp) (revision aee194cea3eb314bc67b143955bec5d730f0faa6)
@@ -141,8 +141,8 @@
}
};
- function importQTI(){
- window.open('questions/questionFile.jsp?collectionChoice=true',
+ function importQTI(type){
+ window.open('questions/questionFile.jsp?collectionChoice=true&importType='+type,
'QuestionFile','width=500,height=370,scrollbars=yes');
}
@@ -213,7 +213,7 @@
-
+