Skip to content

Commit

Permalink
Merge pull request #994 from bookernath/STENCIL-3253
Browse files Browse the repository at this point in the history
STENCIL-3253 allow merchants to specify Geotrust cert Common Name
  • Loading branch information
junedkazi authored Apr 11, 2017
2 parents a53e353 + 9120632 commit b658b73
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## Draft
- Update bigcommerce.com footer link [#990](https://github.com/bigcommerce/cornerstone/pull/990)
- Fix invalid icon HTML in AMP templates [#989](https://github.com/bigcommerce/cornerstone/pull/989)
- Add new theme editor setting for SSL common name to enable GeoTrust badge to work properly [#994](https://github.com/bigcommerce/cornerstone/pull/994)

## 1.6.3 (2017-03-28)
- `stencil.conf.js` was refactored to support webpack2 builds [961](https://github.com/bigcommerce/cornerstone/pull/961)
Expand Down
2 changes: 1 addition & 1 deletion config.json
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@
"swatch_option_size": "22x22",
"social_icon_placement_top": false,
"social_icon_placement_bottom": "bottom_none",
"show_geotrust_ssl_seal": false,
"geotrust_ssl_common_name": "",
"geotrust_ssl_seal_size": "M",
"navigation_design": "simple"
},
Expand Down
10 changes: 7 additions & 3 deletions schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -2273,10 +2273,14 @@
"content": "GeoTrust SSL"
},
{
"type": "checkbox",
"label": "Show Seal",
"type": "paragraph",
"content": "If you've purchased a GeoTrust SSL from BigCommerce, check your BigCommerce Account Dashboard for the correct Common Name to use here."
},
{
"type": "text",
"label": "SSL Common Name",
"force_reload": true,
"id": "show_geotrust_ssl_seal"
"id": "geotrust_ssl_common_name"
},
{
"type": "select",
Expand Down
2 changes: 1 addition & 1 deletion templates/components/common/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ <h5 class="footer-info-heading">{{lang 'footer.info'}}</h5>
{{> components/common/payment-icons}}
</article>
</section>
{{#if theme_settings.show_geotrust_ssl_seal}}
{{#if theme_settings.geotrust_ssl_common_name}}
<div class="footer-geotrust-ssl-seal">
{{> components/common/geotrust-ssl-seal}}
</div>
Expand Down
2 changes: 1 addition & 1 deletion templates/components/common/geotrust-ssl-seal.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<table width="135" border="0" cellpadding="2" cellspacing="0" title="Click to Verify - This site chose GeoTrust SSL for secure e-commerce and confidential communications.">
<tr>
<td width="135" align="center" valign="top">
<script type="text/javascript" src="https://seal.geotrust.com/getgeotrustsslseal?host_name={{settings.secure_host}}&amp;size={{theme_settings.geotrust_ssl_seal_size}}&amp;lang={{locale_name}}"></script><br />
<script type="text/javascript" src="https://seal.geotrust.com/getgeotrustsslseal?host_name={{theme_settings.geotrust_ssl_common_name}}&amp;size={{theme_settings.geotrust_ssl_seal_size}}&amp;lang={{locale_name}}"></script><br />
<a href="http://www.geotrust.com/ssl/" target="_blank" style="color:#000000; text-decoration:none; font:bold 7px verdana,sans-serif; letter-spacing:.5px; text-align:center; margin:0px; padding:0px;"></a>
</td>
</tr>
Expand Down

0 comments on commit b658b73

Please sign in to comment.