Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as =================================================================== diff -u -r20ddeadc87dd94774ba0ea55747cd4ef6b6c3c6f -r5f321974dd9f3fe1b2e5efec0bbdd2f4a7e2a938 --- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as (.../Canvas.as) (revision 20ddeadc87dd94774ba0ea55747cd4ef6b6c3c6f) +++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as (.../Canvas.as) (revision 5f321974dd9f3fe1b2e5efec0bbdd2f4a7e2a938) @@ -1170,14 +1170,35 @@ 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','Canvas'); - var locale:String = _root.lang + _root.country; getURL(ca.activity.helpURL + app.module + "#" + ca.activity.toolSignature + app.module + "-" + locale, '_blank'); } else { - LFMessage.showMessageAlert(Dictionary.getValue('cv_activity_helpURL_undefined', [ca.activity.toolDisplayName])); + if (ca.activity.activityTypeID == Activity.GROUPING_ACTIVITY_TYPE){ + var callback:Function = Proxy.create(this, openGroupHelp); + 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 { + 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 = app.module +actToolSignature+ '#' + app.module +actToolSignature+ '-' + locale; + getURL(url + target, '_blank'); + } + + private function openGateHelp(url:String){ + var actToolSignature:String = Application.FLASH_TOOLSIGNATURE_GATE + var locale:String = _root.lang + _root.country; + var target:String = app.module +actToolSignature+ '#' + app.module +actToolSignature+ '-' + locale; + getURL(url + target, '_blank'); + } + public function get toolActivityWidth():Number{ return toolActWidth; } Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as =================================================================== diff -u -rba2f2574655874f3403c980465318dd35d905ada -r5f321974dd9f3fe1b2e5efec0bbdd2f4a7e2a938 --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as (.../Monitor.as) (revision ba2f2574655874f3403c980465318dd35d905ada) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as (.../Monitor.as) (revision 5f321974dd9f3fe1b2e5efec0bbdd2f4a7e2a938) @@ -26,6 +26,7 @@ import org.lamsfoundation.lams.monitoring.mv.*; import org.lamsfoundation.lams.monitoring.mv.tabviews.*; import org.lamsfoundation.lams.authoring.DesignDataModel; +import org.lamsfoundation.lams.authoring.Activity; import org.lamsfoundation.lams.authoring.cv.CanvasActivity; import org.lamsfoundation.lams.common.ui.*; import org.lamsfoundation.lams.common.util.*; @@ -403,9 +404,31 @@ var locale:String = _root.lang + _root.country; getURL(ca.activity.helpURL + app.module + "#" + ca.activity.toolSignature + app.module + "-" + locale, '_blank'); } else { - LFMessage.showMessageAlert(Dictionary.getValue('cv_activity_helpURL_undefined', [ca.activity.toolDisplayName])); + if (ca.activity.activityTypeID == Activity.GROUPING_ACTIVITY_TYPE){ + var callback:Function = Proxy.create(this, openGroupHelp); + 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 { + 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 = app.module +actToolSignature+ '#' + app.module +actToolSignature+ '-' + locale; + getURL(url + target, '_blank'); + } + + private function openGateHelp(url:String){ + var actToolSignature:String = Application.FLASH_TOOLSIGNATURE_GATE + var locale:String = _root.lang + _root.country; + var target:String = app.module +actToolSignature+ '#' + app.module +actToolSignature+ '-' + locale; + getURL(url + target, '_blank'); + } /** *