From 6412ddd739666bc4c427e071c360a7bbcf0f4c46 Mon Sep 17 00:00:00 2001 From: michael Date: Thu, 27 Nov 2014 12:15:44 +0800 Subject: [PATCH] examples/bootstrap/dashboard3.bjs examples/bootstrap/dashboard3.js --- examples/bootstrap/dashboard3.bjs | 24 +++++++++--------------- examples/bootstrap/dashboard3.js | 26 +++++++++----------------- 2 files changed, 18 insertions(+), 32 deletions(-) diff --git a/examples/bootstrap/dashboard3.bjs b/examples/bootstrap/dashboard3.bjs index 8ee752fa3e..4bd5037dbe 100644 --- a/examples/bootstrap/dashboard3.bjs +++ b/examples/bootstrap/dashboard3.bjs @@ -13,8 +13,8 @@ "items" : [ { "String cls" : "header", - "tag" : "header", "xtype" : "Container", + "tag" : "header", "* xinclude" : "Dashboard.Header1", "$ xns" : "Roo.bootstrap" }, @@ -62,8 +62,8 @@ "items" : [ { "Number md" : 3, - "xtype" : "Column", "Number lg" : 3, + "xtype" : "Column", "$ xns" : "Roo.bootstrap", "items" : [ { @@ -81,8 +81,8 @@ }, { "Number md" : 3, - "xtype" : "Column", "Number lg" : 3, + "xtype" : "Column", "$ xns" : "Roo.bootstrap", "items" : [ { @@ -100,8 +100,8 @@ }, { "Number md" : 3, - "xtype" : "Column", "Number lg" : 3, + "xtype" : "Column", "$ xns" : "Roo.bootstrap", "items" : [ { @@ -118,8 +118,8 @@ }, { "Number md" : 3, - "Number lg" : 3, "xtype" : "Column", + "Number lg" : 3, "$ xns" : "Roo.bootstrap", "items" : [ { @@ -142,8 +142,8 @@ "items" : [ { "Number md" : 6, - "xtype" : "Column", "Number lg" : 6, + "xtype" : "Column", "$ xns" : "Roo.bootstrap", "String style" : "", "Number sm" : 12, @@ -176,8 +176,8 @@ }, { "Number md" : 6, - "Number lg" : 6, "xtype" : "Column", + "Number lg" : 6, "$ xns" : "Roo.bootstrap", "String style" : "", "Number sm" : 12, @@ -221,8 +221,8 @@ "items" : [ { "g_y" : 200, - "xtype" : "Graph", "g_r" : 120, + "xtype" : "Graph", "graphtype" : "pie", "$ xns" : "Roo.bootstrap", "height" : 500, @@ -241,13 +241,7 @@ "items" : [ { "xtype" : "TabPane", - "$ xns" : "Roo.bootstrap.dash", - "items" : [ - { - "xtype" : "Graph", - "$ xns" : "Roo.bootstrap" - } - ] + "$ xns" : "Roo.bootstrap.dash" } ] } diff --git a/examples/bootstrap/dashboard3.js b/examples/bootstrap/dashboard3.js index d425573782..59206d869c 100644 --- a/examples/bootstrap/dashboard3.js +++ b/examples/bootstrap/dashboard3.js @@ -23,8 +23,8 @@ dashboard3 = new Roo.XComponent({ Roo.apply(Dashboard.Header1._tree(), { '|xns' : 'Roo.bootstrap', cls : 'header', - tag : 'header', xtype : 'Container', + tag : 'header', xns : Roo.bootstrap }), { @@ -79,8 +79,8 @@ dashboard3 = new Roo.XComponent({ { '|xns' : 'Roo.bootstrap', md : 3, - xtype : 'Column', lg : 3, + xtype : 'Column', xns : Roo.bootstrap, items : [ { @@ -101,8 +101,8 @@ dashboard3 = new Roo.XComponent({ { '|xns' : 'Roo.bootstrap', md : 3, - xtype : 'Column', lg : 3, + xtype : 'Column', xns : Roo.bootstrap, items : [ { @@ -123,8 +123,8 @@ dashboard3 = new Roo.XComponent({ { '|xns' : 'Roo.bootstrap', md : 3, - xtype : 'Column', lg : 3, + xtype : 'Column', xns : Roo.bootstrap, items : [ { @@ -144,8 +144,8 @@ dashboard3 = new Roo.XComponent({ { '|xns' : 'Roo.bootstrap', md : 3, - lg : 3, xtype : 'Column', + lg : 3, xns : Roo.bootstrap, items : [ { @@ -173,8 +173,8 @@ dashboard3 = new Roo.XComponent({ { '|xns' : 'Roo.bootstrap', md : 6, - xtype : 'Column', lg : 6, + xtype : 'Column', xns : Roo.bootstrap, style : '', sm : 12, @@ -213,8 +213,8 @@ dashboard3 = new Roo.XComponent({ { '|xns' : 'Roo.bootstrap', md : 6, - lg : 6, xtype : 'Column', + lg : 6, xns : Roo.bootstrap, style : '', sm : 12, @@ -267,8 +267,8 @@ dashboard3 = new Roo.XComponent({ { '|xns' : 'Roo.bootstrap', g_y : 200, - xtype : 'Graph', g_r : 120, + xtype : 'Graph', graphtype : 'pie', xns : Roo.bootstrap, height : 500, @@ -291,15 +291,7 @@ dashboard3 = new Roo.XComponent({ { '|xns' : 'Roo.bootstrap.dash', xtype : 'TabPane', - xns : Roo.bootstrap.dash, - items : [ - { - '|xns' : 'Roo.bootstrap', - xtype : 'Graph', - xns : Roo.bootstrap - } - ] - + xns : Roo.bootstrap.dash } ] -- 2.39.2