Commit ed40f5c1 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!17
parents 336ec674 323052db

.gitlab-ci.yml

0 → 100644
+7 −0
Original line number Diff line number Diff line 
include:

  - project: 'redmic-project/gitlab-ci-templates'

    ref: master

    file: '/deployment-package/npm-deployment.yml'



stages:

  - deploy

grunt/config/handlebars.js

+2 −1
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ module.exports = function(grunt) { 
				, 'dist/OrganisationList.js': 'src/Organisation/List.hbs'

				, 'dist/OrganisationSet.js': 'src/Organisation/Set.hbs'

				, 'dist/ResourceSet.js': 'src/Resource/Set.hbs'

				, 'dist/EmbeddedContentSet.js': 'src/EmbeddedContent/Set.hbs'

				, 'dist/MetricsDefinitionInfo.js': 'src/MetricsDefinition/Info.hbs'

				, 'dist/MetricsDefinitionList.js': 'src/MetricsDefinition/List.hbs'

				, 'dist/DocumentFilter.js': 'src/Document/Filter.hbs'
@@ -184,6 +185,7 @@ module.exports = function(grunt) { 
				, 'dist/RecoverySet.js': 'src/Recovery/Set.hbs'

				, 'dist/DefaultList.js': 'src/Default/List.hbs'

				, 'dist/DefaultDetailsTitle.js': 'src/Default/DetailsTitle.hbs'

				, 'dist/DefaultEmbeddedContent.js': 'src/Default/EmbeddedContent.hbs'



				, 'dist/AreaPopup.js': 'src/Area/Popup.hbs'

				, 'dist/AreaList.js': 'src/Area/List.hbs'
@@ -196,7 +198,6 @@ module.exports = function(grunt) { 
				, 'dist/SurveyStationTimeseriesPopup.js': 'src/SurveyStation/TimeseriesPopup.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.json

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

  "name": "redmic-templates",

  "version": "0.24.0",

  "version": "0.25.0",

  "author": "REDMIC",

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

  "description": "Plantillas de Handlebars para REDMIC",
@@ -29,6 +29,7 @@ 
    "grunt-shell": "4.0.0",

    "load-grunt-tasks": "5.1.0"

  },

  "files": ["dist", "yarn.lock"],

  "engines": {

    "node": ">=14.0",

    "npm": ">=6.14"

src/Default/EmbeddedContent.hbs

0 → 100644
+6 −0
Original line number Diff line number Diff line 
<object type='{{data.objectType}}' data='{{data.url}}' class='{{data.className}}' typemustmatch>

	<div class='missingEmbeddedContent'>

		<i class='fa fa-eye-slash'></i>

		<span>{{i18n.missingEmbeddedContent}}</span>

	</div>

</object>

src/EmbeddedContent/Set.hbs

0 → 100644
+9 −0
Original line number Diff line number Diff line 
<span class='spanTemplate'>

	<span class='title'>

		ID: {{data.id}}

	</span>

	<br>

	<span class='subtitle'>

		<code>{{data.embeddedContent}}</code>

	</span>

</span>