Index: lams_tool_laqa/web/admin/config.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/admin/config.jsp,v
diff -u -r1.6 -r1.6.2.1
--- lams_tool_laqa/web/admin/config.jsp	29 Sep 2012 13:57:56 -0000	1.6
+++ lams_tool_laqa/web/admin/config.jsp	12 Sep 2014 22:43:05 -0000	1.6.2.1
@@ -14,7 +14,6 @@
 		<script src="<lams:LAMSURL/>/includes/javascript/jquery-ui.js"></script>
 
 		<script type="text/javascript">
-		<!--
 			// Creating a 3-dimentional javascript array for category/cognitive skill/question
 			// -------------------------------------------------------------------------------
 			var categoryArray = new Array();
@@ -53,8 +52,7 @@
 				var qaWizardEnabledBox = document.laqa11AdminForm.qaWizardEnabled;
 				var wizardDiv = document.getElementById("wizardDiv");
 				
-				if (qaWizardEnabledBox.checked)
-				{
+				if (qaWizardEnabledBox.checked)	{
 					wizardDiv.style.display = "block";
 				}
 				
@@ -71,59 +69,48 @@
 				var i;
 				with (catMenu) {
 					options[0] = new Option("<fmt:message key="wizard.selectCategory" />", "none");
-					for(i = 0; i < categoryArray.length; i++)
-					{
+					for(i = 0; i < categoryArray.length; i++) {
 						options[i+1] = new Option(categoryArray[i].title, i);
 					} 
 					options[0].selected = true;
 				}
 			}
 			
 			// Edit an existing category
-			function editCategory(title, index)
-			{
+			function editCategory(title, index)	{
 				var cat = categoryArray[index];
 				cat.title = title;
 				categoryArray[index] = cat;
 			}
 			
 			// Edit an existing skill
-			function editSkill(title, catIndex, index)
-			{
+			function editSkill(title, catIndex, index)	{
 				var skill = categoryArray[catIndex].skills[index];
 				skill.title = title;
 				categoryArray[catIndex].skills[index] = skill;
 			}
 			
 			// Edit an existing question
-			function editQuestion(question, catIndex, skillIndex, index)
-			{
+			function editQuestion(question, catIndex, skillIndex, index){
 				var questionObj = categoryArray[catIndex].skills[skillIndex].questions[index];
 				questionObj.question = question;
 				categoryArray[catIndex].skills[skillIndex].questions[index] = questionObj;
 			}
 			
 			// Toggle the wizard view when the checkbox is selected
-			function toggleWizard()
-			{
+			function toggleWizard()	{
 				$("div.wizard").toggle("fast");
 			}
 			
 			// Delete a category
-			function deleteCategory()
-			{
-				if (catMenu.selectedIndex == null || catMenu.selectedIndex <= 0)
-				{
+			function deleteCategory(){
+				if (catMenu.selectedIndex == null || catMenu.selectedIndex <= 0){
 					alert("<fmt:message key="wizard.delete.notselected" />");
-				}
-				else
-				{
-					if (confirm("<fmt:message key="wizard.delete.warnDeleteCategory" />"))
-					{
+				} else {
+					if (confirm("<fmt:message key="wizard.delete.warnDeleteCategory" />")) {
 						var uid = categoryArray[catMenu.selectedIndex-1].uid;
 						
-						if(uid != null && uid)
-						{
+						if(uid != null && uid) {
 							deleteCategories[deleteCategories.length] = uid;
 						}
 						
@@ -135,20 +122,14 @@
 			}
 			
 			// Delete a skill
-			function deleteSkill()
-			{
-				if (skillMenu.selectedIndex == null || skillMenu.selectedIndex <= 0)
-				{
+			function deleteSkill() {
+				if (skillMenu.selectedIndex == null || skillMenu.selectedIndex <= 0) {
 					alert("<fmt:message key="wizard.delete.notselected" />");
-				}
-				else
-				{
-					if (confirm("<fmt:message key="wizard.delete.warnDeleteSkill" />"))
-					{
+				} else {
+					if (confirm("<fmt:message key="wizard.delete.warnDeleteSkill" />"))	{
 						var uid = categoryArray[catMenu.selectedIndex-1].skills[skillMenu.selectedIndex-1].uid;
 						
-						if(uid != null && uid)
-						{
+						if(uid != null && uid) {
 							deleteSkills[deleteSkills.length] = uid;
 						}
 						
@@ -160,20 +141,14 @@
 			}
 			
 			// Delete a question
-			function deleteQuestion()
-			{
-				if (qMenu.selectedIndex == null || qMenu.selectedIndex <= 0)
-				{
+			function deleteQuestion() {
+				if (qMenu.selectedIndex == null || qMenu.selectedIndex <= 0) {
 					alert("<fmt:message key="wizard.delete.notselected" />");
-				}
-				else
-				{
-					if (confirm("<fmt:message key="wizard.delete.warnDeleteQuestion" />"))
-					{
+				} else	{
+					if (confirm("<fmt:message key="wizard.delete.warnDeleteQuestion" />"))	{
 						var uid = categoryArray[catMenu.selectedIndex-1].skills[skillMenu.selectedIndex-1].questions[qMenu.selectedIndex-1].uid;
 						
-						if(uid != null && uid)
-						{
+						if(uid != null && uid) {
 							deleteQuestions[deleteQuestions.length] = uid;
 						}
 						
@@ -184,80 +159,61 @@
 				}
 			}
 			
-			function trim(str)
-			{
+			function trim(str) {
 				return str.replace(/^\s+|\s+$/g, '');
 			}
 			
 			// Special dialog for an edit
-			function editDialog(inputType, isAdd, titleStr, selectDDM)
-			{
-				if(selectDDM.selectedIndex != null && selectDDM.selectedIndex > 0)
-				{
+			function editDialog(inputType, isAdd, titleStr, selectDDM) {
+				if(selectDDM.selectedIndex != null && selectDDM.selectedIndex > 0) {
 					var existingString = selectDDM.options[selectDDM.selectedIndex].text;
 					document.getElementById('inputText').value = existingString;
 					openDialog(inputType, isAdd, titleStr);
-				}
-				else
-				{
+				} else {
 					alert("<fmt:message key="wizard.edit.notSelected" />");
 				}
 			}
 			
 			// Opens the required dialog based on the parameters
-			function openDialog(inputType, isAdd, titleStr)
-			{
+			function openDialog(inputType, isAdd, titleStr)	{
 
 				disableExport();
 				$("#catDialog").dialog("close");
-				$("#catDialog").dialog(
-					{ 
-				    	buttons: 
-				    	{ 
-					        "<fmt:message key="wizard.ok" />": function() 
-					        { 
-					            if(handleDialogInput(inputType, isAdd))
-					            {
-									document.getElementById('inputText').value = "";
-					            	$(this).dialog("close"); 
-					            }
-					        }, 
-					       "<fmt:message key="label.cancel" />": function() 
-					        { 
-					            document.getElementById('inputText').value = "";
-					            $(this).dialog("close"); 
-					        } 
-					    },
-					    height: 120,
-					    width: 725,
-					    title: titleStr,
-					    position: [33,290 + dialogOffSet]
-					}
-				);
+				$("#catDialog").dialog({ 
+					buttons: { 
+						"<fmt:message key="wizard.ok" />": function() { 
+					    	if(handleDialogInput(inputType, isAdd)) {
+								document.getElementById('inputText').value = "";
+					        	$(this).dialog("close"); 
+					        }
+					    }, 
+					    "<fmt:message key="label.cancel" />": function() { 
+					    	document.getElementById('inputText').value = "";
+					    	$(this).dialog("close"); 
+					    } 
+					},
+					height: 120,
+					width: 725,
+					title: titleStr,
+					position: [33,290 + dialogOffSet]
+				});
 				document.getElementById("inputText").focus();
 			}
 			
-			function handleDialogInput(inputType, isAdd)
-			{
+			function handleDialogInput(inputType, isAdd){
 				var inputText = trim(document.getElementById("inputText").value);
-				if (inputText == null || inputText == "")
-				{
+				if (inputText == null || inputText == ""){
 					alert("<fmt:message key="wizard.edit.fieldRequired" />");
 					return false
 				}
 
-				if (inputType=="category")
-				{
-					with (catMenu) 
-		            {
-						if (isAdd)
-						{
+				if (inputType=="category")	{
+					with (catMenu) {
+						if (isAdd) {
 							addCategory(inputText, null, categoryArray.length, true);
 							setUpTripleMenu();
 							options[categoryArray.length].selected = true;
-						}
-						else
-						{
+						} else {
 							editCategory(inputText, catMenu.selectedIndex -1);
 							var indexSelect = catMenu.selectedIndex;
 							setUpTripleMenu();
@@ -267,61 +223,43 @@
 						}
 						
 					}
-				}
-				else if (inputType=="skill")
-				{
-					with (skillMenu) 
-		            {
+				} else if (inputType=="skill") {
+					with (skillMenu) {
 					
-						if (isAdd)
-						{
-							if (catMenu.selectedIndex != null && catMenu.selectedIndex > 0)
-							{
+						if (isAdd) {
+							if (catMenu.selectedIndex != null && catMenu.selectedIndex > 0) {
 								addSkill(inputText, null, catMenu.selectedIndex - 1 , categoryArray[catMenu.selectedIndex - 1].skills.length);
 								changeCategory();
 								options[options.length -1].selected = true;
 								
-							}
-							else
-							{
+							} else {
 								alert("<fmt:message key="wizard.add.mustSelectCategory" />");
 								return false;
 							}
-						}
-						else
-						{
+						} else {
 							editSkill(inputText, catMenu.selectedIndex -1, skillMenu.selectedIndex -1);
 							indexSelect = skillMenu.selectedIndex;
 							changeCategory();
 							options[indexSelect].selected = true;
 							changeSkill();
 						}
 					}
-				}
-				else if (inputType=="question")
-				{
-					with (qMenu) 
-		            {
+				} else if (inputType=="question") {
+					with (qMenu) {
 						var catIndex = catMenu.selectedIndex - 1;
 						var skillIndex = skillMenu.selectedIndex -1;
-						if (isAdd)
-						{
-							if (catMenu.selectedIndex != null && catMenu.selectedIndex > 0 && skillMenu.selectedIndex != null && skillMenu.selectedIndex > 0 )
-							{
+						if (isAdd) {
+							if (catMenu.selectedIndex != null && catMenu.selectedIndex > 0 && skillMenu.selectedIndex != null && skillMenu.selectedIndex > 0 )	{
 								var qIndex = categoryArray[catIndex].skills[skillIndex].questions.length;
 								addQuestion(inputText, null, catIndex, skillIndex, qIndex)
 								changeSkill();
 								options[options.length -1].selected = true;
-							}
-							else
-							{
+							} else {
 								alert("<fmt:message key="wizard.add.mustSelectSkill" />");
 								return false;
 							}
 							
-						}
-						else
-						{
+						} else {
 							var indexSelect = qMenu.selectedIndex;
 							editQuestion(inputText, catIndex, skillIndex, indexSelect -1)
 							changeSkill();
@@ -333,30 +271,25 @@
 			}
 			
 			// Serialises the javascript data befor performing the submit
-			function submitForm(dispatch)
-			{
+			function submitForm(dispatch) {
 				// Serialise the categores, skills an questions in the 3d array
 				// into an xml string
-				if (categoryArray.length > 0)
-				{
+				if (categoryArray.length > 0) {
 					var xmlString = '<?xml version="1.0"?><categories>';
 					var i, j, k;
-					for (i=0; i<categoryArray.length; i++)
-					{
+					for (i=0; i<categoryArray.length; i++) {
 						var categoryString = '<category'+
 							' uid="' + categoryArray[i].uid + '"'+
 							' title="' + escape(categoryArray[i].title) + '"'+
 							' >';
 					
-						for(j=0; j<categoryArray[i].skills.length; j++)
-						{
+						for(j=0; j<categoryArray[i].skills.length; j++)	{
 							var skillString = '<skill'+
 								' uid="'+ categoryArray[i].skills[j].uid + '"'+
 								' title="'+ escape(categoryArray[i].skills[j].title) + '"'+
 								' >';
 							
-							for (k=0; k<categoryArray[i].skills[j].questions.length; k++)
-							{
+							for (k=0; k<categoryArray[i].skills[j].questions.length; k++) {
 								var questionString = '<question'+
 									' uid="'+ categoryArray[i].skills[j].questions[k].uid + '"'+
 									' question="'+ escape(categoryArray[i].skills[j].questions[k].question) + '"'+
@@ -374,36 +307,30 @@
 				}
 				
 				// serialise the deleted catergories
-				if (deleteCategories.length >0)
-				{
+				if (deleteCategories.length >0) {
 					var i;
 					var CSV = deleteCategories[0];
-					for (i=1; i< deleteCategories.length; i++)
-					{
+					for (i=1; i< deleteCategories.length; i++) {
 						CSV += "," + deleteCategories[i];
 					}
 					document.getElementById("deleteCategoriesCSV").value = CSV;
 				}
 				
 				// serialise the deleted skills
-				if (deleteSkills.length >0)
-				{
+				if (deleteSkills.length >0) {
 					var i;
 					var CSV = deleteSkills[0];
-					for (i=1; i< deleteSkills.length; i++)
-					{
+					for (i=1; i< deleteSkills.length; i++) {
 						CSV += "," + deleteSkills[i];
 					}
 					document.getElementById("deleteSkillsCSV").value = CSV;
 				}
 				
 				// serialise the deleted questions
-				if (deleteQuestions.length >0)
-				{
+				if (deleteQuestions.length >0) {
 					var i;
 					var CSV = deleteQuestions[0];
-					for (i=1; i< deleteQuestions.length; i++)
-					{
+					for (i=1; i< deleteQuestions.length; i++) {
 						CSV += "," + deleteQuestions[i];
 					}
 					document.getElementById("deleteQuestionsCSV").value = CSV;
@@ -413,37 +340,26 @@
 				document.laqa11AdminForm.submit();
 			}
 			
-			function customSubmit(dispatch)
-			{
+			function customSubmit(dispatch) {
 				document.getElementById("dispatch").value = dispatch;
 				document.laqa11AdminForm.submit();
 			}
 			
-			function disableExport()
-			{
+			function disableExport() {
 				msg = "<fmt:message key="wizard.export.savefirst" />"
 				document.getElementById("exportButton").href = "javascript:alert('" + msg + "');";
 			}
 			
-			function importFile()
-			{
-				if (document.getElementById("importFile").value.length == 0)	
-				{
+			function importFile() {
+				if (document.getElementById("importFile").value.length == 0) {
 					alert("<fmt:message key='wizard.import.nofile'/>");
-				}
-				else
-				{
-					if(confirm("<fmt:message key="wizard.import.warn" />"))
-					{
+				} else {
+					if(confirm("<fmt:message key="wizard.import.warn" />")) {
 						customSubmit("importWizard");
 					}
 				}
 			}
-		//-->
 		</script>
-	
-		
-	
 	</lams:head>
 	
 	<body class="stripes" onload="javascript:setUpTripleMenu();">
@@ -455,8 +371,6 @@
 		</h1>
 		
 		<a href="<lams:LAMSURL/>/admin/sysadminstart.do"><fmt:message key="admin.return" /></a>
-	
-		
 
 		<c:if test="${error}">
 			<p class="warning">
@@ -489,7 +403,6 @@
 			</script>
 		</c:if>
 		
-		
 		<html:form action="/laqa11admin" styleId="laqa11AdminForm" method="post" enctype="multipart/form-data">
 			<html:hidden property="serialiseXML" styleId="serialiseXML" value="" />
 			<html:hidden property="deleteCategoriesCSV" styleId="deleteCategoriesCSV" value="" />
@@ -513,6 +426,7 @@
 				<br />
 				<table border="0" cellspacing="10px">
 					<tbody>
+					
 					    <tr>
 					      	<td align="left" valign="top" width="300">
 								<select name="catMenu" onchange="changeCategory()" size="1" style="font-size:10px; width:100%;">
@@ -526,6 +440,7 @@
 					      		<a href='javascript:deleteCategory();' class="button"  ><fmt:message key="wizard.delete" /></a>
 					      	</td>
 					    </tr>
+					    
 					    <tr>
 					      	<td align="left" valign="top" width="300">
 						      	<select name="skillMenu" onchange="changeSkill()" size="1" style="font-size:10px; width:100%;">
@@ -539,6 +454,7 @@
 					      		<a href='javascript:deleteSkill();' class="button"  ><fmt:message key="wizard.delete" /></a>
 					      	</td>
 					    </tr>
+					    
 					    <tr>
 					      	<td align="left" valign="top" width="300">
 					      		<select name="qMenu" size="1" style="font-size:10px; width:100%;">
@@ -552,34 +468,40 @@
 					      		<a href='javascript:deleteQuestion();' class="button"  ><fmt:message key="wizard.delete" /></a>
 					      	</td>
 					    </tr>
+					    
 					</tbody>
 				</table>
 				<br />
-				<a href="javascript:customSubmit('exportWizard')" id="exportButton" class="button"  ><fmt:message key="wizard.export.export" /></a>
+				
+				<a href="javascript:customSubmit('exportWizard')" id="exportButton" class="button"  >
+					<fmt:message key="wizard.export.export" />
+				</a>
 				&nbsp;
-				<a href="javascript:importFile()" class="button"  ><fmt:message key="wizard.import.import" /></a>
+				
+				<a href="javascript:importFile()" class="button"  >
+					<fmt:message key="wizard.import.import" />
+				</a>
+				
 				<html:file property="importFile" styleId="importFile" />
 				<br />
 				<br />
 				<br />
 				<br />
 			</div>
 		
-			<a href="javascript:submitForm('saveContent')" class="button"  ><fmt:message key="label.save" /></a>
-
+			<a href="javascript:submitForm('saveContent')" class="button"  >
+				<fmt:message key="label.save" />
+			</a>
 		
 			<div id="dialogDiv" style="display: none;">
 				<div id="catDialog" class="ui-dialog ui-draggable ui-resizable">
 					<input type="text" id="inputText" width="255" size="90">
 				</div>	
 			</div>
 		</html:form>	
-		</div>
-		<!--closes content-->
+		</div><!--closes content-->
 	
-		<div id="footer">
-		</div>
-		<!--closes footer-->
+		<div id="footer"></div><!--closes footer-->
 	</body>
 
 </head>
\ No newline at end of file