Commit 190d311d 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/templates!3
parents ad00ceef 59f8d0cc

grunt/config/handlebars.js

+1 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ module.exports = function(grunt) { 
				, 'dist/SurveyStationPopup.js': 'src/SurveyStation/Popup.hbs'

				, 'dist/SurveyStationList.js': 'src/SurveyStation/List.hbs'

				, 'dist/SurveyStationDataList.js': 'src/SurveyStation/DataList.hbs'

				, 'dist/SurveyStationDashboard.js': 'src/SurveyStation/Dashboard.hbs'



				, 'dist/ObjectCollectionPopup.js': 'src/ObjectCollection/Popup.hbs'

				, 'dist/ObjectCollectionList.js': 'src/ObjectCollection/List.hbs'

src/SurveyStation/Dashboard.hbs

0 → 100644
+1 −0
Original line number Diff line number Diff line 
<iframe src="{{data.url}}" class="kibana-dashboard"></iframe>

src/SurveyStation/Popup.hbs

+8 −0
Original line number Diff line number Diff line 
{{#if feature.properties.site.dashboard}}

	<div class="flexContainerColumn">

		<a href=/viewer/real-time-dashboard/{{feature.uuid}}>

			<i class='paddingContainerWebcam fa fa-link'></i>

			{{i18n.goToDashboard}}

		</a>

	</div>

{{/if}}

{{#if feature.properties.site.name}}

	<div>

		<span class="propLabel">{{i18n.name}}: </span>

yarn.lock

+136 −0

File changed.

Preview size limit exceeded, changes collapsed.