Ran jdfreder/bootstrap2to3

IPython/html/services/notebooks/tests/test_notebooks_api.py

@@ -300,7 +300,7 b' 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')

IPython/html/static/auth/js/loginmain.js

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

IPython/html/static/auth/js/loginwidget.js

@@ -24,7 +24,7 b' 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");
     };
 
 

IPython/html/static/base/js/dialog.js

@@ -37,7 +37,7 b' IPython.dialog = (function (IPython) {'
         for (var label in options.buttons) {
             var btn_opts = options.buttons[label];
             var button = $("<button/>")
-                .addClass("btn")
+                .addClass("btn btn-default")
                 .attr("data-dismiss", "modal")
                 .text(label);
             if (btn_opts.click) {

IPython/html/static/custom/custom.js

@@ -20,7 +20,7 b''
  *    $([IPython.events]).on('app_initialized.NotebookApp', function(){
  *        IPython.toolbar.add_buttons_group([
  *            {
- *                 'label'   : 'run qtconsole',
+ *                 'label label-default'   : 'run qtconsole',
  *                 'icon'    : 'icon-terminal', // select your icon from http://fortawesome.github.io/Font-Awesome/icons
  *                 'callback': function () {
  *                     IPython.notebook.kernel.execute('%qtconsole')

IPython/html/static/notebook/js/celltoolbar.js

@@ -144,7 +144,7 b' var IPython = (function (IPython) {'
      *          button.click(function(){
      *                      var v = cell.metadata.foo;
      *                      cell.metadata.foo = !v;
-     *                      button.button("option", "label", String(!v));
+     *                      button.button("option", "label label-default", String(!v));
      *                  })
      *
      *          // add the button to the DOM div.

IPython/html/static/notebook/js/celltoolbarpresets/default.js

@@ -27,7 +27,7 b''
     var add_raw_edit_button = function(div, cell) {
         var button_container = div;
         var button = $('<button/>')
-            .addClass("btn btn-mini")
+            .addClass("btn btn-default btn-xs")
             .text("Edit Metadata")
             .click( function () {
                 raw_edit(cell);

IPython/html/static/notebook/js/celltoolbarpresets/example.js

@@ -64,7 +64,7 b''
         button.click(function(){
                     var v = cell.metadata.foo;
                     cell.metadata.foo = !v;
-                    button.button("option","label",String(!v));
+                    button.button("option","label label-default",String(!v));
                 })
        button_container.append(button);
     }

IPython/html/static/notebook/js/outputarea.js

@@ -61,7 +61,7 b' var IPython = (function (IPython) {'
         this.wrapper.addClass('output_wrapper');
         this.element.addClass('output');
         
-        this.collapse_button.addClass("btn output_collapsed");
+        this.collapse_button.addClass("btn btn-default output_collapsed");
         this.collapse_button.attr('title', 'click to expand output');
         this.collapse_button.text('. . .');
         

IPython/html/static/notebook/js/toolbar.js

@@ -72,7 +72,7 b' var IPython = (function (IPython) {'
         for(var i=0; i < list.length; i++) {
             el = list[i];
             var button  = $('<button/>')
-                .addClass('btn')
+                .addClass('btn btn-default')
                 .attr("title", el.label)
                 .append(
                     $("<i/>").addClass(el.icon)

IPython/html/static/notebook/js/tour.js

@@ -112,13 +112,13 b' var tour_steps = ['
 var tour_style = "<div class='popover tour' style='position:relative'>\
   <div class='arrow'></div>\
     <div style='position:absolute; top:7px; right:7px'>\
-        <button class='btn btn-sm icon-remove' data-role='end'></button></div>\
+        <button class='btn btn-default btn-sm icon-remove' data-role='end'></button></div>\
   <h3 class='popover-title'></h3>\
   <div class='popover-content'></div>\
   <div class='popover-navigation'>\
-    <button class='btn btn-default icon-step-backward' data-role='prev'></button>\
-    <button class='btn btn-default icon-step-forward pull-right' data-role='next'></button>\
-    <button id='tour-pause' class='btn btn-sm btn-default icon-pause' data-resume-text='' data-pause-text='' data-role='pause-resume'></button>\
+    <button class='btn btn-default btn-default icon-step-backward' data-role='prev'></button>\
+    <button class='btn btn-default btn-default icon-step-forward pull-right' data-role='next'></button>\
+    <button id='tour-pause' class='btn btn-default btn-sm btn-default icon-pause' data-resume-text='' data-pause-text='' data-role='pause-resume'></button>\
   </div>\
 </div>";
 

IPython/html/static/notebook/less/toolbar.less

@@ -15,7 +15,7 b''
         padding: 0px;
         padding-top: 3px;
     }
-    .btn {
+    .btn.btn-default {
         padding: 2px 8px;
     }
 }

IPython/html/static/tree/js/clusterlist.js

@@ -83,7 +83,7 b' 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 b' var IPython = (function (IPython) {'
                 .attr('size',3)
                 .addClass('engine_num_input');
         engines_col.append(input);
-        var start_button = $('<button/>').addClass("btn btn-mini").text("Start");
+        var start_button = $('<button/>').addClass("btn btn-default btn-xs").text("Start");
         var action_col = $('<div/>').addClass('action_col span2').append(
             $("<span/>").addClass("item_buttons btn-group").append(
                 start_button
@@ -153,7 +153,7 b' var IPython = (function (IPython) {'
         var profile_col = $('<div/>').addClass('profile_col span4').text(this.data.profile);
         var status_col = $('<div/>').addClass('status_col span3').text('running');
         var engines_col = $('<div/>').addClass('engines_col span3').text(this.data.n);
-        var stop_button = $('<button/>').addClass("btn btn-mini").text("Stop");
+        var stop_button = $('<button/>').addClass("btn btn-default btn-xs").text("Stop");
         var action_col = $('<div/>').addClass('action_col span2').append(
             $("<span/>").addClass("item_buttons btn-group").append(
                 stop_button

IPython/html/static/tree/js/notebooklist.js

@@ -189,7 +189,7 b' var IPython = (function (IPython) {'
 
 
     NotebookList.prototype.new_notebook_item = function (index) {
-        var item = $('<div/>').addClass("list_item").addClass("row-fluid");
+        var item = $('<div/>').addClass("list_item").addClass("row");
         // item.addClass('list_item ui-widget ui-widget-content ui-helper-clearfix');
         // item.css('border-top-style','none');
         item.append($("<div/>").addClass("span12").append(
@@ -265,7 +265,7 b' var IPython = (function (IPython) {'
 
     NotebookList.prototype.add_shutdown_button = function (item, session) {
         var that = this;
-        var shutdown_button = $("<button/>").text("Shutdown").addClass("btn btn-mini btn-danger").
+        var shutdown_button = $("<button/>").text("Shutdown").addClass("btn btn-default btn-xs btn-danger").
             click(function (e) {
                 var settings = {
                     processData : false,
@@ -292,7 +292,7 b' var IPython = (function (IPython) {'
     NotebookList.prototype.add_delete_button = function (item) {
         var new_buttons = $('<span/>').addClass("btn-group pull-right");
         var notebooklist = this;
-        var delete_button = $("<button/>").text("Delete").addClass("btn btn-mini").
+        var delete_button = $("<button/>").text("Delete").addClass("btn btn-default btn-xs").
             click(function (e) {
                 // $(this) is the button that was clicked.
                 var that = $(this);
@@ -339,7 +339,7 b' var IPython = (function (IPython) {'
     NotebookList.prototype.add_upload_button = function (item) {
         var that = this;
         var upload_button = $('<button/>').text("Upload")
-            .addClass('btn btn-primary btn-mini upload_button')
+            .addClass('btn btn-default btn-primary btn-xs upload_button')
             .click(function (e) {
                 var nbname = item.find('.item_name > input').val();
                 if (nbname.slice(nbname.length-6, nbname.length) != ".ipynb") {
@@ -375,7 +375,7 b' var IPython = (function (IPython) {'
                 return false;
             });
         var cancel_button = $('<button/>').text("Cancel")
-            .addClass("btn btn-mini")
+            .addClass("btn btn-default btn-xs")
             .click(function (e) {
                 console.log('cancel click');
                 item.remove();

IPython/html/static/widgets/js/widget_bool.js

@@ -76,7 +76,7 b' define(["widgets/js/widget"], function(WidgetManager){'
             // Called when view is rendered.
             var that = this;
             this.setElement($('<button />')
-                .addClass('btn')
+                .addClass('btn btn-default')
                 .attr('type', 'button')
                 .on('click', function (e) {
                     e.preventDefault();

IPython/html/static/widgets/js/widget_button.js

@@ -20,7 +20,7 b' define(["widgets/js/widget"], function(WidgetManager){'
         render : function(){
             // Called when view is rendered.
             this.setElement($("<button />")
-                .addClass('btn'));
+                .addClass('btn btn-default'));
 
             this.update(); // Set defaults.
         },

IPython/html/static/widgets/js/widget_container.js

@@ -165,7 +165,7 b' define(["widgets/js/widget"], function(WidgetManager) {'
             
             this.$show_button = $('<button />')
                 .html("&nbsp;")
-                .addClass('btn btn-info widget-modal-show')
+                .addClass('btn btn-default btn-info widget-modal-show')
                 .appendTo(this.$el)
                 .click(function(){
                     that.show();

IPython/html/static/widgets/js/widget_int.js

@@ -274,7 +274,7 b' define(["widgets/js/widget"], function(WidgetManager){'
                 .appendTo(this.$el);
             this.$el_to_style = this.$progress; // Set default element to style
             this.$bar = $('<div />')
-                .addClass('bar')
+                .addClass('progress-bar')
                 .css('width', '50%')
                 .appendTo(this.$progress);
             this.update(); // Set defaults.

IPython/html/static/widgets/js/widget_selection.js

@@ -31,12 +31,12 b' define(["widgets/js/widget"], function(WidgetManager){'
                 .appendTo(this.$el);
             this.$el_to_style = this.$buttongroup; // Set default element to style
             this.$droplabel = $('<button />')
-                .addClass('btn')
+                .addClass('btn btn-default')
                 .addClass('widget-combo-btn')
                 .html("&nbsp;")
                 .appendTo(this.$buttongroup);
             this.$dropbutton = $('<button />')
-                .addClass('btn')
+                .addClass('btn btn-default')
                 .addClass('dropdown-toggle')
                 .addClass('widget-combo-carrot-btn')
                 .attr('data-toggle', 'dropdown')
@@ -246,7 +246,7 b' define(["widgets/js/widget"], function(WidgetManager){'
                     if (!$item_element.length) {
                         $item_element = $('<button/>')
                             .attr('type', 'button')
-                            .addClass('btn')
+                            .addClass('btn btn-default')
                             .html(item_html)
                             .appendTo(that.$buttongroup)
                             .attr('data-value', item)

IPython/html/static/widgets/js/widget_selectioncontainer.js

@@ -19,10 +19,10 b' define(["widgets/js/widget"], function(WidgetManager){'
     var AccordionView = IPython.DOMWidgetView.extend({
         render: function(){
             // Called when view is rendered.
-            var guid = 'accordion' + IPython.utils.uuid();
+            var guid = 'panel-group' + IPython.utils.uuid();
             this.$el
                 .attr('id', guid)
-                .addClass('accordion');
+                .addClass('panel-group');
             this.containers = [];
             this.model_containers = {};
             this.update_children([], this.model.get('_children'));
@@ -60,7 +60,7 b' define(["widgets/js/widget"], function(WidgetManager){'
                 var accordian = that.containers[page_index];
                 if (accordian !== undefined) {
                     accordian
-                        .find('.accordion-heading')
+                        .find('.panel-heading')
                         .find('.accordion-toggle')
                         .text(title);
                 }
@@ -71,9 +71,9 b' define(["widgets/js/widget"], function(WidgetManager){'
             // Only update the selection if the selection wasn't triggered
             // by the front-end.  It must be triggered by the back-end.
             if (options === undefined || options.updated_view != this) {
-                this.containers[old_index].find('.accordion-body').collapse('hide');
+                this.containers[old_index].find('.panel-collapse').collapse('hide');
                 if (0 <= new_index && new_index < this.containers.length) {
-                    this.containers[new_index].find('.accordion-body').collapse('show');
+                    this.containers[new_index].find('.panel-collapse').collapse('show');
                 }
             }
         },
@@ -101,10 +101,10 b' define(["widgets/js/widget"], function(WidgetManager){'
             var index = this.containers.length;
             var uuid = IPython.utils.uuid();
             var accordion_group = $('<div />')
-                .addClass('accordion-group')
+                .addClass('panel panel-default')
                 .appendTo(this.$el);
             var accordion_heading = $('<div />')
-                .addClass('accordion-heading')
+                .addClass('panel-heading')
                 .appendTo(accordion_group);
             var that = this;
             var accordion_toggle = $('<a />')
@@ -122,10 +122,10 b' define(["widgets/js/widget"], function(WidgetManager){'
                 .text('Page ' + index)
                 .appendTo(accordion_heading);
             var accordion_body = $('<div />', {id: uuid})
-                .addClass('accordion-body collapse')
+                .addClass('panel-collapse collapse')
                 .appendTo(accordion_group);
             var accordion_inner = $('<div />')
-                .addClass('accordion-inner')
+                .addClass('panel-body')
                 .appendTo(accordion_body);
             var container_index = this.containers.push(accordion_group) - 1;
             accordion_group.container_index = container_index;

IPython/html/static/widgets/less/widgets.less

@@ -185,7 +185,7 b''
     /* Progress Bar */
     width : 363px;
 
-    .bar {
+    .progress-bar {
         /* Disable progress bar animation */
         -webkit-transition : none;
         -moz-transition    : none;

IPython/html/templates/page.html

@@ -52,7 +52,7 b''
 <div id="header" class="navbar navbar-static-top">
   <div class="navbar-inner navbar-nobg">
     <div class="container">
-    <div id="ipython_notebook" class="nav brand pull-left"><a href="{{base_url}}tree/{{notebook_path}}" alt='dashboard'><img src='{{static_url("base/images/ipynblogo.png") }}' alt='IPython Notebook'/></a></div>
+    <div id="ipython_notebook" class="nav navbar-brand pull-left"><a href="{{base_url}}tree/{{notebook_path}}" alt='dashboard'><img src='{{static_url("base/images/ipynblogo.png") }}' alt='IPython Notebook'/></a></div>
 
     {% block login_widget %}
 

IPython/html/templates/tree.html

@@ -30,7 +30,7 b' data-notebook-path="{{notebook_path}}"'
 
     <div class="tab-content">
     <div id="notebooks" class="tab-pane active">
-        <div id="notebook_toolbar" class="row-fluid">
+        <div id="notebook_toolbar" class="row">
             <div class="span8">
                 <form id='alternate_upload'  class='alternate_upload' >
                     <span id="notebook_list_info" style="position:absolute" >
@@ -41,14 +41,14 b' data-notebook-path="{{notebook_path}}"'
             </div>
             <div class="span4 clearfix">
                 <span id="notebook_buttons" class="pull-right">
-                    <button id="new_notebook" title="Create new notebook" class="btn btn-small">New Notebook</button>
-                    <button id="refresh_notebook_list" title="Refresh notebook list" class="btn btn-small"><i class="icon-refresh"></i></button>
+                    <button id="new_notebook" title="Create new notebook" class="btn btn-default btn-sm">New Notebook</button>
+                    <button id="refresh_notebook_list" title="Refresh notebook list" class="btn btn-default btn-sm"><i class="icon-refresh"></i></button>
                 </span>
             </div>
         </div>
 
         <div id="notebook_list">
-          <div id="notebook_list_header" class="row-fluid list_header">
+          <div id="notebook_list_header" class="row list_header">
               <div id="project_name">
                 <ul class="breadcrumb">
                     <li><a href="{{breadcrumbs[0][0]}}"><i class="icon-home"></i></a><span>/</span></li>
@@ -63,19 +63,19 b' data-notebook-path="{{notebook_path}}"'
     
     <div id="running" class="tab-pane">
 
-        <div id="running_toolbar" class="row-fluid">
+        <div id="running_toolbar" class="row">
             <div class="span8">
                 <span id="running_list_info">Currently running IPython notebooks</span>
             </div>
             <div class="span4" class="clearfix">
                 <span id="running_buttons" class="pull-right">
-                    <button id="refresh_running_list" title="Refresh running list" class="btn btn-small"><i class="icon-refresh"></i></button>
+                    <button id="refresh_running_list" title="Refresh running list" class="btn btn-default btn-sm"><i class="icon-refresh"></i></button>
                 </span>
             </div>
         </div>
 
         <div id="running_list">
-            <div id="running_list_header" class="row-fluid list_header"> 
+            <div id="running_list_header" class="row list_header"> 
                 <div> There are no notebooks running. </div>
             </div> 
         </div>
@@ -83,19 +83,19 b' data-notebook-path="{{notebook_path}}"'
     
     <div id="clusters" class="tab-pane">
 
-        <div id="cluster_toolbar" class="row-fluid">
+        <div id="cluster_toolbar" class="row">
             <div class="span8">
                 <span id="cluster_list_info">IPython parallel computing clusters</span>
             </div>
             <div class="span4" class="clearfix">
                 <span id="cluster_buttons" class="pull-right">
-                    <button id="refresh_cluster_list" title="Refresh cluster list" class="btn btn-small"><i class="icon-refresh"></i></button>
+                    <button id="refresh_cluster_list" title="Refresh cluster list" class="btn btn-default btn-sm"><i class="icon-refresh"></i></button>
                 </span>
             </div>
         </div>
 
         <div id="cluster_list">
-            <div id="cluster_list_header" class="row-fluid list_header">
+            <div id="cluster_list_header" class="row list_header">
                 <div class="profile_col span4">profile</div>
                 <div class="status_col span3">status</div>
                 <div class="engines_col span3" title="Enter the number of engines to start or empty for default"># of engines</div>

IPython/html/tests/widgets/widget_bool.js

@@ -31,7 +31,7 b' 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",

IPython/html/tests/widgets/widget_selection.js

@@ -15,7 +15,7 b' 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 b' 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 () {

IPython/html/tests/widgets/widget_selectioncontainer.js

@@ -62,7 +62,7 b' 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 b' 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 b' 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?');
     });