mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-06 11:35:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

font awesome icon

Browse Source
This commit is contained in:
Sylvain Corlay 2015-02-10 21:36:50 -05:00
parent 274514cf73
commit da96d28620
6 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
IPython/html/static/widgets/js/widget_bool.js
View File

@ -129,10 +129,11 @@ define([
var description = this.model.get('description');
this.$el.attr("title", this.model.get("tooltip"));
if (description.trim().length === 0) {
this.$el.text(description);
var icon = this.model.get("icon");
$('<i class="fa"></i>').prependTo(this.$el).addClass(icon);
if (description.trim().length === 0 && icon.trim().length ===0) {
this.$el.html("&nbsp;"); // Preserve button height
} else {
this.$el.text(description);
}
}
return ToggleButtonView.__super__.update.apply(this);

8
IPython/html/static/widgets/js/widget_button.js
View File

@ -32,12 +32,12 @@ define([
*/
var description = this.model.get('description');
this.$el.attr("title", this.model.get("tooltip"));
if (description.length === 0) {
this.$el.text(description);
var icon = this.model.get("icon");
$('<i class="fa"></i>').prependTo(this.$el).addClass(icon);
if (description.trim().length === 0 && icon.trim().length ===0) {
this.$el.html("&nbsp;"); // Preserve button height
} else {
this.$el.text(description);
}
if (this.model.get('disabled')) {
this.$el.attr('disabled','disabled');
} else {

2
IPython/html/tests/widgets/widget_bool.js
View File

@ -49,7 +49,7 @@ casper.notebook_test(function () {
'Toggle button exists.');
this.test.assert(this.cell_element_function(bool_index,
widget_togglebutton_selector, 'html')=="Title",
widget_togglebutton_selector, 'html')=='<i class="fa"></i>Title',
'Toggle button labeled correctly.');
this.test.assert(this.cell_element_function(bool_index,

2
IPython/html/tests/widgets/widget_button.js
View File

@ -29,7 +29,7 @@ casper.notebook_test(function () {
'Widget button exists.');
this.test.assert(this.cell_element_function(button_index,
widget_button_selector, 'html')=='Title',
widget_button_selector, 'html')=='<i class="fa"></i>Title',
'Set button description.');
this.cell_element_function(button_index,

5
IPython/html/widgets/widget_bool.py
View File

@ -55,10 +55,15 @@ class ToggleButton(_Bool):
value of the toggle button: True-pressed, False-unpressed
description : str
description displayed next to the button
tooltip: str
tooltip caption of the toggle button
icon: str
font-awesome icon name
"""
_view_name = Unicode('ToggleButtonView', sync=True)
tooltip = Unicode(help="Tooltip caption of the toggle button.", sync=True)
icon = Unicode('', help= "Font-awesome icon.", sync=True)
button_style = CaselessStrEnum(
values=['primary', 'success', 'info', 'warning', 'danger', ''],

14
IPython/html/widgets/widget_button.py
View File

@ -24,15 +24,25 @@ from IPython.utils.warn import DeprecatedClass
@register('IPython.Button')
class Button(DOMWidget):
"""Button widget.
This widget has an `on_click` method that allows you to listen for the
user clicking on the button. The click event itself is stateless.
This widget has an `on_click` method that allows you to listen for the
user clicking on the button. The click event itself is stateless."""
Parameters
----------
description : str
description displayed next to the button
tooltip: str
tooltip caption of the toggle button
icon: str
font-awesome icon name
"""
_view_name = Unicode('ButtonView', sync=True)
# Keys
description = Unicode('', help="Button label.", sync=True)
tooltip = Unicode(help="Tooltip caption of the button.", sync=True)
disabled = Bool(False, help="Enable or disable user changes.", sync=True)
icon = Unicode('', help= "Font-awesome icon.", sync=True)
button_style = CaselessStrEnum(
values=['primary', 'success', 'info', 'warning', 'danger', ''],