Skip to content

Commit

Permalink
Merge pull request #1053 from bc-nataliya/CRO-169
Browse files Browse the repository at this point in the history
CRO-169: also includes CRO-314 and CRO-179. Hide brands in the footer if
  • Loading branch information
bc-nataliya authored Jul 27, 2017
2 parents cadd953 + 0f3f53c commit f799023
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Changelog

## Draft
- Hide Info in footer if no address is provided in Store Profile. Hide Brands in footer if Merchant has no brands [#1053](https://github.com/bigcommerce/cornerstone/pull/1053)

## 1.9.1 (2017-07-25)
- Move some hard-coded validation messages to language file [#1040](https://github.com/bigcommerce/cornerstone/pull/1040)
Expand Down
6 changes: 4 additions & 2 deletions templates/components/common/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ <h5 class="footer-info-heading">{{lang 'footer.categories'}}</h5>
</ul>
</article>

{{#if theme_settings.shop_by_brand_show_footer}}
{{#and theme_settings.shop_by_brand_show_footer shop_by_brand.length}}
<article class="footer-info-col footer-info-col--small" data-section-type="footer-brands">
<h5 class="footer-info-heading">{{lang 'footer.brands'}}</h5>
<ul class="footer-info-list">
Expand All @@ -54,15 +54,17 @@ <h5 class="footer-info-heading">{{lang 'footer.brands'}}</h5>
<li><a href="{{urls.brands}}">{{lang 'common.view_all'}}</a></li>
</ul>
</article>
{{/if}}
{{/and}}

{{#if settings.address}}
<article class="footer-info-col footer-info-col--small" data-section-type="storeInfo">
<h5 class="footer-info-heading">{{lang 'footer.info'}}</h5>
<address>{{nl2br settings.address}}</address>
{{#if settings.phone_number}}
<strong>{{lang 'footer.call_us' phone_number=settings.phone_number}}</strong>
{{/if}}
</article>
{{/if}}

<article class="footer-info-col" data-section-type="newsletterSubscription">
{{#if settings.show_newsletter_box}}
Expand Down

0 comments on commit f799023

Please sign in to comment.