diff --git a/browser/concept.py b/browser/concept.py index 3cafb7f..658a778 100644 --- a/browser/concept.py +++ b/browser/concept.py @@ -290,7 +290,7 @@ class ConceptView(BaseView): r.order = pos def getChildren(self, topLevelOnly=True, sort=True, noDuplicates=True, - useFilter=True): + useFilter=True, predicates=None): form = self.request.form #if form.get('loops.viewName') == 'index.html' and self.editable: if self.editable: @@ -307,7 +307,8 @@ class ConceptView(BaseView): criteria['types'] = [cm.get(name) for name in params['types']] standard = cm.getDefaultPredicate() rels = (self.childViewFactory(r, self.request, contextIsSecond=True) - for r in self.context.getChildRelations(sort=None)) + for r in self.context.getChildRelations( + predicates=predicates, sort=None)) if sort: rels = sorted(rels, key=lambda r: (r.order, r.title.lower())) from loops.organize.personal.browser.filter import FilterView @@ -344,9 +345,10 @@ class ConceptView(BaseView): # Override in subclass to control what is displayd in listings: children = getChildren - def childrenAlphaGroups(self): + def childrenAlphaGroups(self, predicates=None): result = Jeep() - rels = self.getChildren(topLevelOnly=False, sort=False) + rels = self.getChildren(predicates=predicates or [self.defaultPredicate], + topLevelOnly=False, sort=False) rels = sorted(rels, key=lambda r: r.title.lower()) for letter, group in groupby(rels, lambda r: r.title.lower()[0]): letter = letter.upper() diff --git a/browser/lobo/standard.py b/browser/lobo/standard.py index 1c636ac..fe2b937 100644 --- a/browser/lobo/standard.py +++ b/browser/lobo/standard.py @@ -199,7 +199,7 @@ class Grid3(BasePart): macroName = 'grid' imageSize = 'small' height = 'auto; padding-bottom: 10px' - gridPattern = ['span-2', 'span-2', 'span-2 last'] + gridPattern = ['span-2 clear', 'span-2', 'span-2 last'] class List1(BasePart): @@ -253,7 +253,7 @@ class ImageGrid3(BasePart): macroName = 'imagegrid' imageSize = 'small' height = 'auto; padding-bottom: 10px' - gridPattern = ['span-2', 'span-2', 'span-2 last'] + gridPattern = ['span-2 clear', 'span-2', 'span-2 last'] # relation views, used for cells (components) of lists and grids diff --git a/compound/microart/view_macros.pt b/compound/microart/view_macros.pt index 7dadf5d..ee650c1 100755 --- a/compound/microart/view_macros.pt +++ b/compound/microart/view_macros.pt @@ -3,8 +3,7 @@
+
Translations: