Commit 2fddecad 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!11
parents 0caec481 72c8137e

grunt/config/copy.js

+8 −2
Original line number Diff line number Diff line 
module.exports = function(grunt) {



	grunt.config('copy', {

		rootFiles: {

		mainFile: {

			expand: true,

			cwd: 'src',

			src: '*.js',

			src: 'main.js',

			dest: 'dist'

		},

		helpers: {

			expand: true,

			cwd: 'src/Helpers',

			src: '*.js',

			dest: 'dist/Helpers'

		}

	});

};

grunt/config/handlebars.js

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

				compilerOptions: {

					knownHelpers: {

						// legacy (ir eliminando)

						DetailsTitle: true,

						PropertiesAtlas: true,

						StartEnd: true,

						TimeCumulative: true,

						Progress: true,

						qualityControl: true,
@@ -53,6 +53,7 @@ module.exports = function(grunt) { 
						bold: true,

						IterateJSON: true,

						ProtocolsServiceOGC: true,

						DownloadServiceOGC: true,

						breaklines: true,

						textOrSpace: true,

						PrintProperty: true,
@@ -65,7 +66,17 @@ module.exports = function(grunt) { 
						Depth: true,

						IsValidZ: true,

						ExpandOrCollapse: true,

						ColorRamp: true

						ColorRamp: true,



						// customParser

						ActivityOpenStatus: true,

						ActivityAccessibilityStatus: true,

						ActivityInspireTheme: true,

						ActivityResources: true,

						ActivityStarred: true,



						// string

						Capitalize: true

					},

					knownHelpersOnly: true

				}
@@ -83,6 +94,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'
@@ -111,6 +123,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'
@@ -164,7 +177,7 @@ module.exports = function(grunt) { 
				, 'dist/SelectionList.js': 'src/Selection/List.hbs'

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



				, 'dist/AdministrativeStatisticsList.js': 'src/Statistics/AdministrativeList.hbs'

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

				, 'dist/NotificationList.js': 'src/Notification/List.hbs'

				, 'dist/StatisticsTitle.js': 'src/Statistics/Title.hbs'
@@ -181,6 +194,7 @@ module.exports = function(grunt) { 
				, 'dist/InfrastructureAttributesList.js': 'src/Infrastructure/AttributesList.hbs'



				, 'dist/SurveyStationPopup.js': 'src/SurveyStation/Popup.hbs'

				, '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'
@@ -196,8 +210,6 @@ module.exports = function(grunt) { 
				, 'dist/UserSector.js': 'src/User/Sector.hbs'

				, 'dist/UserPassword.js': 'src/User/Password.hbs'



				, 'dist/UserTermsAndConditions.js': 'src/User/TermsAndConditions.hbs'



				, 'dist/ChartCategoryTooltip.js': 'src/Chart/CategoryTooltip.hbs'

				, 'dist/ChartTemporalTooltip.js': 'src/Chart/TemporalTooltip.hbs'

				, 'dist/ChartList.js': 'src/Chart/List.hbs'
@@ -222,7 +234,6 @@ module.exports = function(grunt) { 
				, 'dist/ProtocolsSet.js': 'src/Protocols/Set.hbs'



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

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

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

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

				, 'dist/WhatIsRedmicDataPolicy.js': 'src/WhatIsRedmic/DataPolicy.hbs'
@@ -237,6 +248,8 @@ module.exports = function(grunt) { 
				, 'dist/ActivityCategoriesNoExist.js': 'src/ActivityCategories/NoExist.hbs'



				, 'dist/RealTimeInfo.js': 'src/RealTime/Info.hbs'



				, 'dist/ProductList.js': 'src/Product/List.hbs'

			}

		}

	});

grunt/task/build.js

+1 −1
Original line number Diff line number Diff line 
module.exports = function(grunt) {



	grunt.registerTask('build',

		['clean', 'handlebars', 'copy:rootFiles']);

		['clean', 'handlebars', 'copy']);

};

package.json

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

  "name": "Templates",

  "version": "0.11.0",

  "name": "redmic-templates",

  "version": "0.21.0",

  "author": "REDMIC",

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

  "description": "Plantillas de Handlebars para REDMIC",

  "contributors": [

    {

      "name": "Ignacio Lorenzo García",

      "email": "nacho@oag-fundacion.org"

      "name": "Ignacio Lorenzo García"

    },

    {

      "name": "Pedro E. Trujillo Brito",
@@ -18,8 +17,7 @@ 
      "email": "noel@redmic.es"

    },

    {

      "name": "Carlos Alberto González Carballo",

      "email": "carlos@redmic.es"

      "name": "Carlos Alberto González Carballo"

    }

  ],

  "repository": {

src/Activity/Info.hbs

+68 −25
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
	<div class="grid">

		<div class="contentGrid">

			{{#if shownOption.id}}

				<div class="row">

				<div>

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

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

					</div>
@@ -12,11 +12,14 @@ 
				</div>

			{{/if}}

			{{#if data.code}}

				<div class="row">

				<div>

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

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

					</div>

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

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

						{{#if data.starred}}

							{{ActivityStarred data i18n}}

						{{/if}}

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

					</div>

				</div>
@@ -25,7 +28,7 @@ 
				{{ancestorsActivity data.ancestors i18n}}

			{{/if}}

			{{#if data.activityType}}

				<div class="row">

				<div>

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

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

					</div>
@@ -39,8 +42,19 @@ 
					</div>

				</div>

			{{/if}}

			{{#if data.themeInspire}}

				<div>

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

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

					</div>

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

						{{ActivityInspireTheme data i18n}}

						<span>{{data.themeInspire.name}}</span>

					</div>

				</div>

			{{/if}}

			{{#if data.updated}}

				<div class="row">

				<div>

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

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

					</div>
@@ -49,11 +63,12 @@ 
					</div>

				</div>

			{{/if}}

			<div class="row">

			<div>

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

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

				</div>

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

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

					{{ActivityOpenStatus data i18n}}

					<p>

						{{#if data.startDate}}

							{{DateTime data.startDate}}
@@ -63,7 +78,7 @@ 
					</p>

				</div>

			</div>

			<div class="row">

			<div>

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

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

				</div>
@@ -78,27 +93,18 @@ 
				</div>

			</div>

			{{#if data.accessibility}}

				<div class="row">

				<div>

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

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

					</div>

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

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

						{{ActivityAccessibilityStatus data i18n}}

						<p>{{lang data.accessibility}}</p>

					</div>

				</div>

			{{/if}}

			{{#if data.project}}

				<div class="row">

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

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

					</div>

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

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

					</div>

				</div>

			{{/if}}

			{{#if data.embargo}}

				<div class="row">

				<div>

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

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

					</div>
@@ -108,7 +114,7 @@ 
				</div>

			{{/if}}

			{{#if data.scope}}

				<div class="row">

				<div>

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

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

					</div>
@@ -118,7 +124,7 @@ 
				</div>

			{{/if}}

			{{#if data.description}}

				<div class="row">

				<div>

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

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

					</div>
@@ -128,7 +134,7 @@ 
				</div>

			{{/if}}

			{{#if data.keywords}}

				<div class="row">

				<div>

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

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

					</div>
@@ -137,8 +143,28 @@ 
					</div>

				</div>

			{{/if}}

			{{#if data.licence}}

				<div>

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

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

					</div>

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

						<p>{{breaklines data.licence}}</p>

					</div>

				</div>

			{{/if}}

			{{#if data.normative}}

				<div>

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

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

					</div>

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

						<p>{{breaklines data.normative}}</p>

					</div>

				</div>

			{{/if}}

			{{#if data.note}}

				<div class="row">

				<div>

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

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

					</div>
@@ -147,6 +173,23 @@ 
					</div>

				</div>

			{{/if}}

			{{#if data.resources}}

				{{#each data.resources}}

					<div>

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

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

						</div>

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

							{{ActivityResources ../data ../i18n}}

							<div>

								<p>{{resourceType.name}}</p>

								<p>{{resourceType.description}}</p>

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

							</div>

						</div>

					</div>

				{{/each}}

			{{/if}}

		</div>

	</div>

</div>