Index: lams_tool_mindmap/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r26ce6de9fba8494203a85a4ce076b6ffea4238ed -r42d5fe8f0e027f1dc279d2583dade23c7898ef0f --- lams_tool_mindmap/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 26ce6de9fba8494203a85a4ce076b6ffea4238ed) +++ lams_tool_mindmap/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 42d5fe8f0e027f1dc279d2583dade23c7898ef0f) @@ -23,9 +23,8 @@ button.upload =Upload label.authoring.basic.title =Title: label.authoring.basic.content =Content: -advanced.reflectOnActivity =Add Notebook at end of Mindmap with the following instructions: +advanced.reflectOnActivity =Add Notebook at the end of Mindmap advanced.lockOnFinished =Lock when finished -advanced.allowRichEditor =Allow rich text editor advanced.multiUserMode =Use multi-user mode instructions.type.online =Online instructions.type.offline =Offline @@ -54,9 +53,10 @@ heading.totalFinishedLearnersInGroup =Number of Finished Learners: message.summary =There is no summary available for this tool. label.view =View +label.multimode =Multi-mode label.notAvailable =Not Available heading.learner =Learner -heading.notebookEntry =Mindmap Entry +heading.mindmapEntry =Mindmap Entry button.cancel =Cancel button.ok =OK button.done =Done @@ -69,6 +69,7 @@ label.created =Created label.lastModified =Last modified label.notebookEntry =Notebook entry +label.notebookInstructions =Notebook instructions label.mindmapEntry =Mindmap error.missingParam =Unable to continue. {0} is missing. error.exceedMaxFileSize =File size exceeded Index: lams_tool_mindmap/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -r26ce6de9fba8494203a85a4ce076b6ffea4238ed -r42d5fe8f0e027f1dc279d2583dade23c7898ef0f --- lams_tool_mindmap/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 26ce6de9fba8494203a85a4ce076b6ffea4238ed) +++ lams_tool_mindmap/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 42d5fe8f0e027f1dc279d2583dade23c7898ef0f) @@ -23,9 +23,8 @@ button.upload =Upload label.authoring.basic.title =Title: label.authoring.basic.content =Content: -advanced.reflectOnActivity =Add Notebook at end of Mindmap with the following instructions: +advanced.reflectOnActivity =Add Notebook at the end of Mindmap advanced.lockOnFinished =Lock when finished -advanced.allowRichEditor =Allow rich text editor advanced.multiUserMode =Use multi-user mode instructions.type.online =Online instructions.type.offline =Offline @@ -54,9 +53,10 @@ heading.totalFinishedLearnersInGroup =Number of Finished Learners: message.summary =There is no summary available for this tool. label.view =View +label.multimode =Multi-mode label.notAvailable =Not Available heading.learner =Learner -heading.notebookEntry =Mindmap Entry +heading.mindmapEntry =Mindmap Entry button.cancel =Cancel button.ok =OK button.done =Done @@ -69,6 +69,7 @@ label.created =Created label.lastModified =Last modified label.notebookEntry =Notebook entry +label.notebookInstructions =Notebook instructions label.mindmapEntry =Mindmap error.missingParam =Unable to continue. {0} is missing. error.exceedMaxFileSize =File size exceeded Index: lams_tool_mindmap/conf/language/lams/ApplicationResources_ru_RU.properties =================================================================== diff -u -r26ce6de9fba8494203a85a4ce076b6ffea4238ed -r42d5fe8f0e027f1dc279d2583dade23c7898ef0f --- lams_tool_mindmap/conf/language/lams/ApplicationResources_ru_RU.properties (.../ApplicationResources_ru_RU.properties) (revision 26ce6de9fba8494203a85a4ce076b6ffea4238ed) +++ lams_tool_mindmap/conf/language/lams/ApplicationResources_ru_RU.properties (.../ApplicationResources_ru_RU.properties) (revision 42d5fe8f0e027f1dc279d2583dade23c7898ef0f) @@ -1,76 +1,78 @@ appName = mindmap -#language code: ru +#language code: ru #locale code: RU # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Wed Nov 19 18:37:12 GMT 2008 #=================== labels for Mindmap =================# error.contentrepository =An error has occurred when saving/deleting instruction file {0}. The files may not be saved correctly. -button.instructions =?????????? +button.instructions =Инструкции instructions.uploadOfflineInstr =Offline Instructions File: instructions.uploadOnlineInstr =Online Instructions File: instructions.offlineInstructions =Offline Instructions: instructions.onlineInstructions =Online Instructions: activity.helptext =Mindmap for making mindmaps error.content.locked =The content has been locked since it is being used by one or more learners. The modification of the content is not allowed. -tool.display.name =Mindmap -tool.description =Mindmap Tool -activity.title =Mindmap -activity.description =Mindmap Tool -pageTitle.authoring =Mindmap Authoring -button.basic =???????? -button.advanced =??????????? -button.upload =????????? -label.authoring.basic.title =????????\: -label.authoring.basic.content =Content: -advanced.reflectOnActivity =Add Notebook at end of Noticeboard with the following instructions: +tool.display.name =Диаграмма связей +tool.description =Инструмент Диаграмма связей +activity.title =Диаграмма связей +activity.description =Инструмент Диаграмма связей +pageTitle.authoring =Редактор Диаграммы связей +button.basic =Основные +button.advanced =Расширенные +button.upload =Upload +label.authoring.basic.title =Заголовок: +label.authoring.basic.content =Содержание: +advanced.reflectOnActivity =Добавить Тетрадь в конец Диаграммы связей advanced.lockOnFinished =Lock when finished advanced.multiUserMode =Use multi-user mode -instructions.type.online =?????? -instructions.type.offline =?????????? -label.filename =??? ????? -label.type =??? -label.attachments =?????????? -link.view =??? -link.download =Download -link.delete =??????? -message.updateSuccess =????????? ????????? +instructions.type.online =Онлайн +instructions.type.offline =Автономные +label.filename =Имя файла +label.type =Тип +label.attachments =Приложения +link.view =Просмотреть +link.download =Загрузить +link.delete =Удалить +message.updateSuccess =Изменения сохранены message.unsavedChanges =Page contains unsaved changes pageTitle.learning =Online Mindmap message.defineLaterSet =Please wait for the teacher to complete the contents of this activity message.runOfflineSet =This activity is not being done on the computer. Please see your instructor for details. pageTitle.monitoring =Mindmap Monitoring button.summary =Summary -button.editActivity =????????????? ??????? -button.statistics =?????????? +button.editActivity =Edit Activity +button.statistics =Statistics titleHeading.summary =Summary -titleHeading.statistics =?????????? -titleHeading.editActivity =????????????? ??????? -titleHeading.exportPortfolio =??????? ????????? -heading.group =?????? {0}\: -heading.totalLearners =?????????? ????????\: -heading.totalLearnersInGroup =????? ?????????? ???????? ? ??????\: -heading.totalFinishedLearnersInGroup =?????????? ??????????? ????????\: +titleHeading.statistics =Statistics +titleHeading.editActivity =Edit Activity +titleHeading.exportPortfolio =Export Portfolio +heading.group =Group {0}: +heading.totalLearners =Number of Learners: +heading.totalLearnersInGroup =Total Number of Learners in Group: +heading.totalFinishedLearnersInGroup =Number of Finished Learners: message.summary =There is no summary available for this tool. -label.view =??????????? -label.notAvailable =?? ???????? -heading.learner =?????? -heading.notebookEntry =Mindmap Entry -button.cancel =?????? +label.view =View +label.multimode =Multi-mode +label.notAvailable =Not Available +heading.learner =Learner +heading.mindmapEntry =Mindmap Entry +button.cancel =Cancel button.ok =OK button.done =Done -button.save =????????? -button.back =????? -button.next =????? +button.save =Save +button.back =Back +button.next =Next button.continue =Continue -label.save =????????? -label.cancel =?????? +label.save =Save +label.cancel =Cancel label.created =Created label.lastModified =Last modified -label.notebookEntry =?????? ??????? +label.notebookEntry =Notebook entry +label.notebookInstructions =Notebook instructions label.mindmapEntry =Mindmap -error.missingParam =?????????? ??????????. ??????????? ???????? {0}. -error.exceedMaxFileSize =?????? ????? ????????? ?????? +error.missingParam =Unable to continue. {0} is missing. +error.exceedMaxFileSize =File size exceeded error.exception.NbApplication =An internal error has occured with the Mindmap Tool. If reporting this error, please report:
{0} error.defineLater =Sorry, the activity is not ready yet. Please wait for the teacher to finishing defining the activity. errors.maxfilesize =The uploaded file has exceeded the maximum file size limit of {0} bytes @@ -87,26 +89,26 @@ label.authoring.basic.instructions =Instructions: label.on =On label.off =Off -monitor.summary.th.advancedSettings =??????????? ????????? +monitor.summary.th.advancedSettings =Advanced Settings label.authoring.up =Up label.authoring.down =Down -label.authoring.edit =????????????? +label.authoring.edit =Edit message.contentInUseSet =Modification of content is not allowed since one or more learners has attempted the activity. message.alertContentEdit =Warning: One of more learners have accessed this activity. Changing this content will result in learners getting different information. -message.enableJavaScript =Enable Javascript for Mindmap to load! +message.enableJavaScript =Включите поддержку Javascript для загрузки # Outputs -output.learner.number.of.nodes =Number of nodes +output.learner.number.of.nodes =Количество узлов # Mindmap labels -node.root.defaultName =???????? ???? -node.child1.defaultName =???????? ????1 -node.child2.defaultName =???????? ????2 -node.instructor.label =????????????? -node.learner.label =?????? +node.root.defaultName =Корневой узел +node.child1.defaultName =Дочерний узел1 +node.child2.defaultName =Дочерний узел2 +node.instructor.label =Преподаватель +node.learner.label =Ученик # Lables for Flash -local.title =????? -local.delete_question =?? ???????, ??? ?????? ??????? ????? -local.yes =?? -local.no =??? -local.node_creator =????? +local.title =Текст +local.delete_question =Вы уверены, что хотите удалить? +local.yes =Да +local.no =Нет +local.node_creator =Автор # Ped Planner -label.planner.editing.advice=\u0421\u043E\u0432\u0435\u0442 \u043F\u043E \u0440\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044E \ No newline at end of file +label.planner.editing.advice=Совет по редактированию \ No newline at end of file Index: lams_tool_mindmap/web/WEB-INF/struts/.struts-config.xml.strutsdia =================================================================== diff -u -r26ce6de9fba8494203a85a4ce076b6ffea4238ed -r42d5fe8f0e027f1dc279d2583dade23c7898ef0f --- lams_tool_mindmap/web/WEB-INF/struts/.struts-config.xml.strutsdia (.../.struts-config.xml.strutsdia) (revision 26ce6de9fba8494203a85a4ce076b6ffea4238ed) +++ lams_tool_mindmap/web/WEB-INF/struts/.struts-config.xml.strutsdia (.../.struts-config.xml.strutsdia) (revision 42d5fe8f0e027f1dc279d2583dade23c7898ef0f) @@ -24,13 +24,6 @@ PATH="/pages/authoring/pedagogicalPlannerForm.jsp" TARGET="page4" TITLE="success" TYPE="forward" model-entity="StrutsProcessItemOutput"/> - - - - - - - - - - - - - - - - - - - + @@ -96,21 +57,22 @@ SHAPE="272,434,0,0" SUBTYPE="tile" TITLE="runOffline" TYPE="page" model-entity="StrutsProcessItem"/> - + SUBTYPE="jsp" TITLE="pedagogicalPlannerForm.jsp" TYPE="page" model-entity="StrutsProcessItem"> + + - + Index: lams_tool_mindmap/web/WEB-INF/struts/struts-config.xml =================================================================== diff -u -r26ce6de9fba8494203a85a4ce076b6ffea4238ed -r42d5fe8f0e027f1dc279d2583dade23c7898ef0f --- lams_tool_mindmap/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision 26ce6de9fba8494203a85a4ce076b6ffea4238ed) +++ lams_tool_mindmap/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision 42d5fe8f0e027f1dc279d2583dade23c7898ef0f) @@ -64,6 +64,11 @@ path="tiles:/monitoring/mindmap_display" redirect="false" /> + + + + + + + Index: lams_tool_mindmap/web/includes/javascript/jquery.timer.js =================================================================== diff -u --- lams_tool_mindmap/web/includes/javascript/jquery.timer.js (revision 0) +++ lams_tool_mindmap/web/includes/javascript/jquery.timer.js (revision 42d5fe8f0e027f1dc279d2583dade23c7898ef0f) @@ -0,0 +1,75 @@ +/* + * + * jQuery Timer plugin v0.1 + * Matt Schmidt [http://www.mattptr.net] + * + * Licensed under the BSD License: + * http://mattptr.net/license/license.txt + * + */ + + jQuery.timer = function (interval, callback) + { + /** + * + * timer() provides a cleaner way to handle intervals + * + * @usage + * $.timer(interval, callback); + * + * + * @example + * $.timer(1000, function (timer) { + * alert("hello"); + * timer.stop(); + * }); + * @desc Show an alert box after 1 second and stop + * + * @example + * var second = false; + * $.timer(1000, function (timer) { + * if (!second) { + * alert('First time!'); + * second = true; + * timer.reset(3000); + * } + * else { + * alert('Second time'); + * timer.stop(); + * } + * }); + * @desc Show an alert box after 1 second and show another after 3 seconds + * + * + */ + + var interval = interval || 100; + + if (!callback) + return false; + + _timer = function (interval, callback) { + this.stop = function () { + clearInterval(self.id); + }; + + this.internalCallback = function () { + callback(self); + }; + + this.reset = function (val) { + if (self.id) + clearInterval(self.id); + + var val = val || 100; + this.id = setInterval(this.internalCallback, val); + }; + + this.interval = interval; + this.id = setInterval(this.internalCallback, this.interval); + + var self = this; + }; + + return new _timer(interval, callback); + }; \ No newline at end of file Index: lams_tool_mindmap/web/includes/javascript/mindmap.resize.js =================================================================== diff -u --- lams_tool_mindmap/web/includes/javascript/mindmap.resize.js (revision 0) +++ lams_tool_mindmap/web/includes/javascript/mindmap.resize.js (revision 42d5fe8f0e027f1dc279d2583dade23c7898ef0f) @@ -0,0 +1,29 @@ +/* + * Resizing functions for Mindmap Tool + */ + +function getWindowSize(dim) { + var myWidth = 0, myHeight = 0; + if (typeof (window.innerWidth) == 'number') { + // Non-IE + myWidth = window.innerWidth; + myHeight = window.innerHeight; + } else if (document.documentElement + && (document.documentElement.clientWidth || document.documentElement.clientHeight)) { + // IE 6+ in 'standards compliant mode' + myWidth = document.documentElement.clientWidth; + myHeight = document.documentElement.clientHeight; + } else if (document.body + && (document.body.clientWidth || document.body.clientHeight)) { + // IE 4 compatible + myWidth = document.body.clientWidth; + myHeight = document.body.clientHeight; + } + // window.alert( 'Width = ' + myWidth ); + // window.alert( 'Height = ' + myHeight ); + + if (dim == "height") + return myHeight; + else + return myWidth; +} \ No newline at end of file Index: lams_tool_mindmap/web/pages/authoring/authoring.jsp =================================================================== diff -u -r26ce6de9fba8494203a85a4ce076b6ffea4238ed -r42d5fe8f0e027f1dc279d2583dade23c7898ef0f --- lams_tool_mindmap/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision 26ce6de9fba8494203a85a4ce076b6ffea4238ed) +++ lams_tool_mindmap/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision 42d5fe8f0e027f1dc279d2583dade23c7898ef0f) @@ -2,7 +2,9 @@ <%@ page import="org.lamsfoundation.lams.tool.mindmap.util.MindmapConstants"%> - + + + @@ -67,7 +73,6 @@ -
Index: lams_tool_mindmap/web/pages/monitoring/editActivity.jsp =================================================================== diff -u -r26ce6de9fba8494203a85a4ce076b6ffea4238ed -r42d5fe8f0e027f1dc279d2583dade23c7898ef0f --- lams_tool_mindmap/web/pages/monitoring/editActivity.jsp (.../editActivity.jsp) (revision 26ce6de9fba8494203a85a4ce076b6ffea4238ed) +++ lams_tool_mindmap/web/pages/monitoring/editActivity.jsp (.../editActivity.jsp) (revision 42d5fe8f0e027f1dc279d2583dade23c7898ef0f) @@ -35,9 +35,12 @@ - - - + + + + + +

Index: lams_tool_mindmap/web/pages/monitoring/instructions.jsp =================================================================== diff -u -r26ce6de9fba8494203a85a4ce076b6ffea4238ed -r42d5fe8f0e027f1dc279d2583dade23c7898ef0f --- lams_tool_mindmap/web/pages/monitoring/instructions.jsp (.../instructions.jsp) (revision 26ce6de9fba8494203a85a4ce076b6ffea4238ed) +++ lams_tool_mindmap/web/pages/monitoring/instructions.jsp (.../instructions.jsp) (revision 42d5fe8f0e027f1dc279d2583dade23c7898ef0f) @@ -19,7 +19,7 @@ - + Index: lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp =================================================================== diff -u -r26ce6de9fba8494203a85a4ce076b6ffea4238ed -r42d5fe8f0e027f1dc279d2583dade23c7898ef0f --- lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp (.../mindmapDisplay.jsp) (revision 26ce6de9fba8494203a85a4ce076b6ffea4238ed) +++ lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp (.../mindmapDisplay.jsp) (revision 42d5fe8f0e027f1dc279d2583dade23c7898ef0f) @@ -1,21 +1,28 @@ <%@ include file="/common/taglibs.jsp"%> + + - - - - - + + + @@ -73,10 +84,17 @@ button.back + + + + + + + button.save + + + - - button.save - Index: lams_tool_mindmap/web/pages/monitoring/reflect.jsp =================================================================== diff -u --- lams_tool_mindmap/web/pages/monitoring/reflect.jsp (revision 0) +++ lams_tool_mindmap/web/pages/monitoring/reflect.jsp (revision 42d5fe8f0e027f1dc279d2583dade23c7898ef0f) @@ -0,0 +1,17 @@ +<%@ include file="/common/taglibs.jsp"%> + +

+ +

+ +

+ ${mindmapUser} +

+ + + +
+ + button.back + +
Index: lams_tool_mindmap/web/pages/monitoring/summary.jsp =================================================================== diff -u -r26ce6de9fba8494203a85a4ce076b6ffea4238ed -r42d5fe8f0e027f1dc279d2583dade23c7898ef0f --- lams_tool_mindmap/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 26ce6de9fba8494203a85a4ce076b6ffea4238ed) +++ lams_tool_mindmap/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 42d5fe8f0e027f1dc279d2583dade23c7898ef0f) @@ -60,6 +60,33 @@ + + + + + + + + + + + +
+ + + + + + + + + + +
+ + + ${dto.reflectInstructions} +
@@ -89,29 +116,87 @@ - + + + + - - - - ${user.firstName} ${user.lastName} - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${user.firstName} ${user.lastName} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - -