Merge pull request #803 from pierreloicq/accepthtml

accept html in the labels and removed old stuffs

Author: Gaël UTARD

CHANGES.md

@@ -1,9 +1,14 @@
 2.29.3-dev
 ===================
 
-**Bug fixes**
+**Enhancements**
+
+* Trek label description can contain HTML markup
+
+**Breaking change**
+
+* The settings RULES_FLAT_PAGES_ID is removed
 
-*
 
 2.29.2 / 2020-10-28
 ===================

docs/settings-custom-json-all-options.md

@@ -43,7 +43,6 @@ ENABLE_DISTRICTS_FILTERING | Boolean | `true` | Show districts filtering on resu
 ENABLE_CITIES_FILTERING | Boolean | `true` | Show cities filtering on results page
 ENABLE_STRUCTURE_FILTERING | Boolean | `true` | Show structure filtering on results page
 GEO_FILTERS_AUTO_CLOSE | Boolean | `false` | If true select filters menus will close when a value is selected.
-RULES_FLAT_PAGES_ID | string | `""` | Specify the rules flat-page id which will be used in the detail page part about the rules.
 FAVORITES_ICON | String ([font awesome icon](http://fortawesome.github.io/Font-Awesome/icons/)) | `"heart"` | Specify the icon used for the favorites on the website. It must be a valid font awesome icon.
 SHARE_ICON | String ([font awesome icon](http://fortawesome.github.io/Font-Awesome/icons/)) | `"share-alt"` | Specify the icon used for the favorites on the website. It must be a valid font awesome icon.
 PLACEHOLDER_IMAGE | string(file name) | `""` | Placeholder used for contents elements.

src/app/config/settings.default.json

@@ -26,7 +26,6 @@
     "ENABLE_CITIES_FILTERING": true,
     "ENABLE_STRUCTURE_FILTERING": true,
     "GEO_FILTERS_AUTO_CLOSE": false,
-    "RULES_FLAT_PAGES_ID": "",
     "FAVORITES_ICON": "heart",
     "SHARE_ICON": "share-alt",
     "PLACEHOLDER_IMAGE": "",

src/app/detail/controllers.js

@@ -9,12 +9,6 @@ function DetailController($scope, $rootScope, $state, $q, $modal, $timeout, $sta
     $scope.displayCredits = globalSettings.DISPLAY_CREDITS_ON_IMAGE;
     $scope.foldAside = globalSettings.ASIDE_PANEL_FOLDED_BY_DEFAULT || false;
 
-    if (globalSettings.RULES_FLAT_PAGES_ID) {
-        $scope.rulesId = globalSettings.RULES_FLAT_PAGES_ID;
-    } else {
-        $scope.rulesId = null;
-    }
-
     $scope.getUrlImg = function getUrlImg (path) {
         return globalSettings.API_URL + path;
     };

src/app/detail/templates/detail-content.html

@@ -50,11 +50,10 @@ <h3>
     <div class="detail-content-notice is-park-centered" ng-if="result.properties.is_park_centered">
         <i class="notice-symbol fa fa-info-circle"></i>
         <div class="notice-text">
-            <p ng-if="!rulesId">{{ 'PARK_CENTERED' | translate}}</p>
-            <a ng-if="rulesId" ui-sref="layout.flat({flatID: rulesId})">{{ 'PARK_CENTERED' | translate}}</a>
+            <p>{{ 'PARK_CENTERED' | translate}}</p>
         </div>
-    </div>
-
+    </div>  
+    
     <div ng-repeat="label in result.properties.labels"
          class="detail-content-notice labels" ng-if="label">
         <span class="notice-symbol">
@@ -65,9 +64,8 @@ <h3>
 
         <div class="notice-text">
             <p><strong>{{label.name | translate}}</strong></p>
-            <p ng-if="!rulesId">{{label.advice | translate}}</p>
-            <a ng-if="rulesId" ui-sref="layout.flat({flatID: rulesId})">{{ label.advice | translate}}</a>
-        </div>
+            <p ng-bind-html="label.advice | sanitizeData: true"></p>
+	</div>
     </div>
 
     <div class="detail-content-notice event-notice-custom" ng-if="result.properties.category.id === 'E'">

src/app/translation/po/it.po

@@ -145,7 +145,7 @@ msgid "TOWN_CROSSED"
 msgstr "Traversata di paese"
 
 msgid "PARK_CENTERED"
-msgstr ""
+msgstr "Questo percorso si trova nel cuore del Parco Nazionale, consultare il regolamento"
 
 msgid "TRANSPORTS"
 msgstr "Trasporti"