cubicweb: comparison web/facet.py

equal deleted inserted replaced

-:d12c21ea4cd4
+:ad0581296e2c
 __docformat__ = "restructuredtext en"
 _ = unicode
 from warnings import warn
 from copy import deepcopy
-from datetime import date, datetime, timedelta
+from datetime import datetime, timedelta
 from logilab.mtconverter import xml_escape
 from logilab.common.graph import has_path
 from logilab.common.decorators import cached
 from logilab.common.date import datetime2ticks, ustrftime, ticks2datetime
 from logilab.common.compat import all
 from logilab.common.deprecation import deprecated
-from rql import parse, nodes, utils
+from rql import nodes, utils
 from cubicweb import Unauthorized, typed_eid
 from cubicweb.schema import display_name
 from cubicweb.utils import make_uid
 from cubicweb.selectors import match_context_prop, partial_relation_possible, yes
 @property
 def wdgclass(self):
 return FacetVocabularyWidget
+def get_selected(self):
+return frozenset(typed_eid(eid)
+for eid in self._cw.list_form_param(self.__regid__))
 def get_widget(self):
 """Return the widget instance to use to display this facet.
 This implementation expects a .vocabulary method on the facet and
 return a combobox displaying this vocabulary.
 """
 vocab = self.vocabulary()
 if len(vocab) <= 1:
 return None
 wdg = self.wdgclass(self)
-selected = frozenset(typed_eid(eid) for eid in self._cw.list_form_param(self.__regid__))
+selected = self.get_selected()
 for label, value in vocab:
-if value is None:
+wdg.items.append((value, label, value in selected))
-wdg.append(FacetSeparator(label))
-else:
-wdg.append(FacetItem(self._cw, label, value, value in selected))
 return wdg
 def vocabulary(self):
 """Return vocabulary for this facet, eg a list of 2-uple (label, value).
 """
 def possible_values(self):
 """Return a list of possible values (as string since it's used to
 compare to a form value in javascript) for this facet.
 """
 raise NotImplementedError
 class RelationFacet(VocabularyFacet):
 """Base facet to filter some entities according to other entities to which
 they are related. Create concrete facet by inheriting from this class an then
 def support_and(self):
 return self._search_card('+*')
 # internal utilities #######################################################
+@cached
 def _support_and_compat(self):
 support = self.support_and
 if callable(support):
 warn('[3.13] %s.support_and is now a property' % self.__class__,
 DeprecationWarning)
 else:
 self.select.add_relation(var, self.rtype, self.filtered_variable)
 ## html widets ################################################################
-_DEFAULT_CONSTANT_VOCAB_WIDGET_HEIGHT = 9
+_DEFAULT_CONSTANT_VOCAB_WIDGET_HEIGHT = 12
-@cached
-def _css_height_to_line_count(vreg):
-cssprop = vreg.config.uiprops['facet_overflowedHeight'].lower().strip()
-# let's talk a bit ...
-# we try to deduce a number of displayed lines from a css property
-# there is a linear (rough empiric coefficient == 0.73) relation between
-# css _em_ value and line qty
-# if we get another unit we're out of luck and resort to one constant
-# hence, it is strongly advised not to specify but ems for this css prop
-if cssprop.endswith('em'):
-try:
-return int(cssprop[:-2]) * .73
-except Exception:
-vreg.warning('css property facet_overflowedHeight looks malformed (%r)',
-cssprop)
-return _DEFAULT_CONSTANT_VOCAB_WIDGET_HEIGHT
 class FacetVocabularyWidget(htmlwidgets.HTMLWidget):
 def __init__(self, facet):
 self.facet = facet
 self.items = []
+@property
+@cached
+def css_overflow_limit(self):
+""" we try to deduce a number of displayed lines from a css property
+if we get another unit we're out of luck and resort to one constant
+hence, it is strongly advised not to specify but ems for this css prop
+"""
+vreg = self.facet._cw.vreg
+cssprop = vreg.config.uiprops['facet_overflowedHeight'].lower().strip()
+if cssprop.endswith('em'):
+try:
+return int(cssprop[:-2])
+except Exception:
+vreg.warning('css property facet_overflowedHeight looks malformed (%r)',
+cssprop)
+return _DEFAULT_CONSTANT_VOCAB_WIDGET_HEIGHT
+@property
 @cached
 def height(self):
-maxheight = _css_height_to_line_count(self.facet._cw.vreg)
+return 1 + min(len(self.items),
-return 1 + min(len(self.items), maxheight) + int(self.facet._support_and_compat())
+self.css_overflow_limit + int(self.facet._support_and_compat()))
-def append(self, item):
+@property
-self.items.append(item)
+@cached
+def overflows(self):
+return len(self.items) >= self.css_overflow_limit
+scrollbar_padding_factor = 4
 def _render(self):
 w = self.w
 title = xml_escape(self.facet.title)
 facetid = make_uid(self.facet.__regid__)
 w(u'<div id="%s" class="facet">\n' % facetid)
 w(u'<div class="facetTitle" cubicweb:facetName="%s">%s</div>\n' %
 (xml_escape(self.facet.__regid__), title))
 if self.facet._support_and_compat():
-_ = self.facet._cw._
+self._render_and_or(w)
-w(u'''<select name="%s" class="radio facetOperator" title="%s">
+cssclass = 'vocabularyFacet'
-<option value="OR">%s</option>
-<option value="AND">%s</option>
-</select>''' % (xml_escape(self.facet.__regid__) + '_andor', _('and/or between different values'),
-_('OR'), _('AND')))
-cssclass = 'facetBody'
 if not self.facet.start_unfolded:
 cssclass += ' hidden'
-if len(self.items) > 6:
+overflow = self.overflows
-cssclass += ' overflowed'
+if overflow:
+if self.facet._support_and_compat():
+cssclass += ' vocabularyFacetBodyWithLogicalSelector'
+else:
+cssclass += ' vocabularyFacetBody'
 w(u'<div class="%s">\n' % cssclass)
-for item in self.items:
+for value, label, selected in self.items:
-item.render(w=w)
+if value is None:
+continue
+self._render_value(w, value, label, selected, overflow)
 w(u'</div>\n')
 w(u'</div>\n')
+def _render_and_or(self, w):
+_ = self.facet._cw._
+w(u"""<select name='%s' class='radio facetOperator' title='%s'>
+<option value='OR'>%s</option>
+<option value='AND'>%s</option>
+</select>""" % (xml_escape(self.facet.__regid__) + '_andor',
+_('and/or between different values'),
+_('OR'), _('AND')))
+def _render_value(self, w, value, label, selected, overflow):
+cssclass = 'facetValue facetCheckBox'
+if selected:
+cssclass += ' facetValueSelected'
+w(u'<div class="%s" cubicweb:value="%s">\n'
+% (cssclass, xml_escape(unicode(value))))
+# If it is overflowed one must add padding to compensate for the vertical
+# scrollbar; given current css values, 4 blanks work perfectly ...
+padding = u'&#160;' * self.scrollbar_padding_factor if overflow else u''
+w('<span>%s</span>' % xml_escape(label))
+w(padding)
+w(u'</div>')
 class FacetStringWidget(htmlwidgets.HTMLWidget):
 def __init__(self, facet):
 self.facet = facet
 self.value = None
+@property
 def height(self):
 return 3
 def _render(self):
 w = self.w
 def __init__(self, facet, minvalue, maxvalue):
 self.facet = facet
 self.minvalue = minvalue
 self.maxvalue = maxvalue
+@property
 def height(self):
 return 3
 def _render(self):
 w = self.w
 datetime2ticks(maxvalue))
 fmt = facet._cw.property_value('ui.date-format')
 facet._cw.html_headers.define_var('DATE_FMT', fmt)
-class FacetItem(htmlwidgets.HTMLWidget):
-selected_img = "black-check.png"
-unselected_img = "no-check-no-border.png"
-def __init__(self, req, label, value, selected=False):
-self._cw = req
-self.label = label
-self.value = value
-self.selected = selected
-def _render(self):
-w = self.w
-cssclass = 'facetValue facetCheckBox'
-if self.selected:
-cssclass += ' facetValueSelected'
-imgsrc = self._cw.data_url(self.selected_img)
-imgalt = self._cw._('selected')
-else:
-imgsrc = self._cw.data_url(self.unselected_img)
-imgalt = self._cw._('not selected')
-w(u'<div class="%s" cubicweb:value="%s">\n'
-% (cssclass, xml_escape(unicode(self.value))))
-w(u'<img src="%s" alt="%s"/>&#160;' % (imgsrc, imgalt))
-w(u'<a href="javascript: {}">%s</a>' % xml_escape(self.label))
-w(u'</div>')
 class CheckBoxFacetWidget(htmlwidgets.HTMLWidget):
 selected_img = "black-check.png"
 unselected_img = "black-uncheck.png"
 def __init__(self, req, facet, value, selected):
 self._cw = req
 self.facet = facet
 self.value = value
 self.selected = selected
+@property
 def height(self):
 return 2
 def _render(self):
 w = self.w
 else:
 imgsrc = self._cw.data_url(self.unselected_img)
 imgalt = self._cw._('not selected')
 w(u'<div class="%s" cubicweb:value="%s">\n'
 % (cssclass, xml_escape(unicode(self.value))))
-w(u'<div class="facetCheckBoxWidget">')
+w(u'<div>')
 w(u'<img src="%s" alt="%s" cubicweb:unselimg="true" />&#160;' % (imgsrc, imgalt))
-w(u'<label class="facetTitle" cubicweb:facetName="%s"><a href="javascript: {}">%s</a></label>'
+w(u'<label class="facetTitle" cubicweb:facetName="%s">%s</label>'
 % (xml_escape(self.facet.__regid__), title))
 w(u'</div>\n')
 w(u'</div>\n')
 w(u'</div>\n')

changeset 7943	ad0581296e2c
parent 7879	9aae456abab5
child 7953	a37531c8a4a6