Commit 9417e703 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'feature-addNewActivityData' into 'dev' 

Feature add new activity data

See merge request redmic-project/client/templates!10
parents 00f21447 35e5048b

grunt/config/handlebars.js

+2 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ module.exports = function(grunt) { 
				, 'dist/ActivityInfo.js': 'src/Activity/Info.hbs'

				, 'dist/ActivityList.js': 'src/Activity/List.hbs'

				, 'dist/ActivityFilter.js': 'src/Activity/Filter.hbs'

				, 'dist/ActivityLayerList.js': 'src/Activity/LayerList.hbs'

				, 'dist/ActivityTypeInfo.js': 'src/ActivityType/Info.hbs'

				, 'dist/ActivityTypeList.js': 'src/ActivityType/List.hbs'

				, 'dist/ActivityTypeDetails.js': 'src/ActivityType/Details.hbs'
@@ -112,6 +113,7 @@ module.exports = function(grunt) { 
				, 'dist/OrganisationInfo.js': 'src/Organisation/Info.hbs'

				, 'dist/OrganisationList.js': 'src/Organisation/List.hbs'

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

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

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

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

				, 'dist/DocumentFilter.js': 'src/Document/Filter.hbs'

src/Activity/Info.hbs

+15 −0
Original line number Diff line number Diff line
@@ -147,6 +147,21 @@ 
					</div>

				</div>

			{{/if}}

			{{#if data.resources}}

				{{#each data.resources}}

					<div class="row">

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

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

						</div>

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

							<p>{{name}}</p>

							<p>{{description}}</p>

							<p>{{TextURL urlResource ../i18n.link urlResource}}</p>

							<br />

						</div>

					</div>

				{{/each}}

			{{/if}}

		</div>

	</div>

</div>

src/Activity/LayerList.hbs

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

	<span class='title'>

		<span class='name'>{{ChkIsNull data.alias}}</span>

	</span>

	<span class='subtitle'>

		<span class='name'>{{i18n.link}}: {{TextURL data.urlSource i18n.url data.urlSource}}</span>

	</span>

	<span class='subtitle'>

		<span class='name'>{{i18n.layer}}: {{ChkIsNull data.name}}</span>

	</span>

	<span class='subtitle'>

		{{#if data.keywords}}

			{{i18n.keywords}}: {{Array data.keywords ', '}}

		{{/if}}

	</span>

	<span class='subtitle subTitleFlex'>

		{{#if data.themeInspire}}

			<span class='subtitleIcon'>

				{{GroupIconInspire data.themeInspire.code i18n true}}

			</span>

		{{/if}}

		{{#if data.protocols}}

			<span class=''>

				{{Array data.protocols ' - ' 'type'}}

			</span>

		{{/if}}

	</span>

</span>

src/Resource/Set.hbs

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

	<span class='title'>

		{{data.name}}

	</span>

	<span class='subtitle'>

		{{URL data.urlResource}}

	</span>

	<span class='subtitle'>

		{{data.description}}

	</span>

</span>