diff --git a/IPython/html/static/notebook/js/widgets/string.js b/IPython/html/static/notebook/js/widgets/string.js
index d48051e..a50915a 100644
--- a/IPython/html/static/notebook/js/widgets/string.js
+++ b/IPython/html/static/notebook/js/widgets/string.js
@@ -18,7 +18,7 @@ define(["notebook/js/widget"], function(widget_manager){
var StringWidgetModel = IPython.WidgetModel.extend({});
widget_manager.register_widget_model('StringWidgetModel', StringWidgetModel);
- var LabelView = IPython.WidgetView.extend({
+ var HTMLView = IPython.WidgetView.extend({
// Called when view is rendered.
render : function(){
@@ -34,7 +34,7 @@ define(["notebook/js/widget"], function(widget_manager){
});
- widget_manager.register_widget_view('LabelView', LabelView);
+ widget_manager.register_widget_view('HTMLView', HTMLView);
var TextAreaView = IPython.WidgetView.extend({
diff --git a/examples/widgets/D3.ipynb b/examples/widgets/D3.ipynb
index aa332c5..ee39cb9 100644
--- a/examples/widgets/D3.ipynb
+++ b/examples/widgets/D3.ipynb
@@ -967,7 +967,7 @@
"metadata": {},
"output_type": "display_data",
"text": [
- ""
+ ""
]
}
],
diff --git a/examples/widgets/Dialogs.ipynb b/examples/widgets/Dialogs.ipynb
index 6e71286..813a653 100644
--- a/examples/widgets/Dialogs.ipynb
+++ b/examples/widgets/Dialogs.ipynb
@@ -49,7 +49,7 @@
" dialog = widgets.ContainerWidget(visible=False)\n",
" dialog_header = widgets.ContainerWidget(parent=dialog)\n",
" dialog_header_close = widgets.ButtonWidget(parent=dialog_header, description = '×')\n",
- " dialog_header_label = widgets.StringWidget(parent=dialog_header, default_view_name='LabelView')\n",
+ " dialog_header_label = widgets.StringWidget(parent=dialog_header, default_view_name='HTMLView')\n",
" dialog_body = widgets.ContainerWidget(parent=dialog)\n",
" dialog_footer = widgets.ContainerWidget(parent=dialog)\n",
" \n",
@@ -116,7 +116,7 @@
" yes_button.on_click(handle_yes)\n",
" no_button = widgets.ButtonWidget(parent=dialog_footer, description='No')\n",
" no_button.on_click(handle_no)\n",
- " prompt_label = widgets.StringWidget(parent=dialog_body, value=scrub_text_html(prompt), default_view_name='LabelView')\n",
+ " prompt_label = widgets.StringWidget(parent=dialog_body, value=scrub_text_html(prompt), default_view_name='HTMLView')\n",
" \n",
" display(yes_button)\n",
" display(no_button)\n",
diff --git a/examples/widgets/Export As (nbconvert).ipynb b/examples/widgets/Export As (nbconvert).ipynb
index fcfb57e..3f2061b 100644
--- a/examples/widgets/Export As (nbconvert).ipynb
+++ b/examples/widgets/Export As (nbconvert).ipynb
@@ -62,14 +62,14 @@
"outputs": [
{
"javascript": [
- "var model = IPython.notebook.kernel.comm_manager.comms['79dbd18695b3432b94e2265533474474'].model;\n",
+ "var model = IPython.notebook.kernel.comm_manager.comms['af0fadc224134034af6141995abf625a'].model;\n",
"model.set('value', IPython.notebook.notebook_name);\n",
"model.save();"
],
"metadata": {},
"output_type": "display_data",
"text": [
- ""
+ ""
]
}
],
@@ -117,7 +117,7 @@
"exporter_names = widgets.SelectionWidget(parent=options, values=get_export_names(), value='html')\n",
"export_button = widgets.ButtonWidget(parent=options, description=\"Export\")\n",
"\n",
- "download_link = widgets.StringWidget(parent=container, default_view_name=\"LabelView\", visible=False)"
+ "download_link = widgets.StringWidget(parent=container, default_view_name=\"HTMLView\", visible=False)"
],
"language": "python",
"metadata": {},
diff --git a/examples/widgets/File Upload Widget.ipynb b/examples/widgets/File Upload Widget.ipynb
index 7818786..370e579 100644
--- a/examples/widgets/File Upload Widget.ipynb
+++ b/examples/widgets/File Upload Widget.ipynb
@@ -19,6 +19,7 @@
"input": [
"from __future__ import print_function # py 2.7 compat\n",
"\n",
+ "import base64\n",
"from IPython.html import widgets # Widget definitions\n",
"from IPython.display import display # Used to display widgets in the notebook"
],
diff --git a/examples/widgets/Part 1 - Basics.ipynb b/examples/widgets/Part 1 - Basics.ipynb
index 72d2745..0dacb7f 100644
--- a/examples/widgets/Part 1 - Basics.ipynb
+++ b/examples/widgets/Part 1 - Basics.ipynb
@@ -313,7 +313,7 @@
"| | RadioButtonsView |\n",
"| | *DropdownView* |\n",
"| | ListBoxView |\n",
- "| StringWidget | LabelView |\n",
+ "| StringWidget | HTMLView |\n",
"| | TextAreaView |\n",
"| | *TextBoxView* |\n"
]
diff --git a/examples/widgets/Part 4 - Styles.ipynb b/examples/widgets/Part 4 - Styles.ipynb
index 439053a..f50422c 100644
--- a/examples/widgets/Part 4 - Styles.ipynb
+++ b/examples/widgets/Part 4 - Styles.ipynb
@@ -130,7 +130,7 @@
"container.set_css({'padding': '6px', # Add padding to the container\n",
" 'background': 'yellow'}) # Fill the container yellow\n",
"\n",
- "label = widgets.StringWidget(default_view_name=\"LabelView\", parent=container)\n",
+ "label = widgets.StringWidget(default_view_name=\"HTMLView\", parent=container)\n",
"label.value = \"ALERT: Hello World!\"\n",
"\n",
"display(container)"
@@ -197,10 +197,10 @@
"input": [
"container = widgets.ContainerWidget()\n",
"container.set_css({'border': '3px solid black',\n",
- " 'padding': '6px',\n",
+ " 'padding': '6px', \n",
" 'background': 'yellow'}) \n",
"\n",
- "label = widgets.StringWidget(default_view_name=\"LabelView\", parent=container) \n",
+ "label = widgets.StringWidget(default_view_name=\"HTMLView\", parent=container)\n",
"label.value = \"ALERT: Hello World!\"\n",
"\n",
"display(container)\n",
@@ -223,7 +223,7 @@
"collapsed": false,
"input": [
"label = widgets.StringWidget(value = \"ALERT: Hello World!\")\n",
- "display(label, view_name=\"LabelView\")\n",
+ "display(label, view_name=\"HTMLView\")\n",
"\n",
"# Apply twitter bootstrap alert class to the label.\n",
"label.add_class(\"alert\")"
@@ -312,7 +312,7 @@
"input": [
"import time\n",
"label = widgets.StringWidget(value = \"ALERT: Hello World!\")\n",
- "display(label, view_name=\"LabelView\")\n",
+ "display(label, view_name=\"HTMLView\")\n",
"\n",
"# Apply twitter bootstrap alert class to the label.\n",
"label.add_class(\"alert\")\n",
diff --git a/examples/widgets/Part 5 - Alignment.ipynb b/examples/widgets/Part 5 - Alignment.ipynb
index 629b4e0..4e434ad 100644
--- a/examples/widgets/Part 5 - Alignment.ipynb
+++ b/examples/widgets/Part 5 - Alignment.ipynb
@@ -123,7 +123,7 @@
"}\n",
"\n",
"def make_container(title):\n",
- " display(widgets.StringWidget(default_view_name='LabelView', value='
' + title + '
'))\n",
+ " display(widgets.StringWidget(default_view_name='HTMLView', value='
' + title + '
'))\n",
" container = widgets.ContainerWidget()\n",
" container.set_css('background', '#999999')\n",
" display(container)\n",
@@ -132,7 +132,7 @@
"def fill_container(container):\n",
" components = []\n",
" for i in range(3):\n",
- " components.append(widgets.StringWidget(parent=container, default_view_name='LabelView', value=\"ABC\"[i]))\n",
+ " components.append(widgets.StringWidget(parent=container, default_view_name='HTMLView', value=\"ABC\"[i]))\n",
" components[i].set_css(child_style)\n",
" display(components[i])\n",
" \n",
@@ -197,7 +197,7 @@
" components.append(widgets.ContainerWidget(parent=container))\n",
" components[i].set_css(child_style)\n",
" \n",
- " label = widgets.StringWidget(parent=components[i], default_view_name='LabelView', value=str(flexes[i]))\n",
+ " label = widgets.StringWidget(parent=components[i], default_view_name='HTMLView', value=str(flexes[i]))\n",
" \n",
" if flexes[i] == 0:\n",
" components[i].flex0()\n",
@@ -250,7 +250,7 @@
"def fill_container(container):\n",
" components = []\n",
" for i in range(3):\n",
- " components.append(widgets.StringWidget(parent=container, default_view_name='LabelView', value=\"ABC\"[i]))\n",
+ " components.append(widgets.StringWidget(parent=container, default_view_name='HTMLView', value=\"ABC\"[i]))\n",
" components[i].set_css(child_style)\n",
" components[i].set_css('height', str((i+1) * 50) + 'px')\n",
" display(components[i])\n",
diff --git a/examples/widgets/Variable Inspector.ipynb b/examples/widgets/Variable Inspector.ipynb
index f2e7a48..964bc64 100644
--- a/examples/widgets/Variable Inspector.ipynb
+++ b/examples/widgets/Variable Inspector.ipynb
@@ -45,13 +45,13 @@
"_popout.button_text = _popout.description\n",
"_popout.vbox()\n",
"\n",
- "_modal_header_execs_label = widgets.StringWidget(parent=_popout, default_view_name=\"LabelView\")\n",
+ "_modal_header_execs_label = widgets.StringWidget(parent=_popout, default_view_name=\"HTMLView\")\n",
"_modal_header_execs_label.execs = 0\n",
"\n",
"_modal_body = widgets.ContainerWidget(parent=_popout)\n",
"_modal_body.flex1()\n",
"_modal_body.set_css('overflow-y', 'scroll')\n",
- "_modal_body_label = widgets.StringWidget(parent=_modal_body, default_view_name=\"LabelView\")\n",
+ "_modal_body_label = widgets.StringWidget(parent=_modal_body, default_view_name=\"HTMLView\")\n",
"_modal_body_label.value = 'Not hooked'\n",
"\n",
"_modal_footer = widgets.ContainerWidget(parent=_popout)\n",
diff --git a/examples/widgets/Widget Tester.ipynb b/examples/widgets/Widget Tester.ipynb
index 8aaaf6d..2aecf54 100644
--- a/examples/widgets/Widget Tester.ipynb
+++ b/examples/widgets/Widget Tester.ipynb
@@ -122,15 +122,15 @@
" except:\n",
" pass\n",
" \n",
- " doc_label = widgets.StringWidget(parent=new_modal,default_view_name='LabelView', value=doc_str)\n",
+ " doc_label = widgets.StringWidget(parent=new_modal,default_view_name='HTMLView', value=doc_str)\n",
" doc_label.set_css('color', 'blue')\n",
" exec_box = widgets.ContainerWidget(parent=new_modal)\n",
" exec_box.hbox()\n",
" exec_box.pack_center()\n",
" exec_box.align_center()\n",
- " open_label = widgets.StringWidget(parent=exec_box,default_view_name='LabelView', value=method_name+'( ')\n",
+ " open_label = widgets.StringWidget(parent=exec_box,default_view_name='HTMLView', value=method_name+'( ')\n",
" exec_str = widgets.StringWidget(parent=exec_box)\n",
- " close_label = widgets.StringWidget(parent=exec_box,default_view_name='LabelView', value=' )')\n",
+ " close_label = widgets.StringWidget(parent=exec_box,default_view_name='HTMLView', value=' )')\n",
" button_row = widgets.ContainerWidget(parent=new_modal)\n",
" button_row.hbox()\n",
" button_row.pack_end()\n",