Merge remote-tracking branch 'origin/regazzojDevelopment'

gulpfile.js

@@ -46,7 +46,8 @@ gulp.task('scriptsLibs', function() {
   return gulp.src(['src/js/libs/**/!(leaflet-routing-machine)*.js', 
                   'src/js/libs/leaflet-routing-machine.js' ,
                   '!src/js/libs/materialize/unused/**/*.js',
-                  '!src/js/libs/nunjucks.js',
+                  '!src/js/libs/nunjucks-slim.js',
+                  '!src/js/libs/commonmark.js'
                    ])
     .pipe(concat('libs.js'))
     .pipe(gulp.dest('build'));

src/js/classes/config/gogo-config.class.ts

@@ -4,6 +4,7 @@ import { GoGoFeature } from './gogo-feature.class';
 import { ElementStatus } from '../classes'; 
 import { DEFAULT_FEATURES } from './gogo-default-feature' ;
 declare var L : any;
+declare var commonmark;
 
 export class GoGoConfig
 {
@@ -145,6 +146,7 @@ export class GoGoConfig
     titleFont: undefined ,
     taxonomyMainTitleFont: undefined ,     
   }
+  readonly bodyTemplate = undefined;
 
 	constructor(config : any)
 	{
@@ -199,6 +201,7 @@ export class GoGoConfig
             switch(prop) {
               case 'defaultBounds' : new_prop = L.latLngBounds(object[prop]);break;
               case 'defaultCenter' : new_prop = L.latLng(object[prop]);break;
+              case 'bodyTemplate': let parser=new commonmark.Parser(),htmlRenderer=new commonmark.HtmlRenderer();new_prop=htmlRenderer.render(parser.parse(object[prop]));break;
               default: new_prop = object[prop];break;
             }
             that[prop] = new_prop;

src/js/components/element/element.component.ts

@@ -6,6 +6,7 @@ import { ElementMenuComponent } from "./element-menu.component";
 import { ModerationComponent } from '../element/moderation.component';
 import { InteractiveSectionComponent } from './interactive-section.component';
 declare var $;
+declare var nunjucks;
 
 export class ElementComponent
 {
@@ -37,8 +38,7 @@ export class ElementComponent
     else
       rootCategoriesValues = this.element.getRootCategoriesValues();
 
-    let html = App.templateModule.render('element', 
-    {
+    let options = {
       element : this.element, 
       showDistance: App.geocoder.getLocation() ? true : false,
       listingMode: App.mode == AppModes.List, 
@@ -54,8 +54,16 @@ export class ElementComponent
       isMapMode : App.mode == AppModes.Map,
       config : App.config,
       smallWidth : App.mode == AppModes.Map && App.infoBarComponent.isDisplayedAside(),
-      allowedStamps : App.stampModule.allowedStamps
-    });
+      allowedStamps : App.stampModule.allowedStamps,
+      body : undefined
+    };
+
+    // If there is a body template configured, then we use it. We use the default body otherwise.
+    if(App.config.bodyTemplate) options.body = nunjucks.renderString(App.config.bodyTemplate, this.element).replace(/&amp;/g, "&").replace(/&gt;/g, ">").replace(/&lt;/g, "<").replace(/&quot;/g, '"');
+    else options.body = nunjucks.render('components/element/body.html.njk', options);
+
+    let html = App.templateModule.render('element', options);
+
     return html;
   };