Commit 74b12537 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Aplana tabs y muestra iconos en lugar de títulos

parent 162eaa59

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

+2 −1
Original line number Diff line number Diff line
@@ -114,7 +114,8 @@ define([ 


			this.formConfig = this._merge([{

				parentChannel: this.getChannel(),

				title: this.i18n.settings,

				//title: this.i18n.settings,

				iconClass: 'fa fa-cogs',

				region: "top",

				i18n: this.i18n,

				template: "viewers/views/templates/forms/Tracking",

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

+6 −25
Original line number Diff line number Diff line 
define([

	"app/redmicConfig"

	, "dijit/layout/BorderContainer"

	, "dijit/layout/ContentPane"

	, "dojo/_base/declare"

	, "dojo/_base/lang"

	, "dojo/aspect"
@@ -17,8 +15,6 @@ define([ 
	, "templates/TrackingPlatformList"

], function(

	redmicConfig

	, BorderContainer

	, ContentPane

	, declare

	, lang

	, aspect
@@ -157,32 +153,17 @@ define([ 


			this.inherited(arguments);



			var borderContainer = this._createBrowserWork();



			this.tabContainer.addChild(borderContainer, 0);



			this.tabContainer.selectChild(borderContainer);

			this._createBrowserWork();

		},



		_createBrowserWork: function() {



			var browserAndSearchContainer = new BorderContainer({

				title: this.i18n.Elements,

				'class': "marginedContainer noScrolledContainer"

			});



			this.browserWorkNode = new ContentPane({

				region: "center",

				'class': 'flexContainer'

			var addTabChannel = this._tabsDisplayer.getChannel('ADD_TAB');

			this._publish(addTabChannel, {

				title: this.i18n.data,

				iconClass: 'fa fa-table',

				channel: this.browserWork.getChannel()

			});



			this._publish(this.browserWork.getChannel("SHOW"), {

				node: this.browserWorkNode.domNode

			});



			browserAndSearchContainer.addChild(this.browserWorkNode);



			return browserAndSearchContainer;

		},



		_cleanElementByActivity: function(activityId) {

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

+2 −6
Original line number Diff line number Diff line
@@ -28,13 +28,9 @@ define([ 


		_fillSideContent: function() {



			this.inherited(arguments);



			var borderContainer = this._createBrowserWork();

			this._createBrowserWork();



			this.tabContainer.addChild(borderContainer, 0);



			this.tabContainer.selectChild(borderContainer);

			this.inherited(arguments);

		},



		_dataAvailable: function(items) {

public/javascript/app/viewers/views/RealTimeView.js

+2 −1
Original line number Diff line number Diff line
@@ -152,7 +152,8 @@ define([ 
			this.inherited(arguments);



			var browserAndSearchContainer = new LayoutContainer({

				title: this.i18n.list,

				iconClass: 'fa fa-table',

				//title: this.i18n.list,

				'class': 'marginedContainer noScrolledContainer'

			});

public/javascript/app/viewers/views/SpeciesDistributionView.js

+12 −12
Original line number Diff line number Diff line
@@ -400,7 +400,8 @@ define([ 
			this.inherited(arguments);



			var browserAndSearchContainer = new LayoutContainer({

				title: this.i18n.list,

				//title: this.i18n.list,

				iconClass: 'fr fr-crab',

				'class': "marginedContainer noScrolledContainer"

			});
@@ -425,15 +426,6 @@ define([ 
			browserAndSearchContainer.addChild(this.textSearchNode);

			browserAndSearchContainer.addChild(this.gridNode);



			this.treeNode = new ContentPane({

				title: this.i18n.tree,

				'class': "scrollWrapper"

			});



			this._publish(this.tree.getChannel("SHOW"), {

				node: this.treeNode.domNode

			});



			this._publish(this.gridLayer.getChannel('SET_PROPS'), {

				minZoom: this.grid5000MinZoom,

				currentGridLayer: this.currentGridLayer
@@ -448,7 +440,14 @@ define([ 
			this.tabs = this._tabsDisplayer._container;



			this.tabs.addChild(browserAndSearchContainer);

			this.tabs.addChild(this.treeNode);



			var addTabChannel = this._tabsDisplayer.getChannel('ADD_TAB');

			this._publish(addTabChannel, {

				title: this.i18n.tree,

				iconClass: 'fa fa-sitemap',

				channel: this.tree.getChannel()

			});



			this.tabs.addChild(this._createFilterSidebarContent());



			this._createAtlas();
@@ -783,7 +782,8 @@ define([ 
			// TODO cambiar por modulo form



			this.formWidget = new FormContainer({

				title: this.i18n.mode,

				//title: this.i18n.mode,

				iconClass: 'fa fa-cogs',

				region: "center",

				template: this.formTemplate,

				parentChannel: this.getChannel(),