Merge pull request #169 from eea/develop

Add editable placeholder on facets with text inputs
eea · Apr 4, 2019 · 13db5e6 · 13db5e6
2 parents b725a29 + 43ef9f6
commit 13db5e6
Show file tree

Hide file tree

Showing 78 changed files with 6,243 additions and 2,104 deletions.
diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
@@ -1,6 +1,15 @@
 Changelog
 =========
 
+12.0 - (2019-04-04)
+---------------------
+* Feature: Added MultiSelect Faceted Widget
+  [avoinea]
+* Feature: Add editable placeholder on facets with text inputs
+  [avoinea]
+* Bug fix: Fix Checkboxes/Radio widget More/Less i18n
+  [avoinea]
+
 11.9 - (2019-03-29)
 ---------------------
 * Change: Update theme colors to fit Plone 5 default theme colors

diff --git a/eea/facetednavigation/browser/javascript/expand.js b/eea/facetednavigation/browser/javascript/expand.js
@@ -6,6 +6,8 @@ jQuery.fn.collapsible = function(settings){
   var options = {
     maxitems: 0,
     elements: 'li',
+    more: 'More',
+    less: 'Less',
 
     events: {
       refresh: 'widget-refresh',
@@ -28,9 +30,9 @@ jQuery.fn.collapsible = function(settings){
       }
 
       if(self.colapsed){
-        jQuery('a', self.button).text('More');
+        jQuery('a', self.button).text(options.more);
       }else{
-        jQuery('a', self.button).text('Less');
+        jQuery('a', self.button).text(options.less);
       }
       self.button.show();
 

diff --git a/eea/facetednavigation/browser/javascript/view.js b/eea/facetednavigation/browser/javascript/view.js
@@ -137,7 +137,7 @@ Faceted.Form = {
     this.form = jQuery('#faceted-form');
     // Handle form submit event
     this.area = jQuery('#faceted-results');
-    this.mode = this.form.attr('data-mode') || 'view';
+    this.mode = this.form.data('mode') || 'view';
 
     // Faceted version
     this.version = '';

diff --git a/eea/facetednavigation/browser/stylesheets/view.css b/eea/facetednavigation/browser/stylesheets/view.css
@@ -228,3 +228,8 @@
   margin-top: 2em;
   color: #b2b2b2;
 }
+
+#content-core .faceted-sections-buttons a,
+.faceted-sections-buttons a {
+  border-bottom: none;
+}
diff --git a/eea/facetednavigation/browser/template/macros.pt b/eea/facetednavigation/browser/template/macros.pt
@@ -34,7 +34,6 @@
       </div>
       <div tal:attributes="
         id string:${position}---${section_value}---widgets;
-        title section_title;
         class string:faceted-drag-drop faceted-widgets faceted-${section_value}-widgets faceted-${position}-widgets;">
         <tal:widget repeat="widget widgets">
           <div tal:replace="structure widget"> Widget </div>