Corrige visor de gráficas (5e9fa3f5) · Commits · REDMIC Project / Client / Web

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

+18 −57

Original line number	Diff line number	Diff line
		@@ -17,10 +17,9 @@ define([
		constructor: function(args) {

		this.config = {
		sideContentClass:
		"col-xs-5 col-sm-5 col-md-4 col-lg-3 mediumTexturedContainer mapSideContainer",
		sideContentSplitter: true,
		sideContentRegion: "right"
		layoutAdditionalClasses: 'sideAndTopAndBottomContentLayoutChartDesign',
		centerContentClass: "mediumSolidContainer.chartCenterContainer",
		sideContentClass: "mediumSolidContainer.chartSideContainer"
		};

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

		postCreate: function() {

		this.contentNode = new BorderContainer();

		this._createExtendedChartsNode(this.contentNode);
		this._createSideContentNode(this.contentNode);

		this.addChild(this.contentNode);
		this.contentNode.startup();

		this.inherited(arguments);
		},

		_createExtendedChartsNode: function(container) {
		this.centerNode = put(this.domNode, 'div.' + this.centerContentClass);

		var extendedChartsNode = new ContentPane({
		region: "center"
		}),
		bc = new BorderContainer();
		this._createChartsTopNode(this.centerNode);
		this._createChartsNode(this.centerNode);
		this._createChartsBottomNode(this.centerNode);

		this._createChartsTopNode(bc);
		this._createChartsNode(bc);
		this._createChartsBottomNode(bc);

		extendedChartsNode.addChild(bc);
		container.addChild(extendedChartsNode);
		this._createSideContentNode(this.domNode);
		},

		_createChartsTopNode: function(container) {

		this.chartsTopNode = new ContentPane({
		region: "top",
		'class': "aboveChartContent"
		});

		container.addChild(this.chartsTopNode);
		_createChartsTopNode: function(parentNode) {

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

		this.optionsContainerChartsTopNode = 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 ContentPane({
		region: "center"
		});
		_createChartsNode: function(parentNode) {

		container.addChild(this.chartsNode);
		this.chartsNode = put(parentNode, 'div.centerChartContent');
		},

		_createChartsBottomNode: function(container) {
		_createChartsBottomNode: function(parentNode) {

		this.chartsBottomNode = new ContentPane({
		region: "bottom",
		'class': "underChartContent"
		});

		container.addChild(this.chartsBottomNode);
		this.chartsBottomNode = put(parentNode, 'div.underChartContent');
		},

		_createSideContentNode: function(container) {

		this.sideNode = new ContentPane({
		region: this.sideContentRegion,
		'class': this.sideContentClass,
		splitter: this.sideContentSplitter
		});
		_createSideContentNode: function(parentNode) {

		container.addChild(this.sideNode);
		this.sideNode = put(parentNode, 'div.' + this.sideContentClass);
		}
		});
		});

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

+13 −20

Original line number	Diff line number	Diff line
		define([
		"dijit/layout/ContentPane"
		, "dojo/_base/declare"
		, "dojo/_base/lang"
		, "./_Layout"
		'dojo/_base/declare'
		, 'dojo/_base/lang'
		, 'put-selector/put'
		, './_Layout'
		], function(
		ContentPane
		, declare
		declare
		, lang
		, put
		, _Layout
		) {

		return declare(_Layout, {
		// summary:
		// Layout para zona de filtrado en el contenido secundario por la izquierda.

		constructor: function(args) {

		this.config = {};
		this.config = {
		layoutAdditionalClasses: 'facetsInLeftSecondaryContentLayoutDynamicDualContentDesign',
		secondaryContentClass: 'isolatedFacetsZone'
		};

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

		_createSecondaryNode: function(container) {

		var secondaryContent = new ContentPane({
		'class': "isolatedFacetsZone",
		region: "left"
		});

		container.addChild(secondaryContent);
		this.secondaryNode = secondaryContent.domNode;
		}
		});
		});

public/javascript/app/designs/dynamicDualContent/main/FacetsWithDynamicRightContent.js

+10 −9

Original line number	Diff line number	Diff line
		define([
		"app/designs/base/_Main"
		, "app/designs/dynamicDualContent/Controller"
		, "app/designs/dynamicDualContent/layout/FacetsInLeftSecondaryContent"
		, "dojo/_base/declare"
		, "dojo/_base/lang"
		'app/designs/base/_Main'
		, 'app/designs/dynamicDualContent/Controller'
		, 'app/designs/dynamicDualContent/layout/FacetsInLeftSecondaryContent'
		, 'dojo/_base/declare'
		, 'dojo/_base/lang'
		], function(
		_Main
		, Controller
		@@ -11,6 +11,7 @@ define([
		, declare
		, lang
		) {

		return declare([Layout, Controller, _Main], {
		// summary:
		// Main FacetsWithDynamicRightContent.
		@@ -18,7 +19,7 @@ define([
		constructor: function(args) {

		this.config = {
		ownChannel: "facetsWithDynamicRightContent"
		ownChannel: 'facetsWithDynamicRightContent'
		};

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

public/javascript/app/designs/list/layout/NoTitle.js

+1 −7

Original line number	Diff line number	Diff line
		@@ -27,13 +27,7 @@ define([

		this.inherited(arguments);

		this.keypadZoneNode = put("div.keypadZone");

		this.centerNode = put("div.fHeight");

		this.listNode = put(this.centerNode, "div.listZone" + this.classByList);

		this.addChild(this.centerNode);
		this.listNode = put(this.domNode, "div.listZone" + this.classByList);
		}
		});
		});
		No newline at end of file

public/javascript/redmic/modules/chart/SmartLegend/SmartLegend.js

+5 −6

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@ define([
		, "dojo/_base/declare"
		, "dojo/_base/lang"
		, "dojo/query"
		, 'put-selector/put'
		, "RWidgets/Utilities"
		, "redmic/modules/base/_Module"
		, "redmic/modules/base/_Show"
		@@ -23,6 +24,7 @@ define([
		, declare
		, lang
		, query
		, put
		, Utilities
		, _Module
		, _Show
		@@ -214,19 +216,16 @@ define([

		postCreate: function() {

		this.legendNode = new ContentPane({
		region: "center",
		'class': 'noScrolledContainer'
		});
		this.legendNode = put('div.chartSmartLegend');

		this._publish(this.chartsList.getChannel("SHOW"), {
		node: this.legendNode.domNode
		node: this.legendNode
		});
		},

		_getNodeToShow: function() {

		return this.legendNode.domNode;
		return this.legendNode;
		},

		_subLayerAdded: function(res) {