Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as,v
diff -u -r1.24 -r1.25
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	5 Feb 2008 05:44:32 -0000	1.24
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	7 Feb 2008 04:56:37 -0000	1.25
@@ -874,37 +874,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','Canvas');
-			var locale:String = _root.lang + _root.country;
+			Debugger.log("Opening help page with locale " + _root.lang + ": " + ca.activity.helpURL, Debugger.GEN, 'getHelp', 'Canvas');
 			
-			ApplicationParent.extCall("openURL", ca.activity.helpURL + app.module + "#" + ca.activity.toolSignature + app.module + "-" + locale);
+			app.getHelpURL(Proxy.create(this, openHelp, ca));
 		
 		} else {
 			if (ca.activity.activityTypeID == Activity.GROUPING_ACTIVITY_TYPE){
-				var callback:Function = Proxy.create(this, openGroupHelp);
+				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 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, 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;
+	private function openHelp(url:String, ca:CanvasActivity){
+		var newURL:String = app.addLocaleToURL(url) + ca.activity.toolSignature;
+		if(newURL != ca.activity.helpURL) ca.activity.helpURL = newURL;
 		
-		ApplicationParent.extCall("openURL", url + target);
+		ApplicationParent.extCall("openURL", newURL + 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;
-		ApplicationParent.extCall("openURL", url + target);
+	private function openSystemToolHelp(url:String, toolSignature:String){
+		var target:String = toolSignature + app.module;
+		var newURL:String = app.addLocaleToURL(url);
+		
+		ApplicationParent.extCall("openURL", newURL + target);
 	}
 	
 	public function get toolActivityWidth():Number{
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ApplicationParent.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/ApplicationParent.as,v
diff -u -r1.9 -r1.10
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ApplicationParent.as	24 Jan 2008 04:05:59 -0000	1.9
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ApplicationParent.as	7 Feb 2008 04:56:38 -0000	1.10
@@ -51,6 +51,7 @@
 	public static var SERIAL_NO = "0000-0000-0000-0001-AAAA";
 	public static var FLASH_TOOLSIGNATURE_GATE:String = "lagat11";
 	public static var FLASH_TOOLSIGNATURE_GROUP:String = "lagrp11";
+	public static var FLASH_TOOLSIGNATURE_BRANCHING:String = "labranch21";
 	
 	public static var NORMAL_MODE:String = "author";		// Normal Operation Mode
 	public static var EDIT_MODE:String = "editonfly";		// Edit-On-The-Fly Mode
@@ -152,17 +153,33 @@
 		
     }
 	
+	public function addLocaleToURL(url:String):String {
+		var locale:String = (_root.lang == "en") ? "" : _root.lang;
+		var newURL:String;
+		Debugger.log("ends with /: " + url.substr(url.length-1, url.length) == "/", Debugger.CRITICAL, "addLocaleToURL", "ApplicationPArent");
+		Debugger.log("str: " +url.substr(url.length-1, url.length), Debugger.CRITICAL, "addLocaleToURL", "ApplicationPArent");
+		Debugger.log("str 2: " + url.substr(0, url.length-1), Debugger.CRITICAL, "addLocaleToURL", "ApplicationPArent");
+		if(url.substr(url.length-1, url.length) == "/") {
+			newURL = url.substr(0, url.length-1) + locale + "/";
+		} else {
+			newURL = url + locale + "/";
+		}
+		
+		return newURL;
+	}
+	
 	/**
 	 * Retrieve the help url from config.
 	 * @param callback (optional) 
 	 */
 	public function getHelpURL(callback:Function) {
 		var _callback:Function = callback;
 		if(callback == null || callback == undefined) {
-			_callback = Proxy.create(this,openHelp);	// default callback
-		}else {
+			_callback = Proxy.create(this, openHelp);	// default callback
+		} else {
 			Debugger.log('called from Monitor :',Debugger.CRITICAL,'getHelpURL','ApplicationParent');
 		}
+		
 		Application.getInstance().getComms().getRequest('authoring/author.do?method=getHelpURL',_callback, false);
 		
 	}
@@ -172,10 +189,7 @@
 	 * @param url generic help url
 	 */
 	public function openHelp(url:String) {
-		var locale:String = _root.lang + _root.country;
-		var target:String = this.module + '#' + this.module + '-' + locale;
-		
-		ApplicationParent.extCall("openURL", url + target);
+		ApplicationParent.extCall("openURL", url + this.module);
 	}
 	
 	 /**