Commit 3f831ca0 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!24
parents b4d3ed88 65afaa94

grunt/config/handlebars.js

+5 −3
Original line number Diff line number Diff line
@@ -8,12 +8,10 @@ module.exports = function(grunt) { 
				compilerOptions: {

					knownHelpers: {

						// legacy (ir eliminando)

						DetailsTitle: true,

						TimeCumulative: true,

						Progress: true,

						GroupIcon: true,

						GroupIconInspire: true,

						Href: true,

						Email: true,

						Array: true,

						listSeparate: true,
@@ -179,7 +177,6 @@ module.exports = function(grunt) { 
				, 'dist/DomainList.js': 'src/Domain/List.hbs'

				, 'dist/CountryList.js': 'src/Country/List.hbs'

				, 'dist/SelectionList.js': 'src/Selection/List.hbs'

				, 'dist/MisidentificationList.js': 'src/Misidentification/List.hbs'



				, 'dist/StatisticsList.js': 'src/Statistics/List.hbs'

				, 'dist/NotificationList.js': 'src/Notification/List.hbs'
@@ -205,6 +202,11 @@ module.exports = function(grunt) { 
				, 'dist/ObjectCollectionPopup.js': 'src/ObjectCollection/Popup.hbs'

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



				, 'dist/ObservationFilterForm.js': 'src/Observation/FilterForm.hbs'

				, 'dist/ObservationStationPopup.js': 'src/Observation/StationPopup.hbs'

				, 'dist/ObservationStationList.js': 'src/Observation/StationList.hbs'

				, 'dist/ObservationRegisterList.js': 'src/Observation/RegisterList.hbs'



				, 'dist/UserTitle.js': 'src/User/Title.hbs'

				, 'dist/UserImage.js': 'src/User/Image.hbs'

				, 'dist/UserTopbarImage.js': 'src/User/TopbarImage.hbs'

package-lock.json

+7 −7
Original line number Diff line number Diff line 
{

  "name": "@redmic-project/templates",

  "version": "0.26.0",

  "version": "0.28.0",

  "lockfileVersion": 3,

  "requires": true,

  "packages": {

    "": {

      "name": "@redmic-project/templates",

      "version": "0.26.0",

      "version": "0.28.0",

      "hasInstallScript": true,

      "license": "Apache-2.0",

      "devDependencies": {

        "glob": "11.0.0",

        "glob": "11.0.1",

        "grunt": "1.6.1",

        "grunt-contrib-clean": "2.0.1",

        "grunt-contrib-copy": "1.0.0",
@@ -18,7 +18,7 @@ 
        "load-grunt-tasks": "5.1.0"

      },

      "engines": {

        "node": ">=20.16",

        "node": ">=20.18",

        "npm": ">=10.8"

      }

    },
@@ -489,9 +489,9 @@ 
      }

    },

    "node_modules/glob": {

      "version": "11.0.0",

      "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.0.tgz",

      "integrity": "sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g==",

      "version": "11.0.1",

      "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.1.tgz",

      "integrity": "sha512-zrQDm8XPnYEKawJScsnM0QzobJxlT/kHOOlRTio8IH/GrmxRE5fjllkzdaHclIuNjUQTJYH2xHNIGfdpJkDJUw==",

      "dev": true,

      "license": "ISC",

      "dependencies": {

package.json

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

  "name": "@redmic-project/templates",

  "version": "0.27.0",

  "version": "0.28.0",

  "author": "REDMIC",

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

  "description": "Handlebars templates for REDMIC",
@@ -23,16 +23,18 @@ 
    "postinstall": "grunt build"

  },

  "devDependencies": {

    "glob": "11.0.0",

    "glob": "11.0.1",

    "grunt": "1.6.1",

    "grunt-contrib-clean": "2.0.1",

    "grunt-contrib-copy": "1.0.0",

    "grunt-contrib-handlebars": "3.0.0",

    "load-grunt-tasks": "5.1.0"

  },

  "files": ["dist"],

  "files": [

    "dist"

  ],

  "engines": {

    "node": ">=20.16",

    "node": ">=20.18",

    "npm": ">=10.8"

  },

  "license": "Apache-2.0"

src/Activity/Info.hbs

+15 −11
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
					</div>

				</div>

			{{/if}}

			{{#if data.code}}

			<div>

				<div class="rowLeft inlineRow {{RowColActivityCatalog 'left'}}">

					<span title="{{i18n.code}}">{{i18n.code}}</span>
@@ -20,10 +19,15 @@ 
					{{#if data.starred}}

						{{ActivityStarred data i18n}}

					{{/if}}

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

					<p>

						{{#if data.code}}

							{{data.code}}

						{{else}}

							-

						{{/if}}

					</p>

				</div>

			</div>

			{{/if}}

			{{#if data.ancestors}}

				{{ancestorsActivity data.ancestors i18n}}

			{{/if}}

src/Animal/Info.hbs

+12 −16
Original line number Diff line number Diff line
@@ -10,9 +10,12 @@ 
						<span title="{{i18n.scientificName}}">{{i18n.scientificName}}</span>

					</div>

					<div class="{{RowColActivityCatalog 'right'}}">

						<span><a {{Href '/catalog/species-info/' data.taxon.id}} class='cursive'>

							{{data.taxon.scientificName}}

						</a></span>

						<span class='cursive'>

							{{TextURL

								(concat '/catalog/species-info/' data.taxon.id)

								data.taxon.scientificName

								i18n.checkSpeciesAtCatalog}}

						</span>

					</div>

				</div>

				{{#if data.taxon.authorship}}
@@ -32,21 +35,14 @@ 
						<span title="{{i18n.scientificName}}">{{i18n.scientificName}}</span>

					</div>

					<div class="{{RowColActivityCatalog 'right'}}">

						<a {{Href 'https://redpromar.org/species/' data.taxonomy.id}} class='cursive'>

							<span>{{data.taxonomy.scientific_name}}</span>

						</a>

						<span class='cursive'>

							{{TextURL

								(concat 'https://redpromar.org/species/' data.taxonomy.id)

								data.taxonomy.scientificName

								i18n.checkSpeciesAtCatalog}}

						</span>

					</div>

				</div>

				{{#if data.taxonomy.authority}}

					<div>

						<div class="rowLeft inlineRow {{RowColActivityCatalog 'left'}}">

							<span title="{{i18n.authorship}}">{{i18n.authorship}}</span>

						</div>

						<div class="{{RowColActivityCatalog 'right'}}">

							<span>{{data.taxonomy.authority}}</span>

						</div>

					</div>

				{{/if}}

			{{/if}}

			{{#if data.description}}

				<div>