add editor commands to the menu bar
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/editorCommands.js b/bundles/org.eclipse.orion.client.ui/web/orion/editorCommands.js
index 315039a..78886ac 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/editorCommands.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/editorCommands.js
@@ -108,6 +108,7 @@
 		this.inputManager = options.inputManager;
 		this.toolbarId = options.toolbarId;
 		this.saveToolbarId = options.saveToolbarId;
+		this.editToolbarId = options.editToolbarId;
 		this.pageNavId = options.navToolbarId;
 		this.isReadOnly = options.readonly;
 		this._localSearcher = options.textSearcher;
@@ -191,7 +192,7 @@
 				}
 			});
 			this.commandService.addCommand(undoCommand);
-			this.commandService.registerCommandContribution(this.toolbarId, "orion.undo", 400, null, true, new mKeyBinding.KeyBinding('z', true)); //$NON-NLS-1$ //$NON-NLS-0$
+			this.commandService.registerCommandContribution(this.editToolbarId || this.toolbarId, "orion.undo", 400, this.editToolbarId ? "orion.menuBarEditGroup/orion.undoGroup" : null, !this.editToolbarId, new mKeyBinding.KeyBinding('z', true)); //$NON-NLS-1$ //$NON-NLS-0$
 			
 			var redoCommand = new mCommands.Command({
 				name: messages.Redo,
@@ -204,7 +205,7 @@
 				}
 			});
 			this.commandService.addCommand(redoCommand);
-			this.commandService.registerCommandContribution(this.toolbarId, "orion.redo", 401, null, true, util.isMac ? new mKeyBinding.KeyBinding('z', true, true) : new mKeyBinding.KeyBinding('y', true)); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$
+			this.commandService.registerCommandContribution(this.editToolbarId || this.toolbarId, "orion.redo", 401, this.editToolbarId ? "orion.menuBarEditGroup/orion.undoGroup" : null, !this.editToolbarId, util.isMac ? new mKeyBinding.KeyBinding('z', true, true) : new mKeyBinding.KeyBinding('y', true)); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$
 		},
 		_generateSearchFilesCommand: function(editor) {
 			var self = this;
@@ -247,7 +248,7 @@
 					}
 				});
 				this.commandService.addCommand(searchCommand);
-				this.commandService.registerCommandContribution(this.pageNavId, "orion.searchFiles", 1, null, true, new mKeyBinding.KeyBinding("h", true)); //$NON-NLS-1$ //$NON-NLS-0$
+				this.commandService.registerCommandContribution(this.editToolbarId || this.pageNavId, "orion.searchFiles", 1, this.editToolbarId ? "orion.menuBarEditGroup/orion.findGroup" : null, !this.editToolbarId, new mKeyBinding.KeyBinding("h", true)); //$NON-NLS-1$ //$NON-NLS-0$
 			}
 		},
 		_generateSaveCommand: function(editor, saveCmdId) {
@@ -269,7 +270,7 @@
 				}
 			});
 			this.commandService.addCommand(saveCommand);
-			this.commandService.registerCommandContribution(this.saveToolbarId || this.toolbarId, cmdId, 1, "orion.menuBarFileGroup/orion.saveGroup", false, new mKeyBinding.KeyBinding('s', true)); //$NON-NLS-0$
+			this.commandService.registerCommandContribution(this.saveToolbarId || this.toolbarId, cmdId, 1, this.saveToolbarId ? "orion.menuBarFileGroup/orion.saveGroup" : null, false, new mKeyBinding.KeyBinding('s', true)); //$NON-NLS-0$
 			
 			// Add key binding to editor so that the user agent save dialog does not show when auto save is enabled
 			if (editor.getTextView && editor.getTextView()) {
@@ -316,7 +317,7 @@
 				}
 			});
 			this.commandService.addCommand(gotoLineCommand);
-			this.commandService.registerCommandContribution(this.pageNavId, "orion.gotoLine", 1, null, true, new mKeyBinding.KeyBinding('l', !util.isMac, false, false, util.isMac), new mCommandRegistry.URLBinding("gotoLine", "line")); //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$
+			this.commandService.registerCommandContribution(this.editToolbarId || this.pageNavId, "orion.gotoLine", 3, this.editToolbarId ? "orion.menuBarEditGroup/orion.findGroup" : null, !this.editToolbarId, new mKeyBinding.KeyBinding('l', !util.isMac, false, false, util.isMac), new mCommandRegistry.URLBinding("gotoLine", "line")); //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$
 			// override the editor binding
 			if (editor.getTextView && editor.getTextView()) {
 				editor.getTextView().setAction("gotoLine", function (data) { //$NON-NLS-0$
@@ -392,7 +393,7 @@
 				}
 			});
 			this.commandService.addCommand(findCommand);
-			this.commandService.registerCommandContribution(this.pageNavId, "orion.editor.find", 2, null, true, new mKeyBinding.KeyBinding('f', true), new mCommandRegistry.URLBinding("find", "find")); //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$
+			this.commandService.registerCommandContribution(this.editToolbarId || this.pageNavId, "orion.editor.find", 0, this.editToolbarId ? "orion.menuBarEditGroup/orion.findGroup" : null, !this.editToolbarId, new mKeyBinding.KeyBinding('f', true), new mCommandRegistry.URLBinding("find", "find")); //$NON-NLS-3$ //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$
 			// override the editor binding 
 			if (editor.getTextView && editor.getTextView()) {
 				editor.getTextView().setAction("find", function (data) { //$NON-NLS-0$
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/editorPluginView.js b/bundles/org.eclipse.orion.client.ui/web/orion/editorPluginView.js
index c799646..9e46a2a 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/editorPluginView.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/editorPluginView.js
@@ -166,6 +166,7 @@
 				readonly: this.readonly,
 				toolbarId: "toolsActions", //$NON-NLS-0$
 				saveToolbarId: "fileActions", //$NON-NLS-0$
+				editToolbarId: "editActions", //$NON-NLS-0$
 				navToolbarId: "pageNavigationActions" //$NON-NLS-0$
 			});
 			commandGenerator.generateBaseEditorCommands(this.editor);
diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/editorView.js b/bundles/org.eclipse.orion.client.ui/web/orion/editorView.js
index 126b140..40564f1 100644
--- a/bundles/org.eclipse.orion.client.ui/web/orion/editorView.js
+++ b/bundles/org.eclipse.orion.client.ui/web/orion/editorView.js
@@ -300,6 +300,7 @@
 					inputManager: inputManager,

 					toolbarId: "toolsActions", //$NON-NLS-0$

 					saveToolbarId: "fileActions", //$NON-NLS-0$

+					editToolbarId: "editActions", //$NON-NLS-0$

 					readonly: readonly,

 					navToolbarId: "pageNavigationActions", //$NON-NLS-0$

 					textSearcher: localSearcher,