Commit 3c848c4c authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'feature-realTimeData' into 'dev' 

Feature real time data

See merge request redmic-project/client/web!28
parents 2b0e034e 27512eea

public/javascript/app/components/viewCustomization/describeSite/views/templates/DescribeSiteForm.html

+2 −0
Original line number Diff line number Diff line
@@ -7,5 +7,7 @@ 
		<div data-redmic-type="text" data-redmic-model="properties/site/code"></div>



		<div data-redmic-type="textarea" data-redmic-model="properties/site/description"></div>



		<div data-redmic-type="text" data-redmic-model="properties/site/dashboard"></div>

	</fieldset>

</form>
 
 No newline at end of file

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

+7 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ define([ 
			lang.mixin(this, this.configAddBasicTitle, args);



			aspect.before(this, "_afterSetConfigurations", lang.hitch(this, this._setAddBasicTitleConfigurations));

			aspect.before(this, "_refreshModules", lang.hitch(this, this._refreshModulesAddBasicTitle));

			aspect.before(this, "_refreshModules", lang.hitch(this, this._beforeRefreshModulesAddBasicTitle));

		},



		_setAddBasicTitleConfigurations: function() {
@@ -32,7 +32,12 @@ define([ 
			}, this.titleWidgetConfig || {}]);

		},



		_refreshModulesAddBasicTitle: function() {

		_beforeRefreshModulesAddBasicTitle: function() {



			this._updateTitle();

		},



		_updateTitle: function() {



			this._emitEvt('INJECT_ITEM', {

				data: {

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

+4 −0
Original line number Diff line number Diff line
@@ -34,6 +34,10 @@ define([ 
			url: "/catalog/activity-infrastructure/1378",

			label: "webcams",

			icon: "fa-camera"

		},{

			url: "/viewer/real-time",

			label: "real-time",

			icon: "fa-clock-o"

		}],



		suffixI18n: '-view',

public/javascript/app/nls/es/translation.js

+4 −0
Original line number Diff line number Diff line
@@ -879,6 +879,10 @@ define({ 


	, "items": "elementos"



	, "real-time": "Datos en tiempo real"

	, "goToDashboard": "Visualizar datos"

	, "dashboard": "Dashboard"



	, "trash-collection": "Inventario de basura"

	, "collect": "Añadir nls clave: Collect"

	, "places": "Añadir nls clave: Places"

public/javascript/app/nls/translation.js

+4 −0
Original line number Diff line number Diff line
@@ -885,6 +885,10 @@ define({ 


		, "items": "items"



		, "real-time": "Real time data"

		, "goToDashboard": "Visualize data"

		, "dashboard": "Dashboard"



		, "trash-collection": "Trash survey"

		, "collect": "Collect"

		, "places": "Places"