From: <se...@us...> - 2008-05-10 20:48:33
|
Revision: 126 http://acmcontester.svn.sourceforge.net/acmcontester/?rev=126&view=rev Author: sem62 Date: 2008-05-10 13:48:29 -0700 (Sat, 10 May 2008) Log Message: ----------- * configured spaw2 to using resource directory in course. * fixed templates * added code for updating summary pages after removing items Modified Paths: -------------- WebEditor/resources/HTMLedit.php WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Chapter/ChapterModel.java WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ResourcedItemModel.java WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionModel.java WebEditor/template/LectureModel.conf WebEditor/template/SimpleQuestionModel.conf Added Paths: ----------- WebEditor/template/resources/ Modified: WebEditor/resources/HTMLedit.php =================================================================== --- WebEditor/resources/HTMLedit.php 2008-05-10 17:33:34 UTC (rev 125) +++ WebEditor/resources/HTMLedit.php 2008-05-10 20:48:29 UTC (rev 126) @@ -10,7 +10,7 @@ close(); return false; } - + function closing(){ if (!saved){ if (confirm('Course not saved. Do you want to save it now?') == true){ @@ -27,10 +27,11 @@ <body onUnload="closing();"> <form name='editFrm' onSubmit='javascript:save();'> <? -include("spaw2/spaw.inc.php"); +include("spaw2/spaw.inc.php"); -$spaw = new SpawEditor('spaw_edit_field', "123"); -$spaw->show(); +$spaw = new SpawEditor('spaw_edit_field', ""); + +$spaw->show(); ?> <input type='submit' value='save' onClick='javascript:save();'> Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Chapter/ChapterModel.java =================================================================== --- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Chapter/ChapterModel.java 2008-05-10 17:33:34 UTC (rev 125) +++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/Chapter/ChapterModel.java 2008-05-10 20:48:29 UTC (rev 126) @@ -2,6 +2,7 @@ import edu.lnu.FireFly.FFManifest.TreeItem; import edu.lnu.FireFly.FFManifest.item.Item; +import edu.lnu.FireFly.WebEditor.Data.SummaryPageManager; import edu.lnu.FireFly.WebEditor.GUI.TreeDataModel; import edu.lnu.FireFly.WebEditor.GUI.Dialogs.ChapterPropertiestsDlg; import edu.lnu.FireFly.WebEditor.ItemModels.ItemData; @@ -124,6 +125,7 @@ aChapter.getParent().removeChild(aChapter); WebEditorServiceClient.getInstance().deleteFile(getConfFileName(aChapter)); + SummaryPageManager.getInstance().updateSummaryPages(); } /** Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ResourcedItemModel.java =================================================================== --- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ResourcedItemModel.java 2008-05-10 17:33:34 UTC (rev 125) +++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/ResourcedItemModel.java 2008-05-10 20:48:29 UTC (rev 126) @@ -97,6 +97,8 @@ WebEditorServiceClient.getInstance().deleteFile(getConfFileName(anItem)); manifest.resources.deleteResource(identifier); + + SummaryPageManager.getInstance().updateSummaryPages(); } } Modified: WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionModel.java =================================================================== --- WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionModel.java 2008-05-10 17:33:34 UTC (rev 125) +++ WebEditor/src/edu/lnu/FireFly/WebEditor/ItemModels/SimpleQuestion/SimpleQuestionModel.java 2008-05-10 20:48:29 UTC (rev 126) @@ -78,12 +78,6 @@ } @Override - public void remove(TreeItem item) { - TreeDataModel.getInstance().treeNodesDeleted(item); - item.getParent().removeChild(item); - } - - @Override public void rename(TreeItem item, String newTitle) { ((Item) item).title = newTitle; TreeDataModel.getInstance().treeNodesChanged(item); Modified: WebEditor/template/LectureModel.conf =================================================================== --- WebEditor/template/LectureModel.conf 2008-05-10 17:33:34 UTC (rev 125) +++ WebEditor/template/LectureModel.conf 2008-05-10 20:48:29 UTC (rev 126) @@ -1,5 +1,2 @@ -<?xml version = "1.0" ?> -<LectureModel> - <caption>New lecture</caption> - <content>New content.</content> -</LectureModel> +<?xml version="1.0" encoding="UTF-8"?> +<LectureData><caption>New lecture</caption><content>New content.</content><ShowOnSummaryPage>false</ShowOnSummaryPage></LectureData> \ No newline at end of file Modified: WebEditor/template/SimpleQuestionModel.conf =================================================================== --- WebEditor/template/SimpleQuestionModel.conf 2008-05-10 17:33:34 UTC (rev 125) +++ WebEditor/template/SimpleQuestionModel.conf 2008-05-10 20:48:29 UTC (rev 126) @@ -1,9 +1,10 @@ -<?xml version = "1.0" ?> -<SimpleQuestionModel> - <caption>New caption</caption> - <question>Answer "Yes" to question, please.</question> - <answers singleVariant="false"> - <answer point="0">Yes</answer> - <answer point="1">No</answer> - </answers> -</SimpleQuestionModel> +<?xml version="1.0" encoding="UTF-8"?> +<SimpleQuestion> +<caption>New caption</caption> +<question>Answer "Yes" to question, please.</question> +<ShowOnSummaryPage>true</ShowOnSummaryPage> +<answers singleVariant="false"> +<answer point="0.0">Yes</answer> +<answer point="1.0">No</answer> +</answers> +</SimpleQuestion> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |