#toolbar -> #maintoolbar

IPython/frontend/html/notebook/static/js/layoutmanager.js

@@ -32,10 +32,10 b' var IPython = (function (IPython) {'
         }
         var menubar_height = $('div#menubar').outerHeight(true);
         var toolbar_height;
-        if ($('div#toolbar').css('display') === 'none') {
+        if ($('div#maintoolbar').css('display') === 'none') {
             toolbar_height = 0;
         } else {
-            toolbar_height = $('div#toolbar').outerHeight(true);
+            toolbar_height = $('div#maintoolbar').outerHeight(true);
         }
         return h-header_height-menubar_height-toolbar_height;  // content height
     }

IPython/frontend/html/notebook/static/js/maintoolbar.js

@@ -1,5 +1,5 b''
 //----------------------------------------------------------------------------
-//  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.

IPython/frontend/html/notebook/static/js/notebookmain.js

@@ -29,7 +29,7 b' $(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')
 

IPython/frontend/html/notebook/templates/notebook.html

@@ -154,7 +154,7 b' data-notebook-id={{notebook_id}}'
 </div>
 
 
-<div id="toolbar"></div>
+<div id="maintoolbar"></div>
 
 <div id="main_app">