Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork into uk/state_translation_override

This commit is contained in:
Steve Pettitt
2016-04-11 22:31:56 +01:00
2 changed files with 2 additions and 2 deletions

View File

@@ -1,4 +1,4 @@
.filters.sixteen.columns.alpha
.filters.sixteen.columns.alpha.omega
.filter.four.columns.alpha
%label{ :for => 'query', ng: {class: '{disabled: !hub_id}'} }=t('admin.quick_search')
%br

View File

@@ -1,4 +1,4 @@
.sixteen.columns.alpha.omega.text-center{ ng: {show: 'productLimit < filteredProducts.length'}}
.text-center
%input{ type: 'button', value: 'Show More', ng: { click: 'productLimit = productLimit + 10' } }
or
%input{ type: 'button', value: "Show All ({{ filteredProducts.length - productLimit }} More)", ng: { click: 'productLimit = filteredProducts.length' } }