Commit ff99a127 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Corrige Atlas y catalog OGC para nueva disposición 

Introduce borrado de propiedad widgetid en domNode de módulos, para
evitar errores por falta de region de Dijit.

El visor de Atlas se comporta de forma responsive, cambiando
distribución horizontal o vertical según el espacio disponible.

Corrige algunos diseños, para heredar de _Layout en lugar de
ContentPane y colocar los nodos correctamente, y dejando de heredar de
_View, que se aplicará automáticamente en el futuro.

Corrige traducción de mantenimiento en Sidebar, no tiene sentido
abreviar palabras ahí (y menos aún si solo se hace en uno de los
idiomas). En su lugar, se añade elipsis cuando no quepa una etiqueta.
parent 361937bb

public/javascript/app/base/views/Module.js

+22 −14
Original line number Diff line number Diff line 
define([

	"dojo/_base/declare"

	, "dijit/_WidgetBase"

	, "dijit/_TemplatedMixin"

	, "dojo/_base/lang"

	, 'put-selector/put'

], function(

	declare

	, _WidgetBase

	, _TemplatedMixin

	, lang

) {		return declare([_WidgetBase, _TemplatedMixin], {

	, put

) {



	return declare(null, {

		//	summary:

		//		Widget para la creación de un elemento boton

		//
@@ -33,20 +33,28 @@ define([ 
		// 	Url del módulo

		url: null,





		constructor: function(args) {



			lang.mixin(this, args);



			var item;

			if (this.domain) {

				this.templateString = "<a class='boxButton' href='" + this.url +

					"' d-state-url=true>" + "<div class='name mediumTexturedContainer colorWhite'><span>" +

					this.name + "</span></div></a>";

				this.moduleNode = put('a.boxButton[href="' + this.url + '"][d-state-url=true]');

				item = put(this.moduleNode, 'div.name.mediumSolidContainer.colorWhite');

				put(item, 'span', this.name);

			} else {

				this.templateString = "<a title='" + this.name +

					"' class='module' href='" + this.url + "' d-state-url=true>" +

					"<div class='button mediumTexturedContainer colorWhite'>" +

					"<i class='" + this.icon + " iconModule'></i><div class='name'>" + this.name + "</div></div></a>";

				this.moduleNode = put('a.module[title="' + this.name + '"][href="' + this.url + '"][d-state-url=true]');

				item = put(this.moduleNode, 'div.button.mediumSolidContainer.colorWhite');

				put(item, 'i.iconModule.' + this.icon.replace(/\ /g, '.'));

				put(item, 'div.name', this.name);

			}

		},



		// TODO reemplazo de método de Dijit, eliminar si deja de usarse

		placeAt: function(node) {



			put(node, this.moduleNode);

		}

	});

});

public/javascript/app/base/views/_View.js

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

	"dijit/layout/ContentPane"

	, "dojo/_base/declare"

	"dojo/_base/declare"

	, "dojo/_base/lang"

	, "dojo/aspect"

	, "redmic/modules/base/_Module"

	, "redmic/modules/base/_Show"

	, "app/base/views/_ListenRequestError"

	, "app/base/views/_ViewHandle"	// QUITAR

], function(

	ContentPane

	, declare

	declare

	, lang

	, aspect

	, _Module

	, _Show

	, _ListenRequestError

	, _ViewHandle	// QUITAR

){

	return declare([_ListenRequestError, _ViewHandle/*, ContentPane*/, _Module, _Show], {

	return declare([_ListenRequestError, _ViewHandle], {

		//	summary:

		//		Base común para todas los módulos usados como vistas.

public/javascript/app/designs/details/Layout.js

+15 −12
Original line number Diff line number Diff line 
define([

	"dijit/layout/ContentPane"

	, "dojo/_base/declare"

	, "dojo/_base/lang"

	, "dojo/aspect"

	, "put-selector/put"

	'app/designs/base/_Layout'

	, 'dojo/_base/declare'

	, 'dojo/_base/lang'

	, 'dojo/aspect'

	, 'put-selector/put'

], function (

	ContentPane

	_Layout

	, declare

	, lang

	, aspect

	, put

){

	return declare(ContentPane, {

	return declare(_Layout, {

		//	summary:

		//		Layout para vistas de detalle.



		constructor: function(args) {



			lang.mixin(this, args);

			this.config = {

				layoutAdditionalClasses: 'infoView'

			};



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

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



			this.centerNode = put('div.infoContainer');

		},



		postCreate: function() {



			put(this.containerNode, ".infoView");

			put(this.containerNode, this.centerNode);



			this.inherited(arguments);



			this.addChild(this.centerNode);

		}

	});

});

public/javascript/app/designs/details/_AddTitle.js

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ define([ 
				put(this.titleNode, ".centerTitle");

			}



			put(this.containerNode.firstChild, "-", this.topNode);

			put(this._layoutContainer.firstChild, "-", this.topNode);

		},



		_addDataInTitle: function() {

public/javascript/app/designs/list/Controller.js

+3 −5
Original line number Diff line number Diff line 
define([

	"app/base/views/_View"

	, "app/designs/base/_Browser"

	"app/designs/base/_Browser"

	, "app/designs/base/_Controller"

	, "dojo/_base/declare"

	, "dojo/_base/lang"

], function (

	_View

	, _Browser

	_Browser

	, _Controller

	, declare

	, lang

){

	return declare([_View, _Controller, _Browser], {

	return declare([_Controller, _Browser], {

		//	summary:

		//		Layout para vistas que contienen un buscador de texto y un listado.