diff --git a/IPython/html/services/notebooks/tests/test_notebooks_api.py b/IPython/html/services/notebooks/tests/test_notebooks_api.py index c8c82e874..fcb920abf 100644 --- a/IPython/html/services/notebooks/tests/test_notebooks_api.py +++ b/IPython/html/services/notebooks/tests/test_notebooks_api.py @@ -300,7 +300,7 @@ class APITest(NotebookTestBase): saved = resp.json() self.assertEqual(saved['name'], 'a2.ipynb') self.assertEqual(saved['path'], 'foo/bar') - assert os.path.isfile(pjoin(self.notebook_dir.name,'foo','bar','a2.ipynb')) + assert os.path.isfile(pjoin(self.notebook_dir.name,'foo','progress-bar','a2.ipynb')) assert not os.path.isfile(pjoin(self.notebook_dir.name, 'foo', 'a.ipynb')) with assert_http_error(404): self.nb_api.read('a.ipynb', 'foo') diff --git a/IPython/html/static/auth/js/loginmain.js b/IPython/html/static/auth/js/loginmain.js index 4b6c53643..d914bf743 100644 --- a/IPython/html/static/auth/js/loginmain.js +++ b/IPython/html/static/auth/js/loginmain.js @@ -13,7 +13,7 @@ $(document).ready(function () { IPython.page = new IPython.Page(); - $('button#login_submit').addClass("btn"); + $('button#login_submit').addClass("btn btn-default"); IPython.page.show(); $('input#password_input').focus(); diff --git a/IPython/html/static/auth/js/loginwidget.js b/IPython/html/static/auth/js/loginwidget.js index efa1de79e..329ba0e0e 100644 --- a/IPython/html/static/auth/js/loginwidget.js +++ b/IPython/html/static/auth/js/loginwidget.js @@ -24,7 +24,7 @@ var IPython = (function (IPython) { }; LoginWidget.prototype.style = function () { - this.element.find("button").addClass("btn btn-small"); + this.element.find("button").addClass("btn btn-default btn-sm"); }; diff --git a/IPython/html/static/base/js/dialog.js b/IPython/html/static/base/js/dialog.js index 350bd2ab5..ca08d2a04 100644 --- a/IPython/html/static/base/js/dialog.js +++ b/IPython/html/static/base/js/dialog.js @@ -37,7 +37,7 @@ IPython.dialog = (function (IPython) { for (var label in options.buttons) { var btn_opts = options.buttons[label]; var button = $("\ + \

\
\
\ - \ - \ - \ + \ + \ + \
\ "; diff --git a/IPython/html/static/notebook/less/toolbar.less b/IPython/html/static/notebook/less/toolbar.less index 1186d6d54..b05646dfa 100644 --- a/IPython/html/static/notebook/less/toolbar.less +++ b/IPython/html/static/notebook/less/toolbar.less @@ -15,7 +15,7 @@ padding: 0px; padding-top: 3px; } - .btn { + .btn.btn-default { padding: 2px 8px; } } diff --git a/IPython/html/static/tree/js/clusterlist.js b/IPython/html/static/tree/js/clusterlist.js index b941a22cb..98c12f7f8 100644 --- a/IPython/html/static/tree/js/clusterlist.js +++ b/IPython/html/static/tree/js/clusterlist.js @@ -83,7 +83,7 @@ var IPython = (function (IPython) { }; ClusterItem.prototype.style = function () { - this.element.addClass('list_item').addClass("row-fluid"); + this.element.addClass('list_item').addClass("row"); }; ClusterItem.prototype.update_state = function (data) { @@ -106,7 +106,7 @@ var IPython = (function (IPython) { .attr('size',3) .addClass('engine_num_input'); engines_col.append(input); - var start_button = $(' - + +
-
+
  • /
    • @@ -63,19 +63,19 @@ data-notebook-path="{{notebook_path}}"
    -
    +
    Currently running IPython notebooks
    - +
    -
    +
    There are no notebooks running.
    @@ -83,19 +83,19 @@ data-notebook-path="{{notebook_path}}"
    -
    +
    IPython parallel computing clusters
    - +
    -
    +
    profile
    status
    # of engines
    diff --git a/IPython/html/tests/widgets/widget_bool.js b/IPython/html/tests/widgets/widget_bool.js index 4fd10076e..4a83d2469 100644 --- a/IPython/html/tests/widgets/widget_bool.js +++ b/IPython/html/tests/widgets/widget_bool.js @@ -31,7 +31,7 @@ casper.notebook_test(function () { this.test.assert(this.cell_element_exists(index, '.widget-area .widget-subarea .widget-hbox-single .widget-hlabel'), - 'Checkbox label exists.'); + 'Checkbox label label-default exists.'); this.test.assert(this.cell_element_function(index, '.widget-area .widget-subarea .widget-hbox-single .widget-hlabel', 'html')=="Title", diff --git a/IPython/html/tests/widgets/widget_selection.js b/IPython/html/tests/widgets/widget_selection.js index c4f03cc86..082b0b47d 100644 --- a/IPython/html/tests/widgets/widget_selection.js +++ b/IPython/html/tests/widgets/widget_selection.js @@ -15,7 +15,7 @@ casper.notebook_test(function () { var selection_values = 'abcd'; var check_state = function(context, index, state){ if (0 <= index && index < selection_values.length) { - var multibtn_state = context.cell_element_function(selection_index, multibtn_selector + ' .btn:nth-child(' + (index + 1) + ')', 'hasClass', ['active']); + var multibtn_state = context.cell_element_function(selection_index, multibtn_selector + ' .btn.btn-default:nth-child(' + (index + 1) + ')', 'hasClass', ['active']); var radio_state = context.cell_element_function(selection_index, radio_selector + ' .radio:nth-child(' + (index + 1) + ') input', 'prop', ['checked']); var list_val = context.cell_element_function(selection_index, list_selector, 'val'); var combo_val = context.cell_element_function(selection_index, combo_selector, 'html'); @@ -105,7 +105,7 @@ casper.notebook_test(function () { this.test.assert(verify_selection(this, 2), 'List selection updated view states correctly.'); // Verify that selecting a multibutton option updates all of the others. - this.cell_element_function(selection_index, multibtn_selector + ' .btn:nth-child(4)', 'click'); + this.cell_element_function(selection_index, multibtn_selector + ' .btn.btn-default:nth-child(4)', 'click'); }); this.wait_for_idle(); this.then(function () { diff --git a/IPython/html/tests/widgets/widget_selectioncontainer.js b/IPython/html/tests/widgets/widget_selectioncontainer.js index c9219e71f..fd9aae367 100644 --- a/IPython/html/tests/widgets/widget_selectioncontainer.js +++ b/IPython/html/tests/widgets/widget_selectioncontainer.js @@ -62,7 +62,7 @@ casper.notebook_test(function () { }); // Test accordion view - var multicontainer2_query = '.widget-area .widget-subarea .accordion'; + var multicontainer2_query = '.widget-area .widget-subarea .panel-group'; var multicontainer2_index = this.append_cell( 'multicontainer = widgets.AccordionWidget()\n' + 'page1 = widgets.TextWidget()\n' + @@ -83,19 +83,19 @@ casper.notebook_test(function () { 'Widget subarea exists.'); this.test.assert(this.cell_element_exists(index, multicontainer2_query), - 'Widget accordion exists.'); + 'Widget panel-group exists.'); this.test.assert(this.cell_element_exists(index, multicontainer2_query + - ' .accordion-group:nth-child(1) .accordion-body'), - 'First accordion page exists.'); + ' .panel.panel-default:nth-child(1) .panel-collapse'), + 'First panel-group page exists.'); // JQuery selector is 1 based this.test.assert(this.cell_element_function(index, multicontainer2_query + - ' .accordion-group:nth-child(3) .accordion-heading .accordion-toggle', + ' .panel.panel-default:nth-child(3) .panel-heading .accordion-toggle', 'html')=='good', 'Accordion page title set (before display).'); // JQuery selector is 1 based - this.click(multicontainer2_query + ' .accordion-group:nth-child(2) .accordion-heading .accordion-toggle'); + this.click(multicontainer2_query + ' .panel.panel-default:nth-child(2) .panel-heading .accordion-toggle'); }); this.wait_for_idle(); @@ -106,7 +106,7 @@ casper.notebook_test(function () { 'selected_index property updated with tab change.'); var is_collapsed = this.evaluate(function(s){ - return $(s + ' div.accordion-group:nth-child(2) a').hasClass('collapsed'); // 1 based + return $(s + ' div.panel.panel-default:nth-child(2) a').hasClass('collapsed'); // 1 based }, {s: multicontainer2_query}); this.test.assertEquals(is_collapsed, false, 'Was tab actually opened?'); });