diff --git a/IPython/frontend/html/notebook/static/css/login.css b/IPython/frontend/html/notebook/static/css/login.css index 41eb790..3cb3d4b 100644 --- a/IPython/frontend/html/notebook/static/css/login.css +++ b/IPython/frontend/html/notebook/static/css/login.css @@ -1,5 +1,5 @@ -#main_app { +#ipython-main-app { height: 100px; width: 350px; margin: 50px auto; diff --git a/IPython/frontend/html/notebook/static/css/logout.css b/IPython/frontend/html/notebook/static/css/logout.css index 7767494..231eea2 100644 --- a/IPython/frontend/html/notebook/static/css/logout.css +++ b/IPython/frontend/html/notebook/static/css/logout.css @@ -1,5 +1,5 @@ -#main_app { +#ipython-main-app { height: 100px; width: 200px; margin: 50px auto; diff --git a/IPython/frontend/html/notebook/static/css/notebook.less b/IPython/frontend/html/notebook/static/css/notebook.less index 926c09d..3028e5d 100644 --- a/IPython/frontend/html/notebook/static/css/notebook.less +++ b/IPython/frontend/html/notebook/static/css/notebook.less @@ -92,7 +92,7 @@ span#notebook_name { } -div#main_app { +#ipython-main-app { width: 100%; position: relative; } diff --git a/IPython/frontend/html/notebook/static/css/projectdashboard.css b/IPython/frontend/html/notebook/static/css/projectdashboard.css index 640fb84..7cf6c4b 100644 --- a/IPython/frontend/html/notebook/static/css/projectdashboard.css +++ b/IPython/frontend/html/notebook/static/css/projectdashboard.css @@ -5,7 +5,7 @@ * Author: IPython Development Team */ -#main_app { +#ipython-main-app { width: 920px; margin: 30px auto 0px auto; } diff --git a/IPython/frontend/html/notebook/static/js/layoutmanager.js b/IPython/frontend/html/notebook/static/js/layoutmanager.js index b599e93..00949ee 100644 --- a/IPython/frontend/html/notebook/static/js/layoutmanager.js +++ b/IPython/frontend/html/notebook/static/js/layoutmanager.js @@ -43,7 +43,7 @@ var IPython = (function (IPython) { LayoutManager.prototype.do_resize = function () { var app_height = this.app_height() // content height - $('div#main_app').height(app_height); // content+padding+border height + $('#ipython-main-app').height(app_height); // content+padding+border height var pager_height = IPython.pager.percentage_height*app_height; var pager_splitter_height = $('div#pager_splitter').outerHeight(true); diff --git a/IPython/frontend/html/notebook/static/js/loginmain.js b/IPython/frontend/html/notebook/static/js/loginmain.js index 503f1ea..9718fb5 100644 --- a/IPython/frontend/html/notebook/static/js/loginmain.js +++ b/IPython/frontend/html/notebook/static/js/loginmain.js @@ -14,7 +14,7 @@ $(document).ready(function () { IPython.page = new IPython.Page(); $('input#login_submit').button(); - $('div#main_app').addClass('border-box-sizing ui-widget'); + $('#ipython-main-app').addClass('border-box-sizing ui-widget'); IPython.page.show(); $('input#password_input').focus(); diff --git a/IPython/frontend/html/notebook/static/js/logoutmain.js b/IPython/frontend/html/notebook/static/js/logoutmain.js index 8bbddb4..16331d4 100644 --- a/IPython/frontend/html/notebook/static/js/logoutmain.js +++ b/IPython/frontend/html/notebook/static/js/logoutmain.js @@ -13,7 +13,7 @@ $(document).ready(function () { IPython.page = new IPython.Page(); - $('div#main_app').addClass('border-box-sizing ui-widget'); + $('#ipython-main-app').addClass('border-box-sizing ui-widget'); IPython.page.show(); }); diff --git a/IPython/frontend/html/notebook/static/js/notebook.js b/IPython/frontend/html/notebook/static/js/notebook.js index 78d22e3..43714d7 100644 --- a/IPython/frontend/html/notebook/static/js/notebook.js +++ b/IPython/frontend/html/notebook/static/js/notebook.js @@ -273,7 +273,7 @@ var IPython = (function (IPython) { }); var collapse_time = function(time){ - var app_height = $('div#main_app').height(); // content height + var app_height = $('#ipython-main-app').height(); // content height var splitter_height = $('div#pager_splitter').outerHeight(true); var new_height = app_height - splitter_height; that.element.animate({height : new_height + 'px'}, time); @@ -285,7 +285,7 @@ var IPython = (function (IPython) { }); var expand_time = function(time) { - var app_height = $('div#main_app').height(); // content height + var app_height = $('#ipython-main-app').height(); // content height var splitter_height = $('div#pager_splitter').outerHeight(true); var pager_height = $('div#pager').outerHeight(true); var new_height = app_height - pager_height - splitter_height; diff --git a/IPython/frontend/html/notebook/static/js/notebookmain.js b/IPython/frontend/html/notebook/static/js/notebookmain.js index e7221eb..5ef1c37 100644 --- a/IPython/frontend/html/notebook/static/js/notebookmain.js +++ b/IPython/frontend/html/notebook/static/js/notebookmain.js @@ -34,7 +34,7 @@ $(document).ready(function () { IPython.mathjaxutils.init(); IPython.read_only = $('body').data('readOnly') === 'True'; - $('div#main_app').addClass('border-box-sizing ui-widget'); + $('#ipython-main-app').addClass('border-box-sizing ui-widget'); $('div#notebook_panel').addClass('border-box-sizing ui-widget'); // The header's bottom border is provided by the menu bar so we remove it. $('div#header').css('border-bottom-style','none'); diff --git a/IPython/frontend/html/notebook/static/js/printnotebookmain.js b/IPython/frontend/html/notebook/static/js/printnotebookmain.js index 59a62b0..64895c2 100644 --- a/IPython/frontend/html/notebook/static/js/printnotebookmain.js +++ b/IPython/frontend/html/notebook/static/js/printnotebookmain.js @@ -15,7 +15,7 @@ $(document).ready(function () { IPython.mathjaxutils.init(); IPython.read_only = $('body').data('readOnly') === 'True'; - $('div#main_app').addClass('border-box-sizing ui-widget'); + $('#ipython-main-app').addClass('border-box-sizing ui-widget'); $('div#notebook_panel').addClass('border-box-sizing ui-widget'); IPython.page = new IPython.Page(); diff --git a/IPython/frontend/html/notebook/static/js/projectdashboardmain.js b/IPython/frontend/html/notebook/static/js/projectdashboardmain.js index b593302..c94d0a9 100644 --- a/IPython/frontend/html/notebook/static/js/projectdashboardmain.js +++ b/IPython/frontend/html/notebook/static/js/projectdashboardmain.js @@ -19,7 +19,7 @@ $(document).ready(function () { var new_url = $('body').data('baseProjectUrl') + '#' + ui.panel.id; window.history.replaceState({}, '', new_url); }); - $('div#main_app').addClass('border-box-sizing ui-widget'); + $('#ipython-main-app').addClass('border-box-sizing ui-widget'); $('div#notebooks_toolbar').addClass('ui-widget ui-helper-clearfix'); $('#new_notebook').button().click(function (e) { window.open($('body').data('baseProjectUrl')+'new'); diff --git a/IPython/frontend/html/notebook/templates/login.html b/IPython/frontend/html/notebook/templates/login.html index 22fb509..3722140 100644 --- a/IPython/frontend/html/notebook/templates/login.html +++ b/IPython/frontend/html/notebook/templates/login.html @@ -13,7 +13,7 @@ {% block site %} -
+
{% if login_available %}
diff --git a/IPython/frontend/html/notebook/templates/logout.html b/IPython/frontend/html/notebook/templates/logout.html index e074d89..e18730e 100644 --- a/IPython/frontend/html/notebook/templates/logout.html +++ b/IPython/frontend/html/notebook/templates/logout.html @@ -12,7 +12,7 @@ {% block site %} -
+
{% if message %} {% for key in message %} diff --git a/IPython/frontend/html/notebook/templates/notebook.html b/IPython/frontend/html/notebook/templates/notebook.html index a9add88..a9a458f 100644 --- a/IPython/frontend/html/notebook/templates/notebook.html +++ b/IPython/frontend/html/notebook/templates/notebook.html @@ -161,7 +161,7 @@ data-notebook-id={{notebook_id}}
-
+
diff --git a/IPython/frontend/html/notebook/templates/printnotebook.html b/IPython/frontend/html/notebook/templates/printnotebook.html index 083fd61..d7c9ff3 100644 --- a/IPython/frontend/html/notebook/templates/printnotebook.html +++ b/IPython/frontend/html/notebook/templates/printnotebook.html @@ -40,7 +40,7 @@ data-notebook-id={{notebook_id}} {% block site %} -
+
diff --git a/IPython/frontend/html/notebook/templates/projectdashboard.html b/IPython/frontend/html/notebook/templates/projectdashboard.html index 0c49f70..79d2122 100644 --- a/IPython/frontend/html/notebook/templates/projectdashboard.html +++ b/IPython/frontend/html/notebook/templates/projectdashboard.html @@ -20,7 +20,7 @@ data-read-only={{read_only}} {% block site %} -
+