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

Merge branch 'dev' into 'master' 

Dev

See merge request redmic-project/client/templates!4
parents b1d044a9 37a95ff7

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'

package-lock.json

+1 −1
Original line number Diff line number Diff line 
{

  "name": "Templates",

  "version": "0.10.1",

  "version": "0.11.0",

  "lockfileVersion": 1,

  "requires": true,

  "dependencies": {

package.json

+4 −4
Original line number Diff line number Diff line 
{

  "name": "Templates",

  "version": "0.10.1",

  "author": "Observatorio Ambiental Granadilla",

  "homepage": "https://redmic.es",

  "version": "0.11.0",

  "author": "REDMIC",

  "homepage": "https://gitlab.com/redmic-project/client/templates/blob/master/README.md",

  "description": "Plantillas de Handlebars para REDMIC",

  "contributors": [

    {
@@ -24,7 +24,7 @@ 
  ],

  "repository": {

    "type": "git",

    "url": "http://git.redmic.net/redmic-client/templates.git"

    "url": "https://gitlab.com/redmic-project/client/templates.git"

  },

  "private": true,

  "devDependencies": {

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>