Merge pull request #86 from Shopify/settings-cleanse

Settings cleanse to promote simplicity again

config/settings.html

@@ -21,7 +21,7 @@ <h3 class="heading">Timber Theme Framework by <a href="http://www.shopify.com">S
     <tr>
       <td colspan="2">
         Use <em>class="color"</em> on a an <em>input</em> tag to bring up the color picker.<br />
-        Only a few colors have been included here for reference.
+        Only a few colors have been included here as an example.
       </td>
     </tr>
     <tr>
@@ -119,10 +119,6 @@ <h3 class="heading">Footer Colors</h3>
       <th><label for="footer_display_contact">Show footer contact info</label></th>
       <td colspan="2"><input type="checkbox" id="footer_display_contact" name="footer_display_contact" value="1" /></td>
     </tr>
-    <tr>
-      <th><label for="footer_contact_title">Footer contact title</label></th>
-      <td colspan="2"><input type="text" id="footer_contact_title" name="footer_contact_title" value="" /></td>
-    </tr>
     <tr>
       <th><label for="footer_contact_text">Footer contact text</label></th>
       <td colspan="2">
@@ -188,10 +184,6 @@ <h3 class="heading">Footer Colors</h3>
       <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>
     </tr>
-    <tr>
-      <th><label for="footer_newsletter_title">Newsletter Title</label></th>
-      <td colspan="2"><input type="text" id="footer_newsletter_title" name="footer_newsletter_title" value="" /></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>
@@ -204,10 +196,6 @@ <h3 class="heading">Footer Colors</h3>
 <fieldset>
   <legend>Product Pages</legend>
   <table>
-    <tr>
-      <td><label for="product_quantity">Show quantity selector</label></td>
-      <td><input type="checkbox" id="product_quantity" name="product_quantity" /></td>
-    </tr>
     <tr>
       <td colspan="3">
         <h3 class="heading">Social Media Meta Tags</h3>
@@ -223,19 +211,6 @@ <h3 class="heading">Social Media Meta Tags</h3>
         <small>E.g. @Shopify. Required for Twitter Cards.</small>
       </td>
     </tr>
-    <tr>
-      <td colspan="2">
-        <h3 class="heading">Related Products</h3>
-      </td>
-    </tr>
-    <tr>
-      <th><label for="related_products">Enable Related Products</label></th>
-      <td><input type="checkbox" id="related_products" name="related_products" value="1" /></td>
-    </tr>
-    <tr>
-      <th><label for="related_products_title">Related Products Title</label></th>
-      <td><input type="text" id="related_products_title" name="related_products_title" size="50" value="" /></td>
-    </tr>
   </table>
 </fieldset>
 

config/settings_data.json

@@ -3,9 +3,7 @@
     "use_logo": false,
     "customer_layout": "theme",
     "footer_display_contact": true,
-    "footer_contact_title": "Contact Us",
     "footer_display_social": true,
-    "footer_social_title": "Follow Us",
     "twitter_link": "https://twitter.com/shopify",
     "facebook_link": "https://facebook.com/shopify",
     "pinterest_link": "http://www.pinterest.com/shopify/",
@@ -16,16 +14,11 @@
     "vimeo_link": "http://vimeo.com/shopify",
     "fancy_link": "http://fancy.com/search?q=shopify",
     "footer_display_newsletter": true,
-    "footer_newsletter_title": "Newsletter",
-    "product_quantity": true,
     "cart_notes": true,
     "ajax_cart": true,
     "ajax_cart_method": "Drawer",
-    "related_products": true,
-    "related_products_title": "We Also Recommend",
     "primary_color": "#747474",
     "secondary_color": "#464646",
-    "accent_color": "#ffea00",
     "body_text_color": "#333333",
     "body_background_color": "#ffffff",
     "footer_color": "#f2f2f2",
@@ -38,20 +31,13 @@
       "logo_max_width": "450px",
       "customer_layout": "theme",
       "footer_display_contact": true,
-      "footer_contact_title": "Contact Us",
       "footer_display_social": true,
-      "footer_social_title": "Follow Us",
       "footer_display_newsletter": true,
-      "footer_newsletter_title": "Newsletter",
-      "product_quantity": true,
       "cart_notes": true,
       "ajax_cart": true,
       "ajax_cart_method": "Drawer",
-      "related_products": true,
-      "related_products_title": "We Also Recommend",
       "primary_color": "#747474",
       "secondary_color": "#464646",
-      "accent_color": "#ffea00",
       "body_text_color": "#333333",
       "footer_color": "#f2f2f2",
       "footer_text_color": "#636363",

snippets/footer.liquid

@@ -6,7 +6,7 @@
 
       {% if settings.footer_display_contact %}
       <div class="grid-item medium--one-half large--one-third">
-        <h3>{{ settings.footer_contact_title }}</h3>
+        <h3>Contact Us</h3>
         <p>
           {% if settings.footer_contact_text != blank %}
             {{ settings.footer_contact_text }}
@@ -19,7 +19,7 @@
 
       {% if settings.footer_display_social %}
       <div class="grid-item medium--one-half large--one-third">
-        <h3>{{ settings.footer_social_title }}</h3>
+        <h3>Follow Us</h3>
 
         {% comment %}
           Loop through the persistent theme settings and list out each social network link.
@@ -40,7 +40,7 @@
 
       {% if settings.footer_display_newsletter %}
       <div class="grid-item large--one-third">
-        <h3>{{ settings.footer_newsletter_title }}</h3>
+        <h3>Newsletter</h3>
         {% include 'newsletter-form' %}
       </div>
       {% endif %}

templates/product.liquid

@@ -128,13 +128,8 @@
             </span>
           {% endif %}
 
-          {% comment %}
-            Quantity selector is optional
-          {% endcomment %}
-          {% if settings.product_quantity %}
-            <label for="quantity">Quantity</label>
-            <input type="number" id="quantity" name="quantity" value="1" min="1">
-          {% endif %}
+          <label for="quantity">Quantity</label>
+          <input type="number" id="quantity" name="quantity" value="1" min="1">
 
           <input type="submit" name="add" class="btn" id="addToCart" value="Add to Cart">
         </form>
@@ -174,11 +169,6 @@
     </div>
   </div>
 
-  {% if settings.related_products %}
-    {% assign grid_item_width = 'large--one-fifth medium--one-half' %}
-    {% include 'related-products' %}
-  {% endif %}
-
 </div>