Index: lams_central/src/flash/org/lamsfoundation/lams/learner/ls/Lesson.as
===================================================================
diff -u -r244ec27716e8da930e492c3cc7be65da0433c7fb -r22fd82b7df3f81c7c256c6da07d4d354d4f3d4db
--- lams_central/src/flash/org/lamsfoundation/lams/learner/ls/Lesson.as (.../Lesson.as) (revision 244ec27716e8da930e492c3cc7be65da0433c7fb)
+++ lams_central/src/flash/org/lamsfoundation/lams/learner/ls/Lesson.as (.../Lesson.as) (revision 22fd82b7df3f81c7c256c6da07d4d354d4f3d4db)
@@ -27,6 +27,8 @@
import org.lamsfoundation.lams.common.util.*;
import org.lamsfoundation.lams.common.Progress;
import org.lamsfoundation.lams.common.ui.Cursor;
+import org.lamsfoundation.lams.common.ui.LFMessage;
+import org.lamsfoundation.lams.common.dict.Dictionary;
import org.lamsfoundation.lams.authoring.DesignDataModel;
import mx.managers.*;
@@ -50,7 +52,7 @@
private var _finishedDesign:Boolean = false;
private static var LOAD_CHECK_INTERVAL:Number = 50;
- private static var LOAD_CHECK_TIMEOUT_COUNT:Number = 600;
+ private static var LOAD_CHECK_TIMEOUT_COUNT:Number = 300;
private var _loadCheckCount = 0;
private var _loadCheckIntervalID:Number;
@@ -236,6 +238,8 @@
} else if(_loadCheckCount >= LOAD_CHECK_TIMEOUT_COUNT) {
Debugger.log('Reached timeout waiting for data to load.',Debugger.CRITICAL,'getFlashProgress','Lesson');
clearInterval(_loadCheckIntervalID);
+ var msg:String = Dictionary.getValue('al_timeout');
+ LFMessage.showMessageAlert(msg);
}
}
} else {
Index: lams_central/web/flashxml/learner/en_AU_dictionary.xml
===================================================================
diff -u -r2888d47efcbbfee289259ab5d6b9c633a48250bc -r22fd82b7df3f81c7c256c6da07d4d354d4f3d4db
--- lams_central/web/flashxml/learner/en_AU_dictionary.xml (.../en_AU_dictionary.xml) (revision 2888d47efcbbfee289259ab5d6b9c633a48250bc)
+++ lams_central/web/flashxml/learner/en_AU_dictionary.xml (.../en_AU_dictionary.xml) (revision 22fd82b7df3f81c7c256c6da07d4d354d4f3d4db)
@@ -1 +1 @@
-getDictionary3hd_resume_lblResumeLabel for Resume buttonhd_exit_lblExitLabel for Exit buttonln_export_btnExportLabel for Export buttonsys_error_msg_startA following system error has occurred:Common System error message starting linesys_error_msg_finishYou may need to re-start this browser window to continue. Do you want to save the following information about this error to help fix this problem?Common System error message finish paragraphsys_errorSystem ErrorSystem Error alert window titleal_alertAlertGeneric title for Alert windowal_cancelCancelCancel on alert dialogal_confirmConfirmTo Confirm title for LFErroral_okOKOK on alert dialogal_validation_act_unreachedYou can't open the Activity as you haven't reached it yet.Alert message when clicking on an unreached activity in the progess bar.hd_resume_tooltipJump to your current activitytool tip message for resume buttonhd_exit_tooltipExit the Learner Environment and close the browser windowtool tip message for exit buttonln_export_tooltipExport your contributions to this lessontool tip message for export buttoncompleted_act_tooltipDouble click to review this completed activitytool tip message for completed activity iconcurrent_act_tooltipDouble click to participate in the current activitytool tip message for current activity iconal_doubleclick_todoactivitySorry, you have not reached this activity yetalert message when user double click on the todo activity in the sequence in learner progresssp_view_lblView AllLabel for View All buttonsp_save_lblSaveLabel for Save buttonsp_view_tooltipView all notebook entriestool tip message for view all buttonsp_save_tooltipSave your notebook entrytool tip message for save buttonsp_title_lblTitleLabel for title field of scratchpad (notebook)sp_panel_lblNotebookLabel for panel title of scratchpad (notebook)
\ No newline at end of file
+getDictionary3Label for Resume buttonResumehd_resume_lblLabel for Exit buttonExithd_exit_lblLabel for Export buttonExportln_export_btnCommon System error message starting lineA following system error has occurred:sys_error_msg_startCommon System error message finish paragraphYou may need to re-start this browser window to continue. Do you want to save the following information about this error to help fix this problem?sys_error_msg_finishSystem Error alert window titleSystem Errorsys_errorGeneric title for Alert windowAlertal_alertCancel on alert dialogCancelal_cancelTo Confirm title for LFErrorConfirmal_confirmOK on alert dialogOKal_okAlert message when clicking on an unreached activity in the progess bar.You can't open the Activity as you haven't reached it yet.al_validation_act_unreachedtool tip message for resume buttonJump to your current activityhd_resume_tooltiptool tip message for exit buttonExit the Learner Environment and close the browser windowhd_exit_tooltiptool tip message for export buttonExport your contributions to this lessonln_export_tooltiptool tip message for completed activity iconDouble click to review this completed activitycompleted_act_tooltiptool tip message for current activity iconDouble click to participate in the current activitycurrent_act_tooltipalert message when user double click on the todo activity in the sequence in learner progressSorry, you have not reached this activity yetal_doubleclick_todoactivityLabel for View All buttonView Allsp_view_lblLabel for Save buttonSavesp_save_lbltool tip message for view all buttonView all notebook entriessp_view_tooltiptool tip message for save buttonSave your notebook entrysp_save_tooltipLabel for title field of scratchpad (notebook)Titlesp_title_lblLabel for panel title of scratchpad (notebook)Notebooksp_panel_lblal_timeoutWarning! Timeout has occurred during loading.Alert message for timeout error when loading learning design.
\ No newline at end of file
Index: lams_central/web/flashxml/learner/en_dictionary.xml
===================================================================
diff -u -r2888d47efcbbfee289259ab5d6b9c633a48250bc -r22fd82b7df3f81c7c256c6da07d4d354d4f3d4db
--- lams_central/web/flashxml/learner/en_dictionary.xml (.../en_dictionary.xml) (revision 2888d47efcbbfee289259ab5d6b9c633a48250bc)
+++ lams_central/web/flashxml/learner/en_dictionary.xml (.../en_dictionary.xml) (revision 22fd82b7df3f81c7c256c6da07d4d354d4f3d4db)
@@ -1 +1 @@
-getDictionary3hd_resume_lblResumeLabel for Resume buttonhd_exit_lblExitLabel for Exit buttonln_export_btnExportLabel for Export buttonsys_error_msg_startA following system error has occurred:Common System error message starting linesys_error_msg_finishYou may need to re-start this browser window to continue. Do you want to save the following information about this error to help fix this problem?Common System error message finish paragraphsys_errorSystem ErrorSystem Error alert window titleal_alertAlertGeneric title for Alert windowal_cancelCancelCancel on alert dialogal_confirmConfirmTo Confirm title for LFErroral_okOKOK on alert dialogal_validation_act_unreachedYou can't open the Activity as you haven't reached it yet.Alert message when clicking on an unreached activity in the progess bar.hd_resume_tooltipJump to your current activitytool tip message for resume buttonhd_exit_tooltipExit the Learner Environment and close the browser windowtool tip message for exit buttonln_export_tooltipExport your contributions to this lessontool tip message for export buttoncompleted_act_tooltipDouble click to review this completed activitytool tip message for completed activity iconcurrent_act_tooltipDouble click to participate in the current activitytool tip message for current activity iconal_doubleclick_todoactivitySorry, you have not reached this activity yetalert message when user double click on the todo activity in the sequence in learner progresssp_view_lblView AllLabel for View All buttonsp_save_lblSaveLabel for Save buttonsp_view_tooltipView all notebook entriestool tip message for view all buttonsp_save_tooltipSave your notebook entrytool tip message for save buttonsp_title_lblTitleLabel for title field of scratchpad (notebook)sp_panel_lblNotebookLabel for panel title of scratchpad (notebook)
\ No newline at end of file
+getDictionary3Label for Resume buttonResumehd_resume_lblLabel for Exit buttonExithd_exit_lblLabel for Export buttonExportln_export_btnCommon System error message starting lineA following system error has occurred:sys_error_msg_startCommon System error message finish paragraphYou may need to re-start this browser window to continue. Do you want to save the following information about this error to help fix this problem?sys_error_msg_finishSystem Error alert window titleSystem Errorsys_errorGeneric title for Alert windowAlertal_alertCancel on alert dialogCancelal_cancelTo Confirm title for LFErrorConfirmal_confirmOK on alert dialogOKal_okAlert message when clicking on an unreached activity in the progess bar.You can't open the Activity as you haven't reached it yet.al_validation_act_unreachedtool tip message for resume buttonJump to your current activityhd_resume_tooltiptool tip message for exit buttonExit the Learner Environment and close the browser windowhd_exit_tooltiptool tip message for export buttonExport your contributions to this lessonln_export_tooltiptool tip message for completed activity iconDouble click to review this completed activitycompleted_act_tooltiptool tip message for current activity iconDouble click to participate in the current activitycurrent_act_tooltipalert message when user double click on the todo activity in the sequence in learner progressSorry, you have not reached this activity yetal_doubleclick_todoactivityLabel for View All buttonView Allsp_view_lblLabel for Save buttonSavesp_save_lbltool tip message for view all buttonView all notebook entriessp_view_tooltiptool tip message for save buttonSave your notebook entrysp_save_tooltipLabel for title field of scratchpad (notebook)Titlesp_title_lblLabel for panel title of scratchpad (notebook)Notebooksp_panel_lblal_timeoutWarning! Timeout has occurred during loading.Alert message for timeout error when loading learning design.
\ No newline at end of file
Index: lams_learning/web/lams_learner.swf
===================================================================
diff -u -r244ec27716e8da930e492c3cc7be65da0433c7fb -r22fd82b7df3f81c7c256c6da07d4d354d4f3d4db
Binary files differ