Merge pull request #1529 from noirbizarre/topic-fixes

Small Topic fixes
opendatateam · Mar 26, 2018 · d9ca5a8 · d9ca5a8
2 parents 3a38c94 + da02520
commit d9ca5a8
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 39 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Remove territory claim banner [#1521](https://github.com/opendatateam/udata/pull/1521)
 - Expose an [OEmbed](https://oembed.com/) API endpoint using the new cards [#1525](https://github.com/opendatateam/udata/pull/1525)
+- Small topic fixes [#1529](https://github.com/opendatateam/udata/pull/1529)
 
 ## 1.3.3 (2018-03-20)
 

diff --git a/js/front/mixins/facets.js b/js/front/mixins/facets.js
@@ -0,0 +1,45 @@
+/**
+ * Facets handling mixin
+ */
+import velocity from 'velocity-animate';
+
+import TemporalCoverageFacet from 'components/facets/temporal-coverage.vue';
+
+
+export default {
+    components: {TemporalCoverageFacet},
+    methods: {
+        /**
+         * Collapse or open a facet panel
+         * @param  {String} id The panel identifier to toggle
+         */
+        togglePanel(id, evt) {
+            const panel = document.getElementById(`facet-${id}`);
+            const removeBtn = document.getElementById(`facet-${id}-remove`);
+            if (removeBtn && removeBtn.contains(evt.target)) return;  // Do not react on remove button click
+            const chevrons = document.getElementById(`chevrons-${id}`);
+            if (panel.classList.contains('in')) {
+                velocity(panel, 'slideUp', {duration: 500}).then(() => {
+                    panel.classList.remove('in');
+                });
+            } else {
+                velocity(panel, 'slideDown', {duration: 500}).then(() => {
+                    panel.classList.add('in');
+                });
+            }
+            chevrons.classList.toggle('fa-chevron-up');
+            chevrons.classList.toggle('fa-chevron-down');
+        },
+        /**
+         * Expand a panel (diplay more details)
+         * @param  {String} id The panel identifier to expand
+         */
+        expandPanel(id, evt) {
+            evt.target.remove();
+            const panel = document.getElementById(`facet-${id}-more`);
+            velocity(panel, 'slideDown', {duration: 500}).then(() => {
+                panel.classList.add('in');
+            });
+        }
+    }
+};
diff --git a/js/front/search.js b/js/front/search.js
@@ -2,17 +2,14 @@
  * Search display page JS module
  */
 import FrontMixin from 'front/mixin';
+import FacetsMixin from 'front/mixins/facets';
 
 import log from 'logger';
 import Vue from 'vue';
-import velocity from 'velocity-animate';
-
-import TemporalCoverageFacet from 'components/facets/temporal-coverage.vue';
 
 
 new Vue({
-    mixins: [FrontMixin],
-    components: {TemporalCoverageFacet},
+    mixins: [FrontMixin, FacetsMixin],
     ready() {
         log.debug('Search page');
     },
@@ -47,37 +44,5 @@ new Vue({
                 }
             });
         },
-        /**
-         * Collapse or open a facet panel
-         * @param  {String} id The panel identifier to toggle
-         */
-        togglePanel(id, evt) {
-            const panel = document.getElementById(`facet-${id}`);
-            const removeBtn = document.getElementById(`facet-${id}-remove`);
-            if (removeBtn && removeBtn.contains(evt.target)) return;  // Do not react on remove button click
-            const chevrons = document.getElementById(`chevrons-${id}`);
-            if (panel.classList.contains('in')) {
-                velocity(panel, 'slideUp', {duration: 500}).then(() => {
-                    panel.classList.remove('in');
-                });
-            } else {
-                velocity(panel, 'slideDown', {duration: 500}).then(() => {
-                    panel.classList.add('in');
-                });
-            }
-            chevrons.classList.toggle('fa-chevron-up');
-            chevrons.classList.toggle('fa-chevron-down');
-        },
-        /**
-         * Expand a panel (diplay more details)
-         * @param  {String} id The panel identifier to expand
-         */
-        expandPanel(id, evt) {
-            evt.target.remove();
-            const panel = document.getElementById(`facet-${id}-more`);
-            velocity(panel, 'slideDown', {duration: 500}).then(() => {
-                panel.classList.add('in');
-            });
-        }
     }
 });
diff --git a/js/front/topic.js b/js/front/topic.js
@@ -2,12 +2,13 @@
  * Topic display page JS module
  */
 import FrontMixin from 'front/mixin';
+import FacetsMixin from 'front/mixins/facets';
 
 import log from 'logger';
 import Vue from 'vue';
 
 new Vue({
-    mixins: [FrontMixin],
+    mixins: [FrontMixin, FacetsMixin],
     ready() {
         log.debug('Topic display page');
     }

diff --git a/udata/templates/carousel.html b/udata/templates/carousel.html
@@ -7,7 +7,7 @@ <h3>{{ _('Best reuse cases') }}</h3>
 
 <div class="row">
     {# Carousel #}
-    <div class="col-md-8">
+    <div class="col-xs-12">
         <div id="home-carousel" class="carousel slide" data-ride="carousel" data-interval="6000">
             <!-- Wrapper for slides -->
             <div class="carousel-inner">