Recupera vistas de speciesCatalog y tracking (6db358f4) · Commits · REDMIC Project / Client / Web

public/javascript/app/base/views/extensions/_CompositeInTooltipFromIconKeypad.js

+3 −2

Original line number	Diff line number	Diff line
		@@ -56,7 +56,6 @@ define([
		aspect.before(this, "_initialize", lang.hitch(this, this._initializeBeforeCompositeView));
		aspect.before(this, "_defineSubscriptions", lang.hitch(this, this._initializeAfterCompositeView));
		aspect.after(this, "_defineSubscriptions", lang.hitch(this, this._defineCompositeSubcriptions));
		aspect.after(this, "postCreate", lang.hitch(this, this._postCompositeCreate));
		},

		_mixCompositeEventsAndActions: function () {
		@@ -103,7 +102,9 @@ define([
		}
		},

		_postCompositeCreate: function() {
		postCreate: function() {

		this.inherited(arguments);

		if (this.iconKeypadComposite) {

public/javascript/app/designs/mapWithSideContent/layout/MapAndContent.js

+3 −6

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

		this.config = {
		layoutAdditionalClasses: 'mapAndContentLayoutMapDesign'
		layoutAdditionalClasses: 'mapAndContentLayoutMapWithSideContentDesign'
		};

		lang.mixin(this, this.config, args);
		@@ -32,11 +32,8 @@ define([

		_createAndAddContent: function() {

		this.mapNode = put('div.mediumSolidContainer.borderRadius');
		this.contentNode = put('div.mediumSolidContainer.mapSideContainer.borderRadius');

		this.addChild(this.mapNode);
		this.addChild(this.contentNode);
		this.mapNode = put(this.domNode, 'div.mediumSolidContainer.mapContainer.borderRadius');
		this.contentNode = put(this.domNode, 'div.mediumSolidContainer.mapSideContainer.borderRadius');
		}
		});
		});

public/javascript/app/designs/mapWithSideContent/layout/MapAndContentAndTopbar.js

+21 −34

Original line number	Diff line number	Diff line
		define([
		"dijit/layout/BorderContainer"
		, "dijit/layout/ContentPane"
		, "dojo/_base/declare"
		, "dojo/_base/lang"
		'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 un mapa, contenido a la derecha y barra superior.

		constructor: function(args) {

		lang.mixin(this, args);
		this.config = {
		layoutAdditionalClasses: 'mapAndContentAndTopbarLayoutMapWithSideContentDesign'
		};

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

		postCreate: function() {

		this._createAndAddContent();

		this.inherited(arguments);

		this._createAndAddContent();
		},

		_createAndAddContent: function() {

		if (this.mapNode) {
		return this.mapNode;
		}

		this.topbarNode = new ContentPane({
		region: "top",
		'class': this.classTopbar \|\| "mediumSolidContainer rounded titleContainer"
		});

		this.mapNode = new ContentPane({
		region: "center",
		'class': "mediumSolidContainer borderRadius"
		});

		this.contentNode = new BorderContainer({
		region: "center"
		});

		this.contentNode.addChild(this.topbarNode);
		this.contentNode.addChild(this.mapNode);
		this.addChild(this.contentNode);
		this.contentNode.startup();
		this.topbarNode = put(this.domNode, 'div.mediumSolidContainer.rounded.titleContainer');
		this.centerNode = put(this.domNode, 'div.mapCenterContainer');
		this.mapNode = put(this.centerNode, 'div.mediumSolidContainer.mapContainer.borderRadius');
		this.contentNode = put(this.centerNode, 'div.mediumSolidContainer.mapSideContainer.borderRadius');
		}
		});
		});

public/javascript/app/designs/mapWithSideContent/main/Tracking.js

+14 −13

Original line number	Diff line number	Diff line
		@@ -7,7 +7,6 @@ define([
		, "app/designs/mapWithSideContent/layout/MapAndContentAndTopbar"
		, "app/redmicConfig"
		, 'd3/d3.min'
		, "dijit/layout/BorderContainer"
		, "dijit/layout/ContentPane"
		, "dijit/layout/TabContainer"
		, "dojo/_base/declare"
		@@ -33,7 +32,6 @@ define([
		, Layout
		, redmicConfig
		, d3
		, BorderContainer
		, ContentPane
		, TabContainer
		, declare
		@@ -104,10 +102,7 @@ define([
		_trackingTransitionRate: 900,
		_layerIdPrefix: "tracking",
		layerIdSeparator: "_",
		sideContentRegion: "right",
		_deltaProgress: 3600000,

		widthTabContainer: "col-xs-6 col-sm-6 col-md-5 col-lg-4"
		_deltaProgress: 3600000
		};

		lang.mixin(this, this.config, args);
		@@ -138,6 +133,7 @@ define([
		_setMainOwnCallbacksForEvents: function() {

		this.on([this.events.HIDE, this.events.ANCESTOR_HIDE], lang.hitch(this, this._onHide));
		this._onEvt('SHOW', lang.hitch(this, this._onTrackingMainShown));
		},

		_initializeMain: function() {
		@@ -207,24 +203,24 @@ define([
		_fillTopContent: function() {

		this._publish(this.progressSlider.getChannel("SHOW"), {
		node: this.topbarNode.domNode
		node: this.topbarNode
		});

		put(this.topbarNode.domNode, ".barSliderContainer");
		put(this.topbarNode, ".barSliderContainer");
		},

		_fillSideContent: function() {

		this.tabContainer = new TabContainer({
		splitter: true,
		region: this.sideContentRegion,
		'class': this.widthTabContainer + " mediumTexturedContainer sideTabContainer borderRadiusTabContainer"
		region: 'center',
		'class': "mediumTexturedContainer sideTabContainer borderRadiusTabContainer"
		});

		this.tabContainer.addChild(this._createSettings());
		this.tabContainer.addChild(this._createAtlas());

		this.contentNode.addChild(this.tabContainer);
		this.tabContainer.placeAt(this.contentNode);
		this.tabContainer.startup();
		},

		_createSettings: function() {
		@@ -655,6 +651,11 @@ define([
		this._emitEvt('PRESS_PROGRESS_BUTTON', {
		key: "PAUSE"
		});
		},

		_onTrackingMainShown: function() {

		this.tabContainer.resize();
		}
		});
		});

public/javascript/app/designs/mapWithSideContent/main/_TrackingByFilter.js

+1 −1

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

		_getIconKeypadNode: function() {

		return this.topbarNode.domNode;
		return this.topbarNode;
		}
		});
		});