Skip to content
This repository has been archived by the owner on Aug 30, 2018. It is now read-only.

Standardized setting naming #173

Merged
merged 1 commit into from
Aug 7, 2014
Merged

Standardized setting naming #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions assets/checkout.css.liquid
View file
Open in desktop
Expand Up @@ -265,7 +265,7 @@ h1#tagline {
font-size: 26px;
line-height: 1.9;
text-shadow: none;
border-bottom: dotted 1px #e5e5e5;
border-bottom: dotted 1px {{ settings.color_borders }};
}

#overview .hint {
Expand All @@ -279,7 +279,7 @@ h1#tagline {
padding: 0 0 8px 0;
display: block;
font-size: 22px;
border-bottom: dotted 1px #e5e5e5;
border-bottom: dotted 1px {{ settings.color_borders }};
}

#overview br { display: none; }
Expand All @@ -295,7 +295,7 @@ h1#tagline {
text-align: center;
vertical-align: top;
padding: 4px;
border: dotted 1px #e5e5e5;
border: dotted 1px {{ settings.color_borders }};
}

#thumbs div {
Expand Down Expand Up @@ -413,7 +413,7 @@ h1#tagline {
}

#billing-is-shipping td {
border: solid 1px #e5e5e5;
border: solid 1px {{ settings.color_borders }};
padding: 5px;
}

Expand Down Expand Up @@ -581,7 +581,7 @@ input[type="submit"] {
#container input[type="tel"],
#container textarea,
#container select {
border: 1px solid #e5e5e5;
border: 1px solid {{ settings.color_borders }};
width: 100%;
max-width: 100%;
display: block;
Expand Down
2 changes: 1 addition & 1 deletion assets/timber.scss.liquid
View file
Open in desktop
Expand Up @@ -98,7 +98,7 @@ $colorTextBody: {{ settings.color_body_text }};
$colorBody: {{ settings.color_body_bg }};

// Border colors
$colorBorder: #e5e5e5;
$colorBorder: {{ settings.color_borders }};

// Nav and dropdown link background
$colorNav: #f2f2f2;
Expand Down
61 changes: 32 additions & 29 deletions config/settings.html
View file
Open in desktop
Expand Up @@ -48,6 +48,12 @@ <h3 class="heading">General Colors</h3>
</th>
<td colspan="2"><input id="color_body_bg" name="color_body_bg" class="color" type="text" value="#fffff" /></td>
</tr>
<tr>
<th>
<label for="color_borders">Border Colors</label>
</th>
<td colspan="2"><input id="color_borders" name="color_borders" class="color" type="text" value="#e5e5e5" /></td>
</tr>
<tr>
<td colspan="3">
<h3 class="heading">Body Text</h3>
Expand Down Expand Up @@ -139,8 +145,8 @@ <h3 class="heading">Favicon</h3>
<legend>Footer</legend>
<table>
<tr>
<th><label for="footer_display_quicklinks">Show quick links</label></th>
<td colspan="2"><input type="checkbox" id="footer_display_quicklinks" name="footer_display_quicklinks" value="1" /></td>
<th><label for="footer_quicklinks_enable">Show quick links</label></th>
<td colspan="2"><input type="checkbox" id="footer_quicklinks_enable" name="footer_quicklinks_enable" value="1" /></td>
</tr>
<tr>
<th><label for="footer_quicklinks_linklist">Quick links link list</label></th>
Expand All @@ -152,8 +158,8 @@ <h3 class="heading">Favicon</h3>
</td>
</tr>
<tr>
<th><label for="footer_display_social">Show social media links</label></th>
<td colspan="2"><input type="checkbox" id="footer_display_social" name="footer_display_social" value="1" /></td>
<th><label for="footer_social_enable">Show social media links</label></th>
<td colspan="2"><input type="checkbox" id="footer_social_enable" name="footer_social_enable" value="1" /></td>
</tr>
<tr>
<td><label for="social_twitter_link">Twitter link</label></td>
Expand All @@ -169,12 +175,12 @@ <h3 class="heading">Favicon</h3>
</td>
</tr>
<tr>
<th><label for="footer_display_newsletter">Show Newsletter Field</label></th>
<td colspan="2"><input type="checkbox" id="footer_display_newsletter" name="footer_display_newsletter" value="1" /></td>
<th><label for="footer_newsletter_enable">Show Newsletter Field</label></th>
<td colspan="2"><input type="checkbox" id="footer_newsletter_enable" name="footer_newsletter_enable" value="1" /></td>
</tr>
<tr>
<th><label for="mailing_list_form_action">MailChimp Form Action URL</label></th>
<td><input type="text" id="mailing_list_form_action" name="mailing_list_form_action" value="" /></td>
<th><label for="newsletter_form_action">MailChimp Form Action URL</label></th>
<td><input type="text" id="newsletter_form_action" name="newsletter_form_action" value="" /></td>
<td><a href="http://docs.shopify.com/support/configuration/store-customization/where-do-i-get-my-mailchimp-form-action" target="_blank">Where do I find my MailChimp form action URL?</a></td>
</tr>
</table>
Expand All @@ -189,23 +195,7 @@ <h3 class="heading">Favicon</h3>
<!-- Product Pages -->
<fieldset>
<legend>Product Pages</legend>
<table>
<tr>
<td colspan="3">
<h3 class="heading">Social Media Meta Tags</h3>
</td>
</tr>
<tr>
<td colspan="2">Social meta tags include <a href="https://developers.facebook.com/docs/opengraph/using-objects/" title="About Facebook Open Graph Objects">Facebook</a> and <a href="https://developers.pinterest.com/rich_pins/" title="About Pinterest Rich Pins">Pinterest</a> Open Graph Tags and <a href="https://dev.twitter.com/docs/cards/types/product-card" title="About Twitter Product Cards">Twitter Cards</a>. These are enabled by default to make the store more accessible on different platforms, and more readable for search engines.</td>
</tr>
<tr>
<th><label for="twittercard_handle">The Site's Twitter Handle</label></th>
<td>
<input type="text" id="twittercard_handle" name="twittercard_handle" size="50" /><br />
<small>E.g. @Shopify. Required for Twitter Cards.</small>
</td>
</tr>
</table>
<p>No product page settings are predefined in Timber.</p>
</fieldset>

<!-- Collection Pages -->
Expand All @@ -225,13 +215,13 @@ <h3 class="heading">Social Media Meta Tags</h3>
<legend>Cart Page</legend>
<table>
<tr>
<th><label for="cart_notes">Allow notes with orders</label></th>
<td><input type="checkbox" id="cart_notes" name="cart_notes" value="1" /></td>
<th><label for="cart_notes_enable">Allow notes with orders</label></th>
<td><input type="checkbox" id="cart_notes_enable" name="cart_notes_enable" value="1" /></td>
</tr>
<tr>
<th><label for="ajax_cart">Enable Ajaxify Cart</label></th>
<th><label for="ajax_cart_enable">Enable Ajaxify Cart</label></th>
<td>
<input type="checkbox" id="ajax_cart" name="ajax_cart" />
<input type="checkbox" id="ajax_cart_enable" name="ajax_cart_enable" />
<small><a href="http://shopify.com/timber#ajax-cart" title="Ajax Cart Documentation">View Documentation</a></small>
</td>
</tr>
Expand All @@ -247,3 +237,16 @@ <h3 class="heading">Social Media Meta Tags</h3>
</tr>
</table>
</fieldset>

<!-- Social Sharing -->
<fieldset>
<legend>Social Sharing</legend>
<table>
<tr>
<th>
<label for="twittercard_handle">Twitter Handle</label>
</th>
<td><input type="text" id="twittercard_handle" name="twittercard_handle" value="@" /></td>
</tr>
</table>
</fieldset>
11 changes: 6 additions & 5 deletions config/settings_data.json
View file
Open in desktop
Expand Up @@ -2,22 +2,23 @@
"current": "Default",
"presets": {
"Default": {
"ajax_cart": true,
"ajax_cart_enable": true,
"ajax_cart_method": "Drawer",
"cart_notes": true,
"cart_notes_enable": true,
"color_body_bg": "#fff",
"color_body_text": "#333333",
"color_borders": "#e5e5e5",
"color_footer_bg": "#f2f2f2",
"color_footer_social_link": "#bbbbbb",
"color_footer_text": "#636363",
"color_primary": "#747474",
"color_secondary": "#464646",
"customer_layout": "theme",
"favicon_enable": false,
"footer_display_newsletter": true,
"footer_display_quicklinks": true,
"footer_display_social": true,
"footer_newsletter_enable": true,
"footer_quicklinks_enable": true,
"footer_quicklinks_linklist": "footer",
"footer_social_enable": true,
"logo_max_width": "450",
"logo_use_image": false
}
Expand Down
4 changes: 2 additions & 2 deletions layout/theme.liquid
View file
Open in desktop
Expand Up @@ -34,7 +34,7 @@
<!-- CSS ================================================== -->
{{ 'timber.scss.css' | asset_url | stylesheet_tag }}

{% if settings.ajax_cart %}
{% if settings.ajax_cart_enable %}
<!-- Ajaxify Cart Plugin ================================================== -->
{{ 'ajaxify.scss.css' | asset_url | stylesheet_tag }}
{% endif %}
Expand Down Expand Up @@ -164,7 +164,7 @@
Ajaxify Cart Documentation:
- http://shopify.com/timber#ajax-cart
{% endcomment %}
{% if settings.ajax_cart %}
{% if settings.ajax_cart_enable %}
{{ 'handlebars.min.js' | asset_url | script_tag }}
{% include 'ajax-cart-template' %}
{{ 'ajaxify.js' | asset_url | script_tag }}
Expand Down
8 changes: 4 additions & 4 deletions snippets/footer.liquid
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@

<div class="grid">

{% if settings.footer_display_quicklinks %}
{% if settings.footer_quicklinks_enable %}
<div class="grid-item medium--one-half large--three-twelfths">
<h3>Quick Links</h3>
<ul>
Expand All @@ -15,7 +15,7 @@
</div>
{% endif %}

{% if settings.footer_display_social %}
{% if settings.footer_social_enable %}
<div class="grid-item medium--one-half large--five-twelfths">
<h3>Get Connected</h3>
{% comment %}
Expand All @@ -42,7 +42,7 @@
</div>
{% endif %}

{% if settings.footer_display_newsletter %}
{% if settings.footer_newsletter_enable %}
<div class="grid-item large--one-third">
<h3>Newsletter</h3>
{% include 'newsletter-form' %}
Expand Down Expand Up @@ -76,4 +76,4 @@

</div>

</footer>
</footer>
4 changes: 2 additions & 2 deletions snippets/newsletter-form.liquid
View file
Open in desktop
Expand Up @@ -8,9 +8,9 @@
- http://docs.shopify.com/support/configuration/store-customization/where-do-i-get-my-mailchimp-form-action

{% endcomment %}
<form action="{{ settings.mailing_list_form_action }}" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" target="_blank" class="input-group">
<form action="{{ settings.newsletter_form_action }}" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" target="_blank" class="input-group">
<input type="email" value="{% if customer %}{{ customer.email }}{% endif %}" placeholder="your-email@shopify.com" name="EMAIL" id="mail" class="input-group-field" aria-label="Email Address" autocorrect="off" autocapitalize="off">
<span class="input-group-btn">
<input type="submit" class="btn" value="Subscribe" name="subscribe" id="subscribe">
</span>
</form>
</form>
4 changes: 2 additions & 2 deletions templates/cart.liquid
View file
Open in desktop
Expand Up @@ -129,7 +129,7 @@
- Your theme settings can turn this on or off. Default is on.
- Make sure you have name="note" for the message to be submitted properly
{% endcomment %}
{% if settings.cart_notes %}
{% if settings.cart_notes_enable %}
<div class="grid-item large--one-half">
<label for="cartSpecialInstructions">Special instructions for seller</label>
<textarea name="note" class="input-full" id="cartSpecialInstructions">{{ cart.note }}</textarea>
Expand All @@ -139,7 +139,7 @@
{% comment %}
If notes are used, adjust the column width
{% endcomment %}
<div class="grid-item text-right {% if settings.cart_notes %}large--one-half{% endif %}">
<div class="grid-item text-right {% if settings.cart_notes_enable %}large--one-half{% endif %}">

<div class="cart-subtotal">
Subtotal
Expand Down