Merge remote-tracking branch 'origin/ent_types_frontend' into ent_types_frontend

This commit is contained in:
Rob H
2014-09-05 16:18:45 +10:00
4 changed files with 14 additions and 6 deletions

View File

@@ -16,6 +16,7 @@
padding: 1rem 0
.active_table .active_table_node
margin-top: 0.25rem
display: block
border: 0

View File

@@ -6,7 +6,7 @@
%span.fat-taxons{"ng-repeat" => "taxon in hub.taxons"}
%render-svg{path: "{{taxon.icon}}"}
{{taxon.name}}
%div{"bo-if" => "!hub.taxons"}
%div.show-for-medium-up{"bo-if" => "hub.taxons.length==0"}
 
.columns.small-12.medium-3.large-2.fat
%div{"bo-if" => "hub.pickup || hub.delivery"}
@@ -27,5 +27,5 @@
%i.ofn-i_036-producers
%span
{{ enterprise.name }}
%div{"bo-if" => "!hub.producers"}
%div.show-for-medium-up{"bo-if" => "hub.producers.length==0"}
 

View File

@@ -14,7 +14,7 @@
/ %i.ofn-i_020-search
%input{type: :text,
"ng-model" => "query",
placeholder: "Search by Shop or Suburb name",
placeholder: "Search by Shop, Suburb or Postcode...",
"ng-debounce" => "150",
"ofn-disable-enter" => true}

View File

@@ -6,16 +6,22 @@
%span.fat-taxons{"ng-repeat" => "taxon in producer.supplied_taxons"}
%render-svg{path: "{{taxon.icon}}"}
{{taxon.name}}
%div.show-for-medium-up{"ng-if" => "producer.supplied_taxons.length==0"}
 
.columns.small-12.medium-3.large-3.fat
%div{"bo-if" => "producer.logo"}
%img{src: "{{ producer.logo }}" }
%div.show-for-medium-up{"bo-if" => "!producer.logo"}
 
.columns.small-12.medium-5.large-5.fat
%div{"bo-if" => "producer.description"}
%label About us
%p.text-small
{{ producer.description }}
%div.show-for-medium-up{"bo-if" => "!producer.description"}
 
.row.active_table_row{"ng-show" => "open()", "bo-if" => "producer.hubs"}
.columns.small-12
@@ -26,13 +32,14 @@
Shop for
%span.turquoise {{ producer.name }}
products at:
%div.show-for-medium-up{"bo-if" => "!producer.name"}
 
.row.cta-container
.columns.small-12
%a.button.hub{"ng-repeat" => "hub in producer.hubs | orderBy:'-active'",
%a.cta-hub{"ng-repeat" => "hub in producer.hubs | orderBy:'-active'",
"bo-href" => "hub.path", "ofn-empties-cart" => "hub",
"bo-class" => "{primary: hub.active, secondary: !hub.active}"}
%i.ofn-i_033-open-sign{"bo-if" => "hub.active"}
%i.ofn-i_032-closed-sign{"bo-if" => "!hub.active"}
{{hub.name}}
.hub-name {{hub.name}}
.button-address {{ [hub.address.city, hub.address.state_name] | printArray }}
%i.ofn-i_007-caret-right