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

Revisa detalles de búsqueda y estilos 

Reubica barra de búsqueda en la página inicial, aún en pruebas.
Conecta nuevo botón para mostrar filtro avanzado.
Actualiza estilos mejorando el comportamiento de topbar y búsqueda
cuando hay poco espacio disponible.
parent f184d893

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

+20 −21
Original line number Diff line number Diff line
@@ -44,12 +44,19 @@ define([ 


			this.widgetConfigs = {

				searchBar: {

					width: 6,

					width: 3,

					height: 1,

					type: SearchBarWidget,

					props: {

						omitTitleBar: true,

						"class": "containerDetails"

						omitTitleBar: true

					}

				},

				social: {

					width: 3,

					height: 1,

					type: SocialWidget,

					props: {

						title: this.i18n.followUs

					}

				},

				searchFilter: {
@@ -79,6 +86,15 @@ define([ 
						"class": "containerDetails"

					}

				},

				favourites: {

					width: 3,

					height: 5,

					type: WidgetFavourites,

					props: {

						title: this.i18n.favourites,

						"class": "containerDetails"

					}

				},

				info: {

					width: 3,

					height: 1,
@@ -90,26 +106,9 @@ define([ 
						target: "initial_info"

					}

				},

				social: {

					width: 3,

					height: 1,

					type: SocialWidget,

					props: {

						title: this.i18n.followUs

					}

				},

				favourites: {

					width: 3,

					height: 5,

					type: WidgetFavourites,

					props: {

						title: this.i18n.favourites,

						"class": "containerDetails"

					}

				},

				lastActivities: {

					width: 3,

					height: 5,

					height: 4,

					type: WidgetLastActivity,

					props: {

						title: this.i18n.lastActivities,

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

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

	'app/home/views/_DashboardItem'

	, 'app/redmicConfig'

	'app/redmicConfig'

	, 'dojo/_base/declare'

	, 'dojo/_base/lang'

	, 'put-selector/put'

	, 'redmic/modules/base/_Filter'

	, 'redmic/modules/base/_Module'

	, 'redmic/modules/base/_Show'

	, 'redmic/modules/search/TextImpl'

], function(

	_DashboardItem

	, redmicConfig

	redmicConfig

	, declare

	, lang

	, put

	, _Filter

	, _Module

	, _Show

	, TextImpl

) {



	return declare([_DashboardItem, _Filter], {

	return declare([_Module, _Show, _Filter], {

		//	summary:

		//		Widget contenedor de barra de búsqueda sobre actividades
@@ -52,6 +52,14 @@ define([ 
			this.textSearch = new TextImpl(this.textSearchConfig);

		},



		_defineSubscriptions: function() {



			this.subscriptionsConfig.push({

				channel: this.textSearch.getChannel('EXPAND_SEARCH'),

				callback: '_subExpandSearch'

			});

		},



		_definePublications: function() {



			this.publicationsConfig.push({
@@ -66,21 +74,24 @@ define([ 
			});

		},



		_subExpandSearch: function() {



			this._emitEvt('TOGGLE_ADVANCED_SEARCH', {

				target: this.target,

				queryChannel: this.queryChannel

			});

		},



		_afterShow: function() {



			if (this._getPreviouslyShown()) {

				return;

			}



			var parentNode = put(this.contentNode, 'div.' + this.className);

			this._toggleAdvancedNode = put(this.contentNode, 'i.fa.fa-info');

			this._toggleAdvancedNode.onclick = lang.hitch(this, this._emitEvt, 'TOGGLE_ADVANCED_SEARCH', {

				target: this.target,

				queryChannel: this.queryChannel

			});

			this._addClass(this.className);



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

				node: parentNode

				node: this.domNode

			});

		},

public/javascript/redmic/modules/search/TextImpl.js

+8 −9
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ define([ 
					CLOSE: "close",

					CLOSED: "closed",

					SERIALIZED: "serialized",

					CHANGE_SEARCH_PARAMS: "changeSearchParams"

					CHANGE_SEARCH_PARAMS: "changeSearchParams",

					EXPAND_SEARCH: 'expandSearch'

				},

				// own actions

				textActions: {

					CLOSE: "close",

					CLOSED: "closed",
@@ -38,7 +38,8 @@ define([ 
					UPDATE_TEXT_SEARCH_PARAMS: "updateTextSearchParams",

					REQUESTED: "requested",

					SERIALIZE: "serialize",

					SERIALIZED: "serialized"

					SERIALIZED: "serialized",

					EXPAND_SEARCH: 'expandSearch'

				},

				methodSuggest: "POST",

				suggestAction: "_suggest",
@@ -99,6 +100,9 @@ define([ 
			},{

				event: 'CHANGE_SEARCH_PARAMS',

				channel: this.getChannel("SEARCH_PARAMS_CHANGED")

			},{

				event: 'EXPAND_SEARCH',

				channel: this.getChannel('EXPAND_SEARCH')

			});

		},
@@ -114,7 +118,7 @@ define([ 


			this.textSearch.on("changeSearchParams", lang.hitch(this, this._changeSearchParams));



			this.textSearch.on("expandSearch", lang.hitch(this, this._expandSearch));

			this.textSearch.on('expandSearch', lang.hitch(this, this._groupEventArgs, 'EXPAND_SEARCH'));



			this._globalClicksHandler = this._listenGlobalClicks(lang.hitch(this, this._evaluateToCloseSuggests));

			this._globalClicksHandler.pause();
@@ -271,11 +275,6 @@ define([ 
			this._emitEvt('CHANGE_SEARCH_PARAMS', evt);

		},



		_expandSearch: function() {



			console.log('expand');

		},



		_subClose: function() {



			this._close();

stylesheets @ b3f4de42

Compare 0c4dd3a0 to b3f4de42
Original line number Diff line number Diff line 
Subproject commit 0c4dd3a0de8f1fcb0df893808e7bbfcb183031ad
 
Subproject commit b3f4de42562cac9edeba28c7914b018dacd3060d