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

Actualiza favoritos y mide windowTitle en relativo

parent 6d2e74cb

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

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ define([ 
					"' d-state-url=true>" + "<div class='name mediumTexturedContainer colorWhite'>" + this.name + "</div></a>";

			} else {

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

					"' class='col-xs-12 col-sm-6 col-md-6 col-lg-3 module' href='" + this.url + "' d-state-url=true>" +

					"' 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>";

			}

public/javascript/app/home/views/WidgetFavourites.js

+5 −2
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ define([ 
	, put

	, Credentials

) {



	return declare(_DashboardItem, {

		//	summary:

		//		Widget para la creación de un elemento Favoritos del modulo Initial
@@ -134,8 +135,10 @@ define([ 


		createStructure: function(/*Array*/ modules) {



			this.favouritesContainerNode = put(this.contentNode, 'div.favouritesBoxItems');



			for (var i = 0; i < modules.length; i++) {

				modules[i].placeAt(this.contentNode);

				modules[i].placeAt(this.favouritesContainerNode);

			}

		}

	});

public/javascript/redmic/modules/base/_Window.js

+5 −5
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ define([ 


		hiddenClass: 'hidden',



		titleHeight: 30,

		titleHeight: 2,

		minWidth: 200,



		widthByColsAttr: 'data-cols',
@@ -146,7 +146,7 @@ define([ 


			this._windowTitleNode = put(this._windowNode, 'div.' + this.windowTitleClass);



			domStyle.set(this._windowTitleNode, 'height', this.titleHeight + 'px');

			domStyle.set(this._windowTitleNode, 'height', this.titleHeight + 'rem');

		},



		_createWindowContent: function() {
@@ -165,7 +165,7 @@ define([ 


			this._windowContentNode = put(this._windowNode, 'div.' + contentClass);



			var contentHeight = 'calc(100% - ' + titleHeight + 'px)';

			var contentHeight = 'calc(100% - ' + titleHeight + 'rem)';

			domStyle.set(this._windowContentNode, 'height', contentHeight);

		},
@@ -363,7 +363,7 @@ define([ 
			}



			domStyle.set(this.node, 'height', 0);

			domStyle.set(this._windowNode.parentNode, 'height', this.titleHeight + 'px');

			domStyle.set(this._windowNode.parentNode, 'height', this.titleHeight + 'rem');

		},



		_minimizeModuleReturn: function() {
@@ -378,7 +378,7 @@ define([ 
				domClass.remove(this._resizeHandleNode, this.hiddenClass);

			}



			domStyle.set(this.node, 'height', 'calc(100% - ' + this.titleHeight + 'px)');

			domStyle.set(this.node, 'height', 'calc(100% - ' + this.titleHeight + 'rem)');

			domStyle.set(this._windowNode.parentNode, 'height', '');

		},

stylesheets @ 74c2be9d

Compare c03163d7 to 74c2be9d
Original line number Diff line number Diff line 
Subproject commit c03163d78f7b6d41af4fc47a5cbbe83364c3e9c7
 
Subproject commit 74c2be9dfa1a98bd75e2bb55a467f16c4b917c76