From 8a121f93acaeaaf601fe8943a5e1314ca137689e Mon Sep 17 00:00:00 2001
From: Matthias BUSSONNIER <bussonniermatthias@gmail.com>
Date: Sun, 12 Aug 2012 14:20:37 +0200
Subject: [PATCH] #toolbar -> #maintoolbar

---
 IPython/frontend/html/notebook/static/js/maintoolbar.js  | 2 +-
 IPython/frontend/html/notebook/static/js/notebookmain.js | 2 +-
 IPython/frontend/html/notebook/templates/notebook.html   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/IPython/frontend/html/notebook/static/js/maintoolbar.js b/IPython/frontend/html/notebook/static/js/maintoolbar.js
index 0c6a23f95..7bfd69079 100644
--- a/IPython/frontend/html/notebook/static/js/maintoolbar.js
+++ b/IPython/frontend/html/notebook/static/js/maintoolbar.js
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------
-//  Copyright (C) 2008 The IPython Development Team
+//  Copyright (C) 2011 The IPython Development Team
 //
 //  Distributed under the terms of the BSD License.  The full license is in
 //  the file COPYING, distributed as part of this software.
diff --git a/IPython/frontend/html/notebook/static/js/notebookmain.js b/IPython/frontend/html/notebook/static/js/notebookmain.js
index 22775434e..eba9274e0 100644
--- a/IPython/frontend/html/notebook/static/js/notebookmain.js
+++ b/IPython/frontend/html/notebook/static/js/notebookmain.js
@@ -29,7 +29,7 @@ $(document).ready(function () {
     IPython.notebook = new IPython.Notebook('div#notebook');
     IPython.save_widget = new IPython.SaveWidget('span#save_widget');
     IPython.menubar = new IPython.MenuBar('#menubar')
-    IPython.toolbar = new IPython.MainToolBar('#toolbar')
+    IPython.toolbar = new IPython.MainToolBar('#maintoolbar')
     IPython.tooltip = new IPython.Tooltip()
     IPython.notification_widget = new IPython.NotificationWidget('#notification')
 
diff --git a/IPython/frontend/html/notebook/templates/notebook.html b/IPython/frontend/html/notebook/templates/notebook.html
index fb4b69bc3..9915c832e 100644
--- a/IPython/frontend/html/notebook/templates/notebook.html
+++ b/IPython/frontend/html/notebook/templates/notebook.html
@@ -154,7 +154,7 @@ data-notebook-id={{notebook_id}}
 </div>
 
 
-<div id="toolbar"></div>
+<div id="maintoolbar"></div>
 
 <div id="main_app">