Issue #11, various small fixes

pixelhumain · Oct 25, 2018 · 7b0a627 · 7b0a627
1 parent 34366bb
commit 7b0a627
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 43 deletions.
diff --git a/dist/gogocarto.css b/dist/gogocarto.css
@@ -6468,6 +6468,9 @@ html[data-useragent*='MSIE 10.0'] .iconInsideMarker-wrapper {
         color: inherit; }
         .gogo-load-css .gogocarto-container #element-info-bar.display-bottom .element-item .collapsible-header a:hover {
           color: black; }
+    .gogo-load-css .gogocarto-container #element-info-bar.display-bottom .element-item .collapsible-header, .gogo-load-css .gogocarto-container #element-info-bar.display-bottom .element-item .collapsible-body {
+      padding-left: .5rem;
+      padding-right: .5rem; }
     .gogo-load-css .gogocarto-container #element-info-bar.display-aside .element-item .collapsible-header {
       border: none;
       color: white;

diff --git a/dist/gogocarto.js b/dist/gogocarto.js
diff --git a/dist/gogocarto.min.css b/dist/gogocarto.min.css
diff --git a/dist/gogocarto.min.css.gz b/dist/gogocarto.min.css.gz
diff --git a/dist/gogocarto.min.js b/dist/gogocarto.min.js
diff --git a/dist/gogocarto.min.js.gz b/dist/gogocarto.min.js.gz
diff --git a/src/js/modules/element/template-element-filters.module.ts b/src/js/modules/element/template-element-filters.module.ts
@@ -12,7 +12,7 @@ declare var commonmark;
 
 export class TemplateElementFiltersModule
 {
-  filters = [ 'gogo_text', 'gogo_email', 'gogo_openhours', 'gogo_tags', 'gogo_vimeo', 'gogo_url', 'gogo_title', 'gogo_separator', 'gogo_taxonomy', 'gogo_textarea', 'gogo_phone' ];
+  filters = [ 'gogo_text', 'gogo_email', 'gogo_openhours', 'gogo_tags', 'gogo_vimeo', 'gogo_url', 'gogo_title', 'gogo_separator', 'gogo_taxonomy', 'gogo_textarea', 'gogo_tel' ];
 
   public addGoGoFilters(nunjucksEnvironment)
   {
@@ -41,7 +41,7 @@ export class TemplateElementFiltersModule
       case 'gogo_textarea':
         functionToAdd['splitLongText'] = splitLongText;
         break;
-      case 'gogo_phone':
+      case 'gogo_tel':
         functionToAdd['formatPhoneNumber'] = formatPhoneNumber;
         break;      
       default:

diff --git a/src/js/modules/element/template-element.module.ts b/src/js/modules/element/template-element.module.ts
@@ -89,7 +89,7 @@ export class TemplateElementModule
 
   private fixTemplate(template) {
     template = template.replace(/&amp;/g, "&").replace(/&gt;/g, ">").replace(/&lt;/g, "<").replace(/&quot;/g, '"');
-    template = template.replace('<hr />', '<div class="info-bar-divider"></div>');
+    template = template.replace(/<hr \/>|<hr>/, '<div class="info-bar-divider"></div>');
     template = template.replace(/<h1>|<h2>|<h4>|<h5>/g, '<h3>');
     template = template.replace(/<\/h1>|<\/h2>|<\/h4>|<\/h5>/g, '</h3>');
     return template;

diff --git a/src/scss/components/info-bar/_info-bar.scss b/src/scss/components/info-bar/_info-bar.scss
@@ -34,6 +34,11 @@
     background-color: white !important; 
     a { color: inherit; &:hover { color: black; } }
   }  
+
+  .collapsible-header, .collapsible-body { 
+    padding-left: .5rem;
+    padding-right: .5rem;
+  }
 } 
 
 #element-info-bar.display-aside .element-item

diff --git a/src/views/components/element/default-body-content.html.njk b/src/views/components/element/default-body-content.html.njk
@@ -10,7 +10,7 @@
 {{ address|gogo_text }}
 
 {# Tel #}
-{{ telephone|gogo_phone }}
+{{ telephone|gogo_tel }}
 
 {# Mail #}
 {{ email|gogo_email }}

diff --git a/...ement/element-filters/gogo_phone.html.njk → ...element/element-filters/gogo_tel.html.njk b/...ement/element-filters/gogo_phone.html.njk → ...element/element-filters/gogo_tel.html.njk