From ad9a810f8a53394f5e6ffda6343c2bf66896bee2 Mon Sep 17 00:00:00 2001 From: Michael Schock Date: Mon, 19 Dec 2016 10:07:17 -0800 Subject: [PATCH 1/3] STENCIL-2598 - Add GeoTrust SSL Seal Toggle --- assets/scss/layouts/footer/_footer.scss | 12 +++++++++ config.json | 5 +++- schema.json | 31 +++++++++++++++++++++++ templates/components/common/footer.html | 5 ++++ templates/components/common/ssl-seal.html | 8 ++++++ 5 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 templates/components/common/ssl-seal.html diff --git a/assets/scss/layouts/footer/_footer.scss b/assets/scss/layouts/footer/_footer.scss index 37b32fed28..d5aefe6083 100644 --- a/assets/scss/layouts/footer/_footer.scss +++ b/assets/scss/layouts/footer/_footer.scss @@ -150,3 +150,15 @@ fill: stencilColor("icon-color"); } } + +.footer-geotrust-ssl-seal { + @include breakpoint("small") { + bottom: 0; + position: absolute; + right: 16px; + } + + table { + margin: auto; + } +} diff --git a/config.json b/config.json index d0f9ea37be..77e4e0502f 100644 --- a/config.json +++ b/config.json @@ -245,7 +245,10 @@ "restrict_to_login": false, "swatch_option_size": "22x22", "social_icon_placement_top": false, - "social_icon_placement_bottom": "bottom_none" + "social_icon_placement_bottom": "bottom_none", + "show_geotrust_ssl_seal": false, + "geotrust_ssl_seal_hostname": "", + "geotrust_ssl_seal_size": "M" }, "read_only_files": [ "/assets/scss/components/citadel", diff --git a/schema.json b/schema.json index df798467f9..5a333284ec 100644 --- a/schema.json +++ b/schema.json @@ -2217,6 +2217,37 @@ "label": "Show "©", current year and store name", "force_reload": true, "id": "show_copyright_footer" + }, + { + "type": "heading", + "content": "GeoTrust SSL" + }, + { + "type": "checkbox", + "label": "Show Seal", + "force_reload": true, + "id": "show_geotrust_ssl_seal" + }, + { + "type": "input", + "label": "Hostname", + "force_reload": true, + "id": "geotrust_ssl_seal_hostname" + }, + { + "type": "select", + "label": "Seal Size", + "id": "geotrust_ssl_seal_size", + "options": [ + { + "value": "M", + "label": "Medium" + }, + { + "value": "S", + "label": "Small" + } + ] } ] }, diff --git a/templates/components/common/footer.html b/templates/components/common/footer.html index f18be07a8f..683d10d160 100644 --- a/templates/components/common/footer.html +++ b/templates/components/common/footer.html @@ -71,6 +71,11 @@
{{lang 'footer.info'}}
{{> components/common/payment-icons}} + {{#if theme_settings.show_geotrust_ssl_seal}} +
+ {{> components/common/ssl-seal}} +
+ {{/if}} {{#if theme_settings.show_powered_by}}

Powered by BigCommerce

diff --git a/templates/components/common/ssl-seal.html b/templates/components/common/ssl-seal.html new file mode 100644 index 0000000000..011469be04 --- /dev/null +++ b/templates/components/common/ssl-seal.html @@ -0,0 +1,8 @@ + + + + +
+
+ +
From e165ada9d3075154481d70b9ab86e190aa5f57e4 Mon Sep 17 00:00:00 2001 From: Mario Campa Date: Thu, 9 Feb 2017 18:02:37 -0800 Subject: [PATCH 2/3] STENCIL-2598 using secure_host from the store settings --- config.json | 1 - schema.json | 6 ------ templates/components/common/footer.html | 4 ++-- .../common/{ssl-seal.html => geotrust-ssl-seal.html} | 2 +- 4 files changed, 3 insertions(+), 10 deletions(-) rename templates/components/common/{ssl-seal.html => geotrust-ssl-seal.html} (75%) diff --git a/config.json b/config.json index 77e4e0502f..2cc28f0e8e 100644 --- a/config.json +++ b/config.json @@ -247,7 +247,6 @@ "social_icon_placement_top": false, "social_icon_placement_bottom": "bottom_none", "show_geotrust_ssl_seal": false, - "geotrust_ssl_seal_hostname": "", "geotrust_ssl_seal_size": "M" }, "read_only_files": [ diff --git a/schema.json b/schema.json index 5a333284ec..e280d08c03 100644 --- a/schema.json +++ b/schema.json @@ -2228,12 +2228,6 @@ "force_reload": true, "id": "show_geotrust_ssl_seal" }, - { - "type": "input", - "label": "Hostname", - "force_reload": true, - "id": "geotrust_ssl_seal_hostname" - }, { "type": "select", "label": "Seal Size", diff --git a/templates/components/common/footer.html b/templates/components/common/footer.html index 683d10d160..cc2074060e 100644 --- a/templates/components/common/footer.html +++ b/templates/components/common/footer.html @@ -73,7 +73,7 @@
{{lang 'footer.info'}}
{{#if theme_settings.show_geotrust_ssl_seal}}
- {{> components/common/ssl-seal}} + {{> components/common/geotrust-ssl-seal}}
{{/if}} {{#if theme_settings.show_powered_by}} @@ -90,4 +90,4 @@
{{lang 'footer.info'}}
{{/if}}
- \ No newline at end of file + diff --git a/templates/components/common/ssl-seal.html b/templates/components/common/geotrust-ssl-seal.html similarity index 75% rename from templates/components/common/ssl-seal.html rename to templates/components/common/geotrust-ssl-seal.html index 011469be04..a3b0cec398 100644 --- a/templates/components/common/ssl-seal.html +++ b/templates/components/common/geotrust-ssl-seal.html @@ -1,7 +1,7 @@ From da4f570d4d68e8488ac6a80f8aa603d9f9720830 Mon Sep 17 00:00:00 2001 From: Michael Schock Date: Fri, 10 Feb 2017 10:21:59 -0800 Subject: [PATCH 3/3] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e02d6ec694..8d10b5cf15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Prevent carousel images from being cut off on large screens by adding a new setting to theme editor schema [#909](https://github.com/bigcommerce/stencil/pull/909) - Add schema description specifying that social media icons must be set up to see them [#920](https://github.com/bigcommerce/stencil/pull/920) - Show account creation links only if it is enabled in store settings [#917] (https://github.com/bigcommerce/stencil/pull/917) +- Add GeoTrust SSL Seal Toggle [#903] (https://github.com/bigcommerce/stencil/pull/903) ## 1.5.1 (2017-02-07) - Fix an issue with a horizontal scroll bar showing in theme editor [#915](https://github.com/bigcommerce/stencil/pull/915)
-
+