diff --git a/IPython/html/static/tree/js/kernellist.js b/IPython/html/static/tree/js/kernellist.js index 7ff20dd..f89d52c 100644 --- a/IPython/html/static/tree/js/kernellist.js +++ b/IPython/html/static/tree/js/kernellist.js @@ -22,13 +22,12 @@ var IPython = (function (IPython) { KernelList.prototype.sessions_loaded = function (d) { this.sessions = d; - // clear out the previous list this.clear_list(); var item; for (var path in d) { item = this.new_notebook_item(-1); this.add_link('', path, item); - this.add_shutdown_button(item,this.sessions[path]); + this.add_shutdown_button(item, this.sessions[path]); } $('#running_list_header').toggle($.isEmptyObject(d)); diff --git a/IPython/html/static/tree/js/notebooklist.js b/IPython/html/static/tree/js/notebooklist.js index 4b86310..2f472de 100644 --- a/IPython/html/static/tree/js/notebooklist.js +++ b/IPython/html/static/tree/js/notebooklist.js @@ -33,10 +33,11 @@ var IPython = (function (IPython) { }; NotebookList.prototype.style = function () { - $('#' + this.element_name + '_toolbar').addClass('list_toolbar'); - $('#drag_info').addClass('toolbar_info'); - $('#' + this.element_name + '_buttons').addClass('toolbar_buttons'); - $('#' + this.element_name + '_list_header').addClass('list_header'); + var prefix = '#' + this.element_name + $(prefix + '_toolbar').addClass('list_toolbar'); + $(prefix + '_list_info').addClass('toolbar_info'); + $(prefix + '_buttons').addClass('toolbar_buttons'); + $(prefix + '_list_header').addClass('list_header'); this.element.addClass("list_container"); }; diff --git a/IPython/html/static/tree/js/sessionlist.js b/IPython/html/static/tree/js/sessionlist.js index dc1f9aa..4942ed8 100644 --- a/IPython/html/static/tree/js/sessionlist.js +++ b/IPython/html/static/tree/js/sessionlist.js @@ -29,7 +29,7 @@ var IPython = (function (IPython) { success : $.proxy(that.sessions_loaded, this) }; var url = utils.url_join_encode(this.base_url, 'api/sessions'); - $.ajax(url,settings); + $.ajax(url, settings); }; SesssionList.prototype.sessions_loaded = function(data){ diff --git a/IPython/html/templates/tree.html b/IPython/html/templates/tree.html index cf0abad..19a5e23 100644 --- a/IPython/html/templates/tree.html +++ b/IPython/html/templates/tree.html @@ -34,9 +34,9 @@ data-base-kernel-url="{{base_kernel_url}}" <div id="notebook_toolbar" class="row-fluid"> <div class="span8"> <form id='alternate_upload' class='alternate_upload' > - <span id="drag_info" style="position:absolute" > + <span id="notebook_list_info" style="position:absolute" > To import a notebook, drag the file onto the listing below or <strong>click here</strong>. - </span> + </span> <input type="file" name="datafile" class="fileinput" multiple='multiple'> </form> </div> @@ -76,9 +76,8 @@ data-base-kernel-url="{{base_kernel_url}}" </div> <div id="running_list"> - <div id="running_list_header" class="row-fluid list_header" style='display:none'> + <div id="running_list_header" class="row-fluid list_header"> <div> There are no notebooks running. </div> - <!-- damn it, I seem to need this stupid placeholder, otherwise items don't get added to the list --> </div> </div> </div>