Commit 7ca95417 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Arregla plantillas de listado con code

See merge request redmic-project/client/templates!1
parents 11737bd8 80d72005

grunt/config/handlebars.js

+1 −3
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ module.exports = function(grunt) { 
				amd: ['templates'],

				compilerOptions: {

					knownHelpers: {

						DetailsTitle: true,

						PropertiesAtlas: true,

						StartEnd: true,

						TimeCumulative: true,
@@ -82,7 +83,6 @@ 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/ActivityTitle.js': 'src/Activity/Title.hbs'

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

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

				, 'dist/ActivityTypeDetails.js': 'src/ActivityType/Details.hbs'
@@ -118,7 +118,6 @@ module.exports = function(grunt) { 
				, 'dist/DocumentNotAvailable.js': 'src/Document/NotAvailable.hbs'

				, 'dist/DocumentInfo.js': 'src/Document/Info.hbs'

				, 'dist/DocumentList.js': 'src/Document/List.hbs'

				, 'dist/DocumentTitle.js': 'src/Document/Title.hbs'

				, 'dist/DeviceInfo.js': 'src/Device/Info.hbs'

				, 'dist/DeviceList.js': 'src/Device/List.hbs'

				, 'dist/DataDefinitionInfo.js': 'src/DataDefinition/Info.hbs'
@@ -221,7 +220,6 @@ module.exports = function(grunt) { 
				, 'dist/ProtocolsSet.js': 'src/Protocols/Set.hbs'



				, 'dist/WhatIsRedmicLongTermChallenge.js': 'src/WhatIsRedmic/LongTermChallenge.hbs'

				, 'dist/WhatIsRedmicLogicalDataModel.js': 'src/WhatIsRedmic/LogicalDataModel.hbs'

				, 'dist/WhatIsRedmicSystemArchitecture.js': 'src/WhatIsRedmic/SystemArchitecture.hbs'

				, 'dist/WhatIsRedmicInfoType.js': 'src/WhatIsRedmic/InfoType.hbs'

				, 'dist/WhatIsRedmicUserType.js': 'src/WhatIsRedmic/UserType.hbs'

src/Activity/Title.hbs

deleted100644 → 0
+0 −5
Original line number Diff line number Diff line 
<div class="header">

	<h1>

		{{data.name}}

	</h1>

</div>
 
 No newline at end of file

src/Area/List.hbs

+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
	<span class='title' title='{{ChkIsNull data.name}}'>

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

	</span>

	<span class='subtitle' title='{{data.code}}'>

		{{data.code}}

	<span class='subtitle' title='{{ChkIsNull data.code}}'>

		{{ChkIsNull data.code}}

	</span>

	<span class='subtitle' title='{{lang data.areaType}}'>

		{{lang data.areaType}}

src/Citation/Popup.hbs

+2 −2
Original line number Diff line number Diff line
@@ -37,14 +37,14 @@ 
{{#if feature.properties.startDate}}

	<div>

		<span class="propLabel">{{i18n.startDate}}: </span>

		<span class="propValue">{{DateTime feature.properties data.startDate}}</span>

		<span class="propValue">{{DateTime feature.properties.startDate}}</span>

	</div>

{{/if}}



{{#if feature.properties.endDate}}

	<div>

		<span class="propLabel">{{i18n.endDate}}: </span>

		<span class="propValue">{{DateTime feature.properties data.endDate}}</span>

		<span class="propValue">{{DateTime feature.properties.endDate}}</span>

	</div>

{{/if}}

src/Country/List.hbs

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
	<span class='subtitle'>

		{{ChkIsNull data.name_en}}

		{{#if data.code}}

			 - {{data.code}}

			 - {{ChkIsNull data.code}}

		{{/if}}

	</span>

</span>
 
 No newline at end of file