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

Reduce snippet dependency #361

Merged
cshold merged 11 commits into from
Mar 17, 2015
Merged

Reduce snippet dependency #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ad725a3
Combined open graph and twitter card snippet
cshold Mar 17, 2015
728c805
Move nav and newsletter forms inline
cshold Mar 17, 2015
53f0f2c
Inline search result markup, product list items
cshold Mar 17, 2015
9ca186b
Inline collection grid/list markup
cshold Mar 17, 2015
688bff4
Combine collection sorting/view snippets
cshold Mar 17, 2015
8c15177
Start/end comments for old snippets
cshold Mar 17, 2015
b2e017d
Cleaned up search result template
cshold Mar 17, 2015
ffbb9ac
Syntax for liquid vars
cshold Mar 17, 2015
ccdda94
Empty cart markup change
cshold Mar 17, 2015
778eb01
Add menu string for mobile nav trigger
cshold Mar 17, 2015
ec4e456
Moved strings to appropriate place in json
cshold Mar 17, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assets/ajax-cart.js.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ var ajaxCart = (function(module, $) {
// Show empty cart
if (cart.item_count === 0) {
$cartContainer
.append('<h4>' + {{ 'cart.general.empty' | t | json }} + '</h4>');
.append('<p>' + {{ 'cart.general.empty' | t | json }} + '</p>');
cartCallback(cart);
return;
}
Expand Down
146 changes: 134 additions & 12 deletions layout/theme.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,8 @@
<meta name="description" content="{{ page_description | escape }}">
{% endif %}

<!-- Product meta ================================================== -->
{% include 'open-graph-tags' %}
{% include 'twitter-card' %}

<!-- Helpers ================================================== -->
{% include 'social-meta-tags' %}
<link rel="canonical" href="{{ canonical_url }}">
<meta name="viewport" content="width=device-width,initial-scale=1">
<meta name="theme-color" content="{{ settings.color_primary }}">
Expand All @@ -37,7 +34,6 @@

<!-- Header hook for plugins ================================================== -->
{{ content_for_header }}

{% include 'oldIE-js' %}

{{ '//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js' | script_tag }}
Expand All @@ -59,15 +55,86 @@

<div id="NavDrawer" class="drawer drawer--left">
<div class="drawer__header">
<div class="drawer__title h3">{{ 'general.drawers.browse' | t }}</div>
<div class="drawer__title h3">{{ 'layout.drawers.browse' | t }}</div>
<div class="drawer__close js-drawer-close">
<button type="button" class="icon-fallback-text">
<span class="icon icon-x" aria-hidden="true"></span>
<span class="fallback-text">{{ 'general.drawers.close_menu' | t }}</span>
<span class="fallback-text">{{ 'layout.drawers.close_menu' | t }}</span>
</button>
</div>
</div>
{% include 'mobile-nav' %}
<!-- begin mobile-nav -->
<ul class="mobile-nav">
<li class="mobile-nav__item mobile-nav__search">
{% include 'search-bar' %}
</li>
Copy link
Contributor

@mpiotrowicz mpiotrowicz Mar 17, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you add HTML comments denoting the start/end to the old snippets? I think it would go a long way in helping ppl navigate this file.

Eg

// begin mobile nav

Copy link
Contributor Author

@cshold cshold Mar 17, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

{% for link in linklists.main-menu.links %}
{% comment %}
Create a dropdown menu by naming a linklist the same as a link in the parent nav

More info on dropdowns:
- http://docs.shopify.com/manual/your-website/navigation/create-drop-down-menu
{% endcomment %}
{% assign child_list_handle = link.title | handleize %}
{% if linklists[child_list_handle].links != blank %}
<li class="mobile-nav__item{% if link.active %} mobile-nav__item--active{% endif %}" aria-haspopup="true">
<div class="mobile-nav__has-sublist">
<a href="{{ link.url }}" class="mobile-nav__link">{{ link.title }}</a>
<div class="mobile-nav__toggle">
<button type="button" class="icon-fallback-text mobile-nav__toggle-open">
<span class="icon icon-plus" aria-hidden="true"></span>
<span class="fallback-text">See More</span>
</button>
<button type="button" class="icon-fallback-text mobile-nav__toggle-close">
<span class="icon icon-minus" aria-hidden="true"></span>
<span class="fallback-text">{{ 'cart.general.close_cart' | t | json }}</span>
</button>
</div>
</div>
<ul class="mobile-nav__sublist">
{% for childlink in linklists[child_list_handle].links %}
<li class="mobile-nav__item {% if childlink.active %} mobile-nav__item--active{% endif %}">
<a href="{{ childlink.url }}" class="mobile-nav__link">{{ childlink.title | escape }}</a>
</li>
{% endfor %}
</ul>
</li>
{% else %}
<li class="mobile-nav__item{% if link.active %} mobile-nav__item--active{% endif %}">
<a href="{{ link.url }}" class="mobile-nav__link">{{ link.title }}</a>
</li>
{% endif %}
{% endfor %}

{% comment %}
If customer accounts are enabled, provide login and create account links
{% endcomment %}
{% if shop.customer_accounts_enabled %}
{% if customer %}
<li class="mobile-nav__item">
{% if customer.first_name != blank %}
{% capture first_name %}<a href="/account">{{ customer.first_name }}</a>{% endcapture %}
{{ 'layout.customer.logged_in_as_html' | t: first_name: first_name }}
{% else %}
<a href="/account">{{ 'layout.customer.account' | t }}</a>
{% endif %}
</li>
<li class="mobile-nav__item">
{{ 'layout.customer.log_out' | t | customer_logout_link }}
</li>
{% else %}
<li class="mobile-nav__item">
{{ 'layout.customer.log_in' | t | customer_login_link }}
</li>
{% if shop.customer_accounts_optional %}
<li class="mobile-nav__item">
{{ 'layout.customer.create_account' | t | customer_register_link }}
</li>
{% endif %}
{% endif %}
{% endif %}
</ul>
Copy link
Contributor

@mpiotrowicz mpiotrowicz Mar 17, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

// end mobile nav

<!-- //mobile-nav -->
</div>
<div id="CartDrawer" class="drawer drawer--right">
<div class="drawer__header">
Expand Down Expand Up @@ -162,15 +229,52 @@
<nav class="nav-bar" role="navigation">
<div class="wrapper">
<div class="medium-down--hide">
{% include 'site-nav' %}
{% comment %}
List out your main-menu linklist (default)

More info on linklists:
- http://docs.shopify.com/themes/liquid-variables/linklists
{% endcomment %}
<!-- begin site-nav -->
<ul class="site-nav" id="AccessibleNav">
{% for link in linklists.main-menu.links %}
{% comment %}
Create a dropdown menu by naming a linklist the same as a link in the parent nav

More info on dropdowns:
- http://docs.shopify.com/manual/your-website/navigation/create-drop-down-menu
{% endcomment %}
{% assign child_list_handle = link.title | handleize %}
{% if linklists[child_list_handle].links != blank %}
<li class="site-nav--has-dropdown{% if link.active %} site-nav--active{% endif %}" aria-haspopup="true">
<a href="{{ link.url }}" class="site-nav__link">
{{ link.title }}
<span class="icon icon-arrow-down" aria-hidden="true"></span>
</a>
<ul class="site-nav__dropdown">
{% for childlink in linklists[child_list_handle].links %}
<li{% if childlink.active %} class="site-nav--active"{% endif %}>
<a href="{{ childlink.url }}" class="site-nav__link">{{ childlink.title | escape }}</a>
</li>
{% endfor %}
</ul>
</li>
{% else %}
<li {% if link.active %}class="site-nav--active"{% endif %}>
<a href="{{ link.url }}" class="site-nav__link">{{ link.title }}</a>
</li>
{% endif %}
{% endfor %}
</ul>
<!-- //site-nav -->
</div>
<div class="large--hide medium-down--show">
<div class="grid">
<div class="grid__item one-half">
<div class="site-nav--mobile">
<button type="button" class="icon-fallback-text site-nav__link js-drawer-open-left" aria-controls="NavDrawer" aria-expanded="false">
<span class="icon icon-hamburger" aria-hidden="true"></span>
<span class="fallback-text">Mobile Navigation</span>
<span class="fallback-text">{{ 'layout.navigation.menu' | t }}</span>
</button>
</div>
</div>
Expand Down Expand Up @@ -223,8 +327,26 @@
{% endif %}
{% if settings.footer_newsletter_enable %}
<div class="grid__item large--one-quarter medium--one-half">
{% comment %}
MailChimp is the go-to newsletter service for Shopify.
Use the link below to find your MailChimp form action
and insert it in your site settings.

MailChimp newsletter integration and requirement:
- http://docs.shopify.com/support/configuration/store-customization/where-do-i-get-my-mailchimp-form-action
{% endcomment %}
<h3>{{ 'layout.footer.newsletter_title' | t }}</h3>
{% include 'newsletter-form' %}
{% if settings.newsletter_form_action != blank %}
{% assign form_action = settings.newsletter_form_action %}
{% else %}
{% assign form_action = '#' %}
{% endif %}
<form action="{{ 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="{{ 'general.newsletter_form.newsletter_email' | t }}" name="EMAIL" id="mail" class="input-group-field" aria-label="{{ 'general.newsletter_form.newsletter_email' | t }}" autocorrect="off" autocapitalize="off">
<span class="input-group-btn">
<input type="submit" class="btn" name="subscribe" id="subscribe" value="{{ 'general.newsletter_form.submit' | t }}">
</span>
</form>
</div>
{% endif %}
<div class="grid__item text-center">
Expand All @@ -239,7 +361,7 @@
<li>
<span class="icon-fallback-text">
<span class="icon icon-{{type}}" aria-hidden="true"></span>
<span class="fallback-text">{{type | replace: '_',' '}}</span>
<span class="fallback-text">{{ type | replace: '_',' '}}</span>
</span>
</li>
{% endfor %}
Expand Down
11 changes: 7 additions & 4 deletions locales/de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
"title": "Suchen Sie auf unserer Seite nach Produkten",
"placeholder": "Durchsuchen Sie unseren Shop",
"submit": "Suchen"
},
"drawers": {
"browse": "Durchsuchen",
"close_menu": "Menü schließen"
}
},
"blogs": {
Expand Down Expand Up @@ -237,6 +233,13 @@
}
},
"layout": {
"navigation": {
"menu": "Menü"
},
"drawers": {
"browse": "Durchsuchen",
"close_menu": "Menü schließen"
},
"cart": {
"title": "Einkaufswagen",
"items_count": {
Expand Down
11 changes: 7 additions & 4 deletions locales/en.default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
"title": "Search for products on our site",
"placeholder": "Search our store",
"submit": "Search"
},
"drawers": {
"browse": "Browse",
"close_menu": "Close menu"
}
},
"blogs": {
Expand Down Expand Up @@ -237,6 +233,13 @@
}
},
"layout": {
"navigation": {
"menu": "Menu"
},
"drawers": {
"browse": "Browse",
"close_menu": "Close menu"
},
"cart": {
"title": "Cart",
"items_count": {
Expand Down
11 changes: 7 additions & 4 deletions locales/es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
"title": "Buscar productos en nuestro sitio",
"placeholder": "buscar en nuestra tienda",
"submit": "Buscar"
},
"drawers": {
"browse": "Navegar",
"close_menu": "Cerrar menú"
}
},
"blogs": {
Expand Down Expand Up @@ -237,6 +233,13 @@
}
},
"layout": {
"navigation": {
"menu": "Menú"
},
"drawers": {
"browse": "Navegar",
"close_menu": "Cerrar menú"
},
"cart": {
"title": "Carrito",
"items_count": {
Expand Down
11 changes: 7 additions & 4 deletions locales/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
"title": "Effectuez une recherche",
"placeholder": "Rechercher dans la boutique",
"submit": "Recherche"
},
"drawers": {
"browse": "Explorer",
"close_menu": "Fermer le menu"
}
},
"blogs": {
Expand Down Expand Up @@ -237,6 +233,13 @@
}
},
"layout": {
"navigation": {
"menu": "Menu"
},
"drawers": {
"browse": "Explorer",
"close_menu": "Fermer le menu"
},
"cart": {
"title": "Panier",
"items_count": {
Expand Down
11 changes: 7 additions & 4 deletions locales/pt-BR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
"title": "Buscar produtos em nosso site",
"placeholder": "Busque em nossa loja",
"submit": "Buscar"
},
"drawers": {
"browse": "Navegar",
"close_menu": "Fechar menu"
}
},
"blogs": {
Expand Down Expand Up @@ -237,6 +233,13 @@
}
},
"layout": {
"navigation": {
"menu": "Menu"
},
"drawers": {
"browse": "Navegar",
"close_menu": "Fechar menu"
},
"cart": {
"title": "Carrinho",
"items_count": {
Expand Down
11 changes: 7 additions & 4 deletions locales/pt-PT.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
"title": "Pesquisar produtos no nosso site",
"placeholder": "Pesquisar a nossa loja",
"submit": "Pesquisar"
},
"drawers": {
"browse": "Navegar",
"close_menu": "Fechar menu"
}
},
"blogs": {
Expand Down Expand Up @@ -237,6 +233,13 @@
}
},
"layout": {
"navigation": {
"menu": "Menu"
},
"drawers": {
"browse": "Navegar",
"close_menu": "Fechar menu"
},
"cart": {
"title": "Carrinho de Compras",
"items_count": {
Expand Down
36 changes: 0 additions & 36 deletions snippets/collection-grid-item.liquid
View file
Open in desktop

This file was deleted.

Loading