Commit 95b07624 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Corrige diseños usados en info de trashCollection 

Elimina contenedores de Dijit de diseños embeddedContentWithTopbar,
dynamicDualContent y chart.
parent b341c380

public/javascript/app/designs/chart/layout/SideAndTopAndBottomContent.js

+9 −10
Original line number Diff line number Diff line 
define([

	"dijit/layout/BorderContainer"

	, "dijit/layout/ContentPane"

	, "dojo/_base/declare"

	, "dojo/_base/lang"

	, "put-selector/put"

	'app/designs/base/_Layout'

	, 'dojo/_base/declare'

	, 'dojo/_base/lang'

	, 'put-selector/put'

], function(

	BorderContainer

	, ContentPane

	_Layout

	, declare

	, lang

	, put

) {

	return declare(ContentPane, {



	return declare(_Layout, {

		//	summary:

		//		Layout para diseño de vistas que contienen gráficas y añadidos a la misma.

public/javascript/app/designs/chart/layout/TopAndBottomContent.js

+21 −40
Original line number Diff line number Diff line 
define([

	"dijit/layout/LayoutContainer"

	, "dijit/layout/BorderContainer"

	, "dijit/layout/ContentPane"

	, "dojo/_base/declare"

	, "dojo/_base/lang"

	, "put-selector/put"

	'app/designs/base/_Layout'

	, 'dojo/_base/declare'

	, 'dojo/_base/lang'

	, 'put-selector/put'

], function(

	LayoutContainer

	, BorderContainer

	, ContentPane

	_Layout

	, declare

	, lang

	, put

) {

	return declare(BorderContainer, {



	return declare(_Layout, {

		//	summary:

		//		Layout para diseño de vistas que contienen gráficas y añadidos a la misma.



		constructor: function(args) {



			this.config = {

				'class': "chartTopAndBottomContent"

				layoutAdditionalClasses: 'chartTopAndBottomContent'

			};



			lang.mixin(this, this.config, args);
@@ -30,44 +27,28 @@ define([ 


			this.inherited(arguments);



			this._createChartsTopNode(this);

			this._createChartsNode(this);

			this._createChartsBottomNode(this);

			this._createChartsTopNode();

			this._createChartsNode();

			this._createChartsBottomNode();

		},



		_createChartsTopNode: function(container) {



			this.chartsTopNode = new ContentPane({

				region: "top",

				'class': "aboveChartContent"

			});

		_createChartsTopNode: function() {



			container.addChild(this.chartsTopNode);

			this.chartsTopNode = put(this.domNode, 'div.aboveChartContent');



			this.toolbarContainerChartsTopNode = put(this.chartsTopNode.domNode, 'div');

			this.toolbarContainerChartsTopNode = put(this.chartsTopNode, 'div');



			this.buttonsContainerChartsTopNode = put(this.chartsTopNode.domNode,

				"div.flexAndAlignCenter");

			this.buttonsContainerChartsTopNode = put(this.chartsTopNode, "div.flexAndAlignCenter");

		},



		_createChartsNode: function(container) {

		_createChartsNode: function() {



			this.chartsNode = new LayoutContainer({

				region: "center",

				'class': "centerChartContent"

			});



			container.addChild(this.chartsNode);

			this.chartsNode = put(this.domNode, 'div.centerChartContent');

		},



		_createChartsBottomNode: function(container) {



			this.chartsBottomNode = new ContentPane({

				region: "bottom",

				'class': "underChartContent"

			});

		_createChartsBottomNode: function() {



			container.addChild(this.chartsBottomNode);

			this.chartsBottomNode = put(this.domNode, 'div.underChartContent');

		}

	});

});

public/javascript/app/designs/chart/layout/TopContent.js

+18 −32
Original line number Diff line number Diff line 
define([

	"dijit/layout/LayoutContainer"

	, "dijit/layout/BorderContainer"

	, "dijit/layout/ContentPane"

	, "dojo/_base/declare"

	, "dojo/_base/lang"

	, "put-selector/put"

	'app/designs/base/_Layout'

	, 'dojo/_base/declare'

	, 'dojo/_base/lang'

	, 'put-selector/put'

], function(

	LayoutContainer

	, BorderContainer

	, ContentPane

	_Layout

	, declare

	, lang

	, put

) {

	return declare(BorderContainer, {



	return declare(_Layout, {

		//	summary:

		//		Layout para diseño de vistas que contienen gráficas y añadidos a la misma.



		constructor: function(args) {



			this.config = {

				'class': "chartTopContent"

				layoutAdditionalClasses: 'chartTopContent'

			};



			lang.mixin(this, this.config, args);
@@ -30,33 +27,22 @@ define([ 


			this.inherited(arguments);



			this._createChartsTopNode(this);

			this._createChartsNode(this);

			this._createChartsTopNode();

			this._createChartsNode();

		},



		_createChartsTopNode: function(container) {



			this.chartsTopNode = new ContentPane({

				region: "top",

				'class': "aboveChartContent"

			});

		_createChartsTopNode: function() {



			container.addChild(this.chartsTopNode);

			this.chartsTopNode = put(this.domNode, 'div.aboveChartContent');



			this.toolbarContainerChartsTopNode = put(this.chartsTopNode.domNode, 'div');

			this.toolbarContainerChartsTopNode = put(this.chartsTopNode, 'div');



			this.buttonsContainerChartsTopNode = put(this.chartsTopNode.domNode,

				"div.flexAndAlignCenter");

			this.buttonsContainerChartsTopNode = put(this.chartsTopNode, "div.flexAndAlignCenter");

		},



		_createChartsNode: function(container) {



			this.chartsNode = new LayoutContainer({

				region: "center",

				'class': "centerChartContent"

			});

		_createChartsNode: function() {



			container.addChild(this.chartsNode);

			this.chartsNode = put(this.domNode, 'div.centerChartContent');

		}

	});

});

public/javascript/app/designs/dynamicDualContent/layout/LeftSecondaryContent.js

+1 −2
Original line number Diff line number Diff line
@@ -15,8 +15,7 @@ define([ 
		constructor: function(args) {



			this.config = {

				secondaryContentRegion: "left",

				secondaryContentSplitter: true

				layoutAdditionalClasses: 'leftSecondaryContentLayoutDynamicDualContentDesign'

			};



			lang.mixin(this, this.config, args);

public/javascript/app/designs/dynamicDualContent/layout/TopSecondaryContent.js

+1 −2
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ define([ 
		constructor: function(args) {



			this.config = {

				secondaryContentRegion: "top",

				secondaryContentSplitter: false

				layoutAdditionalClasses: 'topSecondaryContentLayoutDynamicDualContentDesign'

			};



			lang.mixin(this, this.config, args);