From 469122cd60f6e722393e1de57e3c877161a805ec Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Thu, 11 Sep 2014 18:17:23 +0800 Subject: [PATCH] examples/bootstrap/dashboard1.bjs.377AMX examples/bootstrap/dashboard1.bjs examples/bootstrap/dashboard1.js.AH2AMX examples/bootstrap/dashboard1.js examples/bootstrap/dashboard1.bjs.9Q3AMX examples/bootstrap/dashboard1.js.WLXAMX --- examples/bootstrap/dashboard1.bjs | 18 ++++++++++++------ examples/bootstrap/dashboard1.js | 18 ++++++++++++------ 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/examples/bootstrap/dashboard1.bjs b/examples/bootstrap/dashboard1.bjs index 915e4e6f96..e262dd319c 100644 --- a/examples/bootstrap/dashboard1.bjs +++ b/examples/bootstrap/dashboard1.bjs @@ -13,8 +13,8 @@ "items" : [ { "String cls" : "header", - "tag" : "header", "xtype" : "Container", + "tag" : "header", "* xinclude" : "Dashboard.Header1", "$ xns" : "Roo.bootstrap" }, @@ -302,8 +302,8 @@ }, { "xtype" : "Header", - "Number level" : 4, "$ xns" : "Roo.bootstrap", + "Number level" : 4, "String html" : "With Icons" }, { @@ -330,8 +330,8 @@ }, { "xtype" : "Header", - "$ xns" : "Roo.bootstrap", "Number level" : 4, + "$ xns" : "Roo.bootstrap", "String html" : "With checkbox and radio" }, { @@ -357,8 +357,8 @@ }, { "xtype" : "Header", - "Number level" : 4, "$ xns" : "Roo.bootstrap", + "Number level" : 4, "String html" : "With buttons" }, { @@ -477,8 +477,8 @@ }, { "xtype" : "TextArea", - "String fieldLabel" : "Textarea", - "$ xns" : "Roo.bootstrap" + "$ xns" : "Roo.bootstrap", + "String fieldLabel" : "Textarea" }, { "xtype" : "TextArea", @@ -486,6 +486,12 @@ "Boolean disabled" : true, "$ xns" : "Roo.bootstrap", "String fieldLabel" : "Textarea" + }, + { + "xtype" : "Input", + "string placeholder" : "Enter ...", + "String fieldLabel" : "Text", + "$ xns" : "Roo.bootstrap" } ] } diff --git a/examples/bootstrap/dashboard1.js b/examples/bootstrap/dashboard1.js index 36e36fef49..2f3027fd61 100644 --- a/examples/bootstrap/dashboard1.js +++ b/examples/bootstrap/dashboard1.js @@ -21,8 +21,8 @@ dashboard1 = new Roo.XComponent({ items : [ Roo.apply(Dashboard.Header1._tree(), { cls : 'header', - tag : 'header', xtype : 'Container', + tag : 'header', xns : Roo.bootstrap }), { @@ -323,8 +323,8 @@ dashboard1 = new Roo.XComponent({ }, { xtype : 'Header', - level : 4, xns : Roo.bootstrap, + level : 4, html : 'With Icons' }, { @@ -351,8 +351,8 @@ dashboard1 = new Roo.XComponent({ }, { xtype : 'Header', - xns : Roo.bootstrap, level : 4, + xns : Roo.bootstrap, html : 'With checkbox and radio' }, { @@ -379,8 +379,8 @@ dashboard1 = new Roo.XComponent({ }, { xtype : 'Header', - level : 4, xns : Roo.bootstrap, + level : 4, html : 'With buttons' }, { @@ -517,8 +517,8 @@ dashboard1 = new Roo.XComponent({ }, { xtype : 'TextArea', - fieldLabel : 'Textarea', - xns : Roo.bootstrap + xns : Roo.bootstrap, + fieldLabel : 'Textarea' }, { xtype : 'TextArea', @@ -526,6 +526,12 @@ dashboard1 = new Roo.XComponent({ disabled : true, xns : Roo.bootstrap, fieldLabel : 'Textarea' + }, + { + xtype : 'Input', + placeholder : 'Enter ...', + fieldLabel : 'Text', + xns : Roo.bootstrap } ] -- 2.39.2