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

Merge branch 'dev' into 'master' 

Crea categoría de helpers y controla ausencias

See merge request redmic-project/client/templates!15
parents 29f144bb a1056c32

grunt/config/handlebars.js

+13 −18
Original line number Diff line number Diff line
@@ -9,32 +9,20 @@ module.exports = function(grunt) { 
					knownHelpers: {

						// legacy (ir eliminando)

						DetailsTitle: true,

						PropertiesAtlas: true,

						TimeCumulative: true,

						Progress: true,

						qualityControl: true,

						GroupIcon: true,

						GroupIconInspire: true,

						URL: true,

						UrlWebcam: true,

						TextURL: true,

						Icon: true,

						Href: true,

						Badge: true,

						Email: true,

						Array: true,

						Hierarchy: true,

						listSeparate: true,

						RowColBibliography: true,

						RowColActivityCatalog: true,

						RowColSpeciesCatalog: true,

						RowColServiceOGCCatalog: true,

						URLDetails: true,

						ancestorsSpecies: true,

						ancestorsActivity: true,

						insertButton: true,

						Date: true,

						DateTime: true,

						lang: true,

						Translate: true,

						ChartsHierarchicalListParse: true,
@@ -46,16 +34,11 @@ module.exports = function(grunt) { 
						Keyword: true,

						ArrayString: true,

						Classifications: true,

						bold: true,

						IterateJSON: true,

						ProtocolsServiceOGC: true,

						DownloadServiceOGC: true,

						breaklines: true,

						textOrSpace: true,

						PrintProperty: true,

						SafeUrl: true,

						concat: true,

						showBoolean: true,

						reverse: true,

						PathLength: true,

						Parents: true,
@@ -77,9 +60,20 @@ module.exports = function(grunt) { 
						DocumentInternalUrlStatus: true,

						DocumentUrl: true,

						Image: true,

						AtlasProperties: true,



						// string

						Capitalize: true

						bold: true,

						Boolean: true,

						breaklines: true,

						Capitalize: true,

						concat: true,

						Date: true,

						DateTime: true,

						TextURL: true,



						// subExpression

						PropertyIsDefinedAndFalse: true

					},

					knownHelpersOnly: true

				}
@@ -248,6 +242,7 @@ module.exports = function(grunt) { 
				, 'dist/WhatIsRedmicInteroperability.js': 'src/WhatIsRedmic/Interoperability.hbs'



				, 'dist/FilterForm.js': 'src/Filter/Form.hbs'

				, 'dist/FilterServiceOGCForm.js': 'src/Filter/ServiceOGCForm.hbs'

				, 'dist/FilterSpeciesForm.js': 'src/Filter/SpeciesForm.hbs'

				, 'dist/FilterColorRamp.js': 'src/Filter/ColorRamp.hbs'

				, 'dist/GenericViewerLayerList.js': 'src/GenericViewer/LayerList.hbs'

src/Atlas/RedpromarSecondaryList.hbs

+30 −25
Original line number Diff line number Diff line 
<span class='spanTemplate'>

	{{#if data.properties.taxondescription}}

	<span class='subtitle'>

		{{bold i18n.scientificName}}: <span class="scientificName">{{data.properties.taxondescription}}</span>

	{{#if data.properties.code}}

	<span class='paddingItemInRow'>

		{{bold i18n.code}}: {{#if data.properties.url}}{{TextURL data.properties.url data.properties.code i18n.viewAtRedpromar}}{{else}}{{data.properties.code}}{{/if}}

	</span>

	{{/if}}

	{{#if data.properties.collectorname}}

	<span class='subtitle'>

	<span class='paddingItemInRow'>

		{{bold i18n.author}}: {{data.properties.collectorname}}

	</span>

	{{/if}}

	{{#if data.properties.date}}

	<span class='subtitle'>

	<span class='paddingItemInRow'>

		{{bold i18n.date}}: {{DateTime data.properties.date}}

	</span>

	{{/if}}

	{{#if data.geometry.coordinates}}

	<span class='subtitle'>

	<span class='paddingItemInRow'>

		{{bold i18n.x}}: {{toFixed data.geometry.coordinates.[0] 5}}

	</span>

	<span class='subtitle'>

	<span class='paddingItemInRow'>

		{{bold i18n.y}}: {{toFixed data.geometry.coordinates.[1] 5}}

	</span>

	{{/if}}

	{{#if data.properties.code}}

	<span class='subtitle'>

		{{bold i18n.code}}: {{data.properties.code}}

	</span>

	{{/if}}

	{{#if data.properties.remark}}

	<span class='subtitle'>

		{{bold i18n.remark}}: {{data.properties.remark}}

	</span>

	{{/if}}

	{{#if data.properties.specimencount}}

	<span class='subtitle'>

	<span class='paddingItemInRow'>

		{{bold i18n.count}}: {{data.properties.specimencount}}

	</span>

	{{/if}}

	{{#if data.properties.z}}

	<span class='subtitle'>

	<span class='paddingItemInRow'>

		{{bold i18n.z}}: {{data.properties.z}}

	</span>

	{{/if}}

	{{#if data.properties.taxonid}}

	<span class='subtitle'>

		{{bold i18n.taxonid}}: {{data.properties.taxonid}}

	{{#if data.properties.scientificname}}

	<span class='paddingItemInRow'>

		{{bold i18n.scientificname}}: {{#if data.properties.taxonurl}}{{TextURL data.properties.taxonurl data.properties.scientificname i18n.viewAtRedpromar}}{{else}}{{data.properties.scientificname}}{{/if}}

	</span>

	{{/if}}

	{{#if data.properties.divulgativename}}

	<span class='paddingItemInRow'>

		{{bold i18n.commonName}}: {{data.properties.divulgativename}}

	</span>

	{{/if}}

	{{#if data.properties.scientificcategory}}

	<span class='paddingItemInRow'>

		{{bold i18n.scientificcategory}}: {{data.properties.scientificcategory}}

	</span>

	{{/if}}

	{{#if data.properties.divulgativecategory}}

	<span class='paddingItemInRow'>

		{{bold i18n.divulgativecategory}}: {{data.properties.divulgativecategory}}

	</span>

	{{/if}}

	{{#if data.properties.images}}

	<span class='subtitle'>

		{{ServiceOGCImageList data.properties.images}}

	{{#if data.properties.activityid}}

	<span class='paddingItemInRow'>

		{{bold i18n.activity}}: {{TextURL (concat 'catalog/activity-info/' data.properties.activityid) data.properties.activityid i18n.goToActivity}}

	</span>

	{{/if}}

</span>

src/Atlas/SecondaryList.hbs

+2 −2
Original line number Diff line number Diff line 
<span class='spanTemplate'>

	{{PropertiesAtlas data i18n}}

	{{AtlasProperties data i18n}}

</span>

src/Document/Info.hbs

+2 −2
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ 
					</div>

				</div>

			{{/if}}

			{{#unless data.enabled}}

			{{#if (PropertyIsDefinedAndFalse data 'enabled')}}

				<div>

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

						<span title="{{i18n.enabled}}">{{i18n.enabled}}</span>
@@ -99,7 +99,7 @@ 
						<p>{{i18n.disabled}}</p>

					</div>

				</div>

			{{/unless}}

			{{/if}}

			{{#if data.internalUrl}}

				<div>

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

src/Document/List.hbs

+2 −2
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ 
		{{ChkIsNull data.title}}

	</span>

	<span class='badgesContainer'>

		{{#unless data.enabled}}

		{{#if (PropertyIsDefinedAndFalse data 'enabled')}}

			{{ItemEnabledStatus data i18n}}

		{{/unless}}

		{{/if}}

		{{#if data.internalUrl}}

			{{DocumentInternalUrlStatus data i18n}}

		{{/if}}