Index: lams_common/src/flash/org/lamsfoundation/lams/common/ui/LFMenuBar.as =================================================================== diff -u -r735adeb5d2ea7849b86d4991480630c4613fadec -r366c29a1b9ba5d912ae9aa476d04990e4b4427ea --- lams_common/src/flash/org/lamsfoundation/lams/common/ui/LFMenuBar.as (.../LFMenuBar.as) (revision 735adeb5d2ea7849b86d4991480630c4613fadec) +++ lams_common/src/flash/org/lamsfoundation/lams/common/ui/LFMenuBar.as (.../LFMenuBar.as) (revision 366c29a1b9ba5d912ae9aa476d04990e4b4427ea) @@ -25,7 +25,8 @@ import org.lamsfoundation.lams.common.util.* //import org.lamsfoundation.lams.authoring.* import org.lamsfoundation.lams.common.style.* -import org.lamsfoundation.lams.common.dict.* +import org.lamsfoundation.lams.common.dict.* +import org.lamsfoundation.lams.common.ws.Workspace import mx.controls.* import mx.utils.* @@ -159,14 +160,14 @@ =================*/ help_menu = _mb.addMenu(Dictionary.getValue('mnu_help')); help_menu.addMenuItem({label:Dictionary.getValue('mnu_help_abt'), instanceName:"aboutItem"}); - //help_menu.addMenuItem({label:_root.build, instanceName:"versionItem"}); //set up listeners // register the listeners with the separate menus file_menu.addEventListener("change", Delegate.create(this,fileMenuClicked)); edit_menu.addEventListener("change", Delegate.create(this,editMenuClicked)); tools_menu.addEventListener("change", Delegate.create(this,toolsMenuClicked)); + help_menu.addEventListener("change", Delegate.create(this, helpMenuClicked)); //Now that menu items have been set up make the menu bar visible this._visible = true; @@ -270,7 +271,7 @@ case eventObj.menu.saveItemAs: //TODO: go through workspace to save design in location Debugger.log('Clicked File > Save As',Debugger.GEN,'fileMenuClicked','LFMenuBar'); - org.lamsfoundation.lams.authoring.Application(app).getCanvas().saveDesignToServerAs(); + org.lamsfoundation.lams.authoring.Application(app).getCanvas().saveDesignToServerAs(Workspace.MODE_SAVEAS); break; case eventObj.menu.importItem: Debugger.log('Clicked File > Import',Debugger.GEN,'fileMenuClicked','LFMenuBar'); @@ -387,6 +388,7 @@ case eventObj.menu.helpItem : break; case eventObj.menu.aboutItem : + LFMessage.showMessageAlert("build version: " + _root.build); break; } } Index: lams_common/src/flash/org/lamsfoundation/lams/common/ws/Workspace.as =================================================================== diff -u -r735adeb5d2ea7849b86d4991480630c4613fadec -r366c29a1b9ba5d912ae9aa476d04990e4b4427ea --- lams_common/src/flash/org/lamsfoundation/lams/common/ws/Workspace.as (.../Workspace.as) (revision 735adeb5d2ea7849b86d4991480630c4613fadec) +++ lams_common/src/flash/org/lamsfoundation/lams/common/ws/Workspace.as (.../Workspace.as) (revision 366c29a1b9ba5d912ae9aa476d04990e4b4427ea) @@ -33,6 +33,13 @@ * @author DI */ class org.lamsfoundation.lams.common.ws.Workspace { + + // static variables + public static var MODE_SAVE:String = "SAVE"; + public static var MODE_SAVEAS:String = "SAVEAS"; + public static var MODE_OPEN:String = "OPEN"; + public static var MODE_READONLY:String = "READONLY"; + //Model private var workspaceModel:WorkspaceModel; //View @@ -285,9 +292,9 @@ * @param onOkCallback The function to call when the user clicks OK. * @return */ - public function setDesignProperties(tabToSelect:String,onOKCallback):Void{ + public function setDesignProperties(tabToSelect:String, mode:String, onOKCallback):Void{ _onOKCallBack = onOKCallback; - workspaceModel.currentMode = "SAVEAS"; + workspaceModel.currentMode = mode; workspaceModel.userSetDesignProperties(tabToSelect,onOKCallback); } Index: lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as =================================================================== diff -u -r735adeb5d2ea7849b86d4991480630c4613fadec -r366c29a1b9ba5d912ae9aa476d04990e4b4427ea --- lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as (.../WorkspaceDialog.as) (revision 735adeb5d2ea7849b86d4991480630c4613fadec) +++ lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as (.../WorkspaceDialog.as) (revision 366c29a1b9ba5d912ae9aa476d04990e4b4427ea) @@ -406,7 +406,7 @@ resourceTitle_txi.text = ""; - if(wm.currentMode != 'SAVEAS'){ + if(wm.currentMode != Workspace.MODE_SAVEAS || wm.currentMode != Workspace.MODE_SAVE){ resourceDesc_txa.text = ""; license_txa.text = ""; licenseID_cmb.selectedIndex = 0; @@ -752,7 +752,7 @@ var _filename:String = cnode.attributes.data.name; var _filetype:String = cnode.attributes.data.resourceType; if(_filename == filename && _filetype == _workspaceModel.RT_LD){ - if(_workspaceModel.currentMode=='OPEN'){ + if(_workspaceModel.currentMode == Workspace.MODE_OPEN){ treeview.selectedNode = null; _resultDTO.file = cnode; doWorkspaceDispatch(true); @@ -765,7 +765,7 @@ } while(cnode != null); - if(_workspaceModel.currentMode == 'SAVE' || _workspaceModel.currentMode == 'SAVEAS'){ + if(_workspaceModel.currentMode == Workspace.MODE_SAVE || _workspaceModel.currentMode == Workspace.MODE_SAVEAS){ doWorkspaceDispatch(false); } return false; @@ -778,7 +778,7 @@ var callback:Function = Proxy.create(this,receivedFolderContents); _workspaceModel.getWorkspace().requestFolderContents(snode.attributes.data.resourceID, callback); - if(_workspaceModel.currentMode == 'SAVE' || _workspaceModel.currentMode == 'SAVEAS'){ + if(_workspaceModel.currentMode == Workspace.MODE_SAVE || _workspaceModel.currentMode == Workspace.MODE_SAVEAS){ return false; } else { return true; @@ -791,7 +791,7 @@ _workspaceModel.setFolderContents(dto, false); if(_workspaceModel.getWorkspaceResource('Folder_'+dto.workspaceFolderID)!=null){ - if(_workspaceModel.currentMode == 'SAVE' || _workspaceModel.currentMode == 'SAVEAS'){ + if(_workspaceModel.currentMode == Workspace.MODE_SAVE || _workspaceModel.currentMode == Workspace.MODE_SAVEAS){ if(searchForFile(_workspaceModel.getWorkspaceResource('Folder_'+dto.workspaceFolderID), _resultDTO.resourceName)){ //run a alert dialogue as user is using the same name as an existing design! LFMessage.showMessageAlert(Dictionary.getValue('ws_chk_overwrite_existing', [_resultDTO.resourceName]), null); Index: lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceView.as =================================================================== diff -u -r735adeb5d2ea7849b86d4991480630c4613fadec -r366c29a1b9ba5d912ae9aa476d04990e4b4427ea --- lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceView.as (.../WorkspaceView.as) (revision 735adeb5d2ea7849b86d4991480630c4613fadec) +++ lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceView.as (.../WorkspaceView.as) (revision 366c29a1b9ba5d912ae9aa476d04990e4b4427ea) @@ -91,7 +91,7 @@ var mode:String = m.currentMode trace('mode returned: ' + mode); var classRoot:MovieClip; - if(mode == "READONLY"){ + if(mode == Workspace.MODE_READONLY){ classRoot = org.lamsfoundation.lams.monitoring.Application.root; } else { classRoot = org.lamsfoundation.lams.authoring.Application.root;