Added labels to basic widgets

IPython/html/static/notebook/js/widgets/bool.js

@@ -13,12 +13,14 require(["notebook/js/widget"], function(){
 
             var $label = $('<label />')
                 .addClass('checkbox')
+                .addClass('widget-label')
                 .appendTo(this.$el);
+            this.$checkbox_label = $('<div />')
+                .appendTo($label)
+                .hide();
             this.$checkbox = $('<input />')
                 .attr('type', 'checkbox')
                 .appendTo($label);
-            this.$checkbox_label = $('<div />')
-                .appendTo($label);
 
             this.update(); // Set defaults.
         },
@@ -28,7 +30,14 require(["notebook/js/widget"], function(){
         update : function(){
             if (!this.user_invoked_update) {
                 this.$checkbox.prop('checked', this.model.get('value'));
-                this.$checkbox_label.html(this.model.get('description'));
+
+                var description = this.model.get('description');
+                if (description.length == 0) {
+                    this.$checkbox_label.hide();
+                } else {
+                    this.$checkbox_label.html(description);
+                    this.$checkbox_label.show();
+                }
             }
             return IPython.WidgetView.prototype.update.call(this);
         },
@@ -71,7 +80,13 require(["notebook/js/widget"], function(){
                 } else {
                     this.$button.removeClass('active');
                 }
-                this.$button.html(this.model.get('description'));
+
+                var description = this.model.get('description');
+                if (description.length == 0) {
+                    this.$button.html(' '); // Preserve button height
+                } else {
+                    this.$button.html(description);
+                }
             }
             return IPython.WidgetView.prototype.update.call(this);
         },

IPython/html/static/notebook/js/widgets/button.js

@@ -22,7 +22,13 require(["notebook/js/widget"], function(){
         // Handles: Backend -> Frontend Sync
         //          Frontent -> Frontend Sync
         update : function(){
-            this.$el.html(this.model.get('description'));
+            var description = this.model.get('description');
+            if (description.length==0) {
+                this.$el.html(' '); // Preserve button height
+            } else {
+                this.$el.html(description);
+            }
+            
             return IPython.WidgetView.prototype.update.call(this);
         },
         

IPython/html/static/notebook/js/widgets/float_range.js

@@ -8,6 +8,10 require(["notebook/js/widget"], function(){
         render : function(){
             this.$el
                 .html('');
+            this.$label = $('<div />')
+                .appendTo(this.$el)
+                .addClass('widget-label')
+                .hide();
             this.$slider = $('<div />')
                 .slider({})
                 .addClass('slider');
@@ -34,6 +38,14 require(["notebook/js/widget"], function(){
                     this.$slider.slider("option", key, this.model.get(key));
                 }
             }
+
+            var description = this.model.get('description');
+            if (description.length == 0) {
+                this.$label.hide();
+            } else {
+                this.$label.html(description);
+                this.$label.show();
+            }
             return IPython.WidgetView.prototype.update.call(this);
         },
         
@@ -54,6 +66,10 require(["notebook/js/widget"], function(){
         render : function(){
             this.$el
                 .html('');
+            this.$label = $('<div />')
+                .appendTo(this.$el)
+                .addClass('widget-label')
+                .hide();
             this.$textbox = $('<input type="text" />')
                 .addClass('input')
                 .appendTo(this.$el);
@@ -73,6 +89,14 require(["notebook/js/widget"], function(){
             } else {
                 this.$textbox.removeAttr('disabled');
             }
+
+            var description = this.model.get('description');
+            if (description.length == 0) {
+                this.$label.hide();
+            } else {
+                this.$label.html(description);
+                this.$label.show();
+            }
             return IPython.WidgetView.prototype.update.call(this);
         },
         

IPython/html/static/notebook/js/widgets/int_range.js

@@ -8,6 +8,10 require(["notebook/js/widget"], function(){
         render : function(){
             this.$el
                 .html('');
+            this.$label = $('<div />')
+                .appendTo(this.$el)
+                .addClass('widget-label')
+                .hide();
             this.$slider = $('<div />')
                 .slider({})
                 .addClass('slider');
@@ -34,6 +38,14 require(["notebook/js/widget"], function(){
                     this.$slider.slider("option", key, this.model.get(key));
                 }
             }
+
+            var description = this.model.get('description');
+            if (description.length == 0) {
+                this.$label.hide();
+            } else {
+                this.$label.html(description);
+                this.$label.show();
+            }
             return IPython.WidgetView.prototype.update.call(this);
         },
         
@@ -53,6 +65,10 require(["notebook/js/widget"], function(){
         render : function(){
             this.$el
                 .html('');
+            this.$label = $('<div />')
+                .appendTo(this.$el)
+                .addClass('widget-label')
+                .hide();
             this.$textbox = $('<input type="text" />')
                 .addClass('input')
                 .appendTo(this.$el);
@@ -72,6 +88,14 require(["notebook/js/widget"], function(){
             } else {
                 this.$textbox.removeAttr('disabled');
             }
+
+            var description = this.model.get('description');
+            if (description.length == 0) {
+                this.$label.hide();
+            } else {
+                this.$label.html(description);
+                this.$label.show();
+            }
             return IPython.WidgetView.prototype.update.call(this);
         },
         

IPython/html/static/notebook/js/widgets/selection.js

@@ -9,6 +9,10 require(["notebook/js/widget"], function(){
             
             this.$el
                 .html('');
+            this.$label = $('<div />')
+                .appendTo(this.$el)
+                .addClass('widget-label')
+                .hide();
             this.$buttongroup = $('<div />')
                                 .addClass('widget_item')
                                 .addClass('btn-group')
@@ -42,7 +46,7 require(["notebook/js/widget"], function(){
                 var item_button = $('<a href="#"/>')
                     .html(items[index])
                     .on('click', function(e){
-                        that.model.set('value', $(e.target).html(), this );
+                        that.model.set('value', $(e.target).html(), this);
                         that.model.update_other_views(that);
                     })
                 
@@ -60,6 +64,14 require(["notebook/js/widget"], function(){
                 this.$dropbutton.removeAttr('disabled');
                 this.$droplist.removeAttr('disabled');
             }
+
+            var description = this.model.get('description');
+            if (description.length == 0) {
+                this.$label.hide();
+            } else {
+                this.$label.html(description);
+                this.$label.show();
+            }
             return IPython.WidgetView.prototype.update.call(this);
         },
         
@@ -73,6 +85,10 require(["notebook/js/widget"], function(){
         render : function(){
             this.$el
                 .html('');
+            this.$label = $('<div />')
+                .appendTo(this.$el)
+                .addClass('widget-label')
+                .hide();
             this.update();
         },
         
@@ -124,6 +140,14 require(["notebook/js/widget"], function(){
                     $(obj).parent().remove();
                 }
             });
+
+            var description = this.model.get('description');
+            if (description.length == 0) {
+                this.$label.hide();
+            } else {
+                this.$label.html(description);
+                this.$label.show();
+            }
             return IPython.WidgetView.prototype.update.call(this);
         },
         
@@ -138,6 +162,10 require(["notebook/js/widget"], function(){
         render : function(){
             this.$el
                 .html('');
+            this.$label = $('<div />')
+                .appendTo(this.$el)
+                .addClass('widget-label')
+                .hide();
             this.$buttongroup = $('<div />')
                 .addClass('btn-group')
                 .attr('data-toggle', 'buttons-radio')
@@ -189,6 +217,14 require(["notebook/js/widget"], function(){
                     $(obj).remove();
                 }
             });
+
+            var description = this.model.get('description');
+            if (description.length == 0) {
+                this.$label.hide();
+            } else {
+                this.$label.html(description);
+                this.$label.show();
+            }
             return IPython.WidgetView.prototype.update.call(this);
         },
         

IPython/html/static/notebook/js/widgets/string.js

@@ -27,6 +27,10 require(["notebook/js/widget"], function(){
         render : function(){
             this.$el
                 .html('');
+            this.$label = $('<div />')
+                .appendTo(this.$el)
+                .addClass('widget-label')
+                .hide();
             this.$textbox = $('<textarea />')
                 .attr('rows', 5)
                 .appendTo(this.$el);
@@ -39,6 +43,14 require(["notebook/js/widget"], function(){
             if (!this.user_invoked_update) {
                 this.$textbox.val(this.model.get('value'));
             }
+
+            var description = this.model.get('description');
+            if (description.length == 0) {
+                this.$label.hide();
+            } else {
+                this.$label.html(description);
+                this.$label.show();
+            }
             return IPython.WidgetView.prototype.update.call(this);
         },
         
@@ -63,6 +75,10 require(["notebook/js/widget"], function(){
         render : function(){
             this.$el
                 .html('');
+            this.$label = $('<div />')
+                .addClass('widget-label')
+                .appendTo(this.$el)
+                .hide();
             this.$textbox = $('<input type="text" />')
                 .addClass('input')
                 .appendTo(this.$el);
@@ -75,6 +91,14 require(["notebook/js/widget"], function(){
             if (!this.user_invoked_update) {
                 this.$textbox.val(this.model.get('value'));
             }
+
+            var description = this.model.get('description');
+            if (description.length == 0) {
+                this.$label.hide();
+            } else {
+                this.$label.html(description);
+                this.$label.show();
+            }
             return IPython.WidgetView.prototype.update.call(this);
         },
         

IPython/html/widgets/widget_float.py

@@ -24,6 +24,7 class FloatWidget(Widget):
     default_view_name = Unicode('FloatTextView')
 
     # Keys
-    _keys = ['value', 'disabled']
+    _keys = ['value', 'disabled', 'description']
     value = Float(0.0, help="Float value") 
     disabled = Bool(False, help="Enable or disable user changes")
+    description = Unicode(help="Description of the value this widget represents")

IPython/html/widgets/widget_float_range.py

@@ -24,10 +24,11 class FloatRangeWidget(Widget):
     default_view_name = Unicode('FloatSliderView')
 
     # Keys
-    _keys = ['value', 'step', 'max', 'min', 'disabled', 'orientation']
+    _keys = ['value', 'step', 'max', 'min', 'disabled', 'orientation', 'description']
     value = Float(0.0, help="Flaot value") 
     max = Float(100.0, help="Max value")
     min = Float(0.0, help="Min value")
     disabled = Bool(False, help="Enable or disable user changes")
     step = Float(0.1, help="Minimum step that the value can take (ignored by some views)")
     orientation = Unicode(u'horizontal', help="Vertical or horizontal (ignored by some views)")
+    description = Unicode(help="Description of the value this widget represents")

IPython/html/widgets/widget_int.py

@@ -24,6 +24,7 class IntWidget(Widget):
     default_view_name = Unicode('IntTextView')
 
     # Keys
-    _keys = ['value', 'disabled']
+    _keys = ['value', 'disabled', 'description']
     value = Int(0, help="Int value") 
     disabled = Bool(False, help="Enable or disable user changes")
+    description = Unicode(help="Description of the value this widget represents")

IPython/html/widgets/widget_int_range.py

@@ -24,10 +24,11 class IntRangeWidget(Widget):
     default_view_name = Unicode('IntSliderView')
 
     # Keys
-    _keys = ['value', 'step', 'max', 'min', 'disabled', 'orientation']
+    _keys = ['value', 'step', 'max', 'min', 'disabled', 'orientation', 'description']
     value = Int(0, help="Int value") 
     max = Int(100, help="Max value")
     min = Int(0, help="Min value")
     disabled = Bool(False, help="Enable or disable user changes")
     step = Int(1, help="Minimum step that the value can take (ignored by some views)")
     orientation = Unicode(u'horizontal', help="Vertical or horizontal (ignored by some views)")
+    description = Unicode(help="Description of the value this widget represents")

IPython/html/widgets/widget_selection.py

@@ -24,8 +24,9 class SelectionWidget(Widget):
     default_view_name = Unicode('DropdownView')
 
     # Keys
-    _keys = ['value', 'values', 'disabled']
+    _keys = ['value', 'values', 'disabled', 'description']
     value = Unicode(help="Selected value")
     values = List(help="List of values the user can select")
     disabled = Bool(False, help="Enable or disable user changes")
+    description = Unicode(help="Description of the value this widget represents")
  
  No newline at end of file

IPython/html/widgets/widget_string.py

@@ -24,6 +24,7 class StringWidget(Widget):
     default_view_name = Unicode('TextBoxView')
 
     # Keys
-    _keys = ['value', 'disabled']
+    _keys = ['value', 'disabled', 'description']
     value = Unicode(help="String value")
     disabled = Bool(False, help="Enable or disable user changes")
+    description = Unicode(help="Description of the value this widget represents")