Index: lams_central/web/lams_authoring.swf =================================================================== diff -u -re1f36676f5f48096f943ba518c8699e3ec4b8e12 -r15c52eea1969487084a796934d831c4d00df17db Binary files differ Index: lams_central/web/lams_authoring_library.swf =================================================================== diff -u -re1f36676f5f48096f943ba518c8699e3ec4b8e12 -r15c52eea1969487084a796934d831c4d00df17db Binary files differ Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as =================================================================== diff -u -r058ef2c126172a3ee7eeed3b1883a4b65dab9d8e -r15c52eea1969487084a796934d831c4d00df17db --- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as (.../Monitor.as) (revision 058ef2c126172a3ee7eeed3b1883a4b65dab9d8e) +++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as (.../Monitor.as) (revision 15c52eea1969487084a796934d831c4d00df17db) @@ -490,35 +490,38 @@ public function getHelp(ca:CanvasActivity) { if(ca.activity.helpURL != undefined || ca.activity.helpURL != null) { - Debugger.log("Opening help page with locale " + _root.lang + _root.country + ": " + ca.activity.helpURL,Debugger.GEN,'getHelp','Monitor'); - - var locale:String = _root.lang + _root.country; - getURL(ca.activity.helpURL + app.module + "#" + ca.activity.toolSignature + app.module + "-" + locale, '_blank'); + Debugger.log("Opening help page: " + ca.activity.helpURL + app.module, Debugger.GEN, 'getHelp', 'Monitor'); + app.getHelpURL(Proxy.create(this, openHelp, ca)); } else { if (ca.activity.activityTypeID == Activity.GROUPING_ACTIVITY_TYPE){ - var callback:Function = Proxy.create(this, openGroupHelp); - app.getHelpURL(callback) + var callback:Function = Proxy.create(this, openSystemToolHelp, Application.FLASH_TOOLSIGNATURE_GROUP); + app.getHelpURL(callback); }else if (ca.activity.activityTypeID == Activity.SYNCH_GATE_ACTIVITY_TYPE || ca.activity.activityTypeID == Activity.SCHEDULE_GATE_ACTIVITY_TYPE || ca.activity.activityTypeID == Activity.PERMISSION_GATE_ACTIVITY_TYPE){ - var callback:Function = Proxy.create(this, openGateHelp); - app.getHelpURL(callback) - }else { + var callback:Function = Proxy.create(this, openSystemToolHelp, Application.FLASH_TOOLSIGNATURE_GATE); + app.getHelpURL(callback); + } else if(ca.activity.isBranchingActivity()) { + var callback:Function = Proxy.create(this, openSystemToolHelp, Application.FLASH_TOOLSIGNATURE_BRANCHING); + app.getHelpURL(callback); + } else { LFMessage.showMessageAlert(Dictionary.getValue('cv_activity_helpURL_undefined', [ca.activity.toolDisplayName])); } } } - private function openGroupHelp(url:String){ - var actToolSignature:String = Application.FLASH_TOOLSIGNATURE_GROUP - var locale:String = _root.lang + _root.country; - var target:String = actToolSignature + app.module + '#' + actToolSignature + app.module + '-' + locale; - getURL(url + target, '_blank'); + private function openHelp(url:String, ca:CanvasActivity){ + var newURL:String = app.addLocaleToURL(url) + ca.activity.toolSignature; + if(newURL != ca.activity.helpURL) + ApplicationParent.extCall("openURL", newURL + app.module); + else + ApplicationParent.extCall("openURL", ca.activity.helpURL + app.module); + } - private function openGateHelp(url:String){ - var actToolSignature:String = Application.FLASH_TOOLSIGNATURE_GATE - var locale:String = _root.lang + _root.country; - var target:String = actToolSignature + app.module + '#' + actToolSignature + app.module + '-' + locale; - getURL(url + target, '_blank'); + private function openSystemToolHelp(url:String, toolSignature:String){ + var target:String = toolSignature + app.module; + url = app.addLocaleToURL(url); + + ApplicationParent.extCall("openURL", url + target); } public function setupEditOnFly(learningDesignID:Number) { Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ApplicationParent.as =================================================================== diff -u -r8cb7d49cc81b0081b68ab4ea5d9b3a45c4b1f679 -r15c52eea1969487084a796934d831c4d00df17db --- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ApplicationParent.as (.../ApplicationParent.as) (revision 8cb7d49cc81b0081b68ab4ea5d9b3a45c4b1f679) +++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ApplicationParent.as (.../ApplicationParent.as) (revision 15c52eea1969487084a796934d831c4d00df17db) @@ -189,7 +189,7 @@ * @param url generic help url */ public function openHelp(url:String) { - ApplicationParent.extCall("openURL", url + this.module); + ApplicationParent.extCall("openURL", addLocaleToURL(url) + this.module); } /** Index: lams_monitoring/web/lams_monitoring.swf =================================================================== diff -u -r1420c184338e25fd978a3423d4f2ff25eae70ad3 -r15c52eea1969487084a796934d831c4d00df17db Binary files differ Index: lams_monitoring/web/lams_monitoring_library.swf =================================================================== diff -u -r1420c184338e25fd978a3423d4f2ff25eae70ad3 -r15c52eea1969487084a796934d831c4d00df17db Binary files differ