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

Commit

Permalink
Merge pull request #364 from Shopify/homepage
Browse files Browse the repository at this point in the history
Home page to homepage
  • Loading branch information
cshold committed Mar 17, 2015
2 parents 023aedf + 8a4d5d8 commit c8560d0
Show file tree
Hide file tree
Showing 11 changed files with 21 additions and 21 deletions.
6 changes: 3 additions & 3 deletions config/settings.html
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,10 @@ <h3 class="heading">Favicon</h3>
</table>
</fieldset>

<!-- Home Page -->
<!-- Homepage -->
<fieldset>
<legend>Home Page</legend>
<p>No home page settings are predefined in Timber.</p>
<legend>Homepage</legend>
<p>No homepage settings are predefined in Timber.</p>
</fieldset>

<!-- Product Pages -->
Expand Down
2 changes: 1 addition & 1 deletion locales/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@
"cancel": "Zurück zum Shop"
}
},
"home_page": {
"homepage": {
"sections": {
"frontpage_title": "Startseite-Zusammenstellung",
"featured_title": "Ausgewählte Zusammenstellungen",
Expand Down
2 changes: 1 addition & 1 deletion locales/en.default.json
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@
"cancel": "Return to Store"
}
},
"home_page": {
"homepage": {
"sections": {
"frontpage_title": "Frontpage Collection",
"featured_title": "Featured Collections",
Expand Down
2 changes: 1 addition & 1 deletion locales/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@
"cancel": "Volver a la tienda"
}
},
"home_page": {
"homepage": {
"sections": {
"frontpage_title": "Colección de portada",
"featured_title": "Colecciones destacadas",
Expand Down
2 changes: 1 addition & 1 deletion locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@
"password": "Mot de passe"
}
},
"home_page": {
"homepage": {
"sections": {
"frontpage_title": "Collection Frontpage",
"featured_title": "Collections en vedette",
Expand Down
2 changes: 1 addition & 1 deletion locales/pt-BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@
"cancel": "Retornar à loja"
}
},
"home_page": {
"homepage": {
"sections": {
"frontpage_title": "Coleção \"Primeira Página\"",
"featured_title": "Coleções em destaque",
Expand Down
2 changes: 1 addition & 1 deletion locales/pt-PT.json
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@
"cancel": "Regressar à Loja"
}
},
"home_page": {
"homepage": {
"sections": {
"frontpage_title": "Coleção Frontpage",
"featured_title": "Coleções em Destaque",
Expand Down
2 changes: 1 addition & 1 deletion snippets/onboarding-empty-collection.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
{% capture imageUrl %}//cdn.shopify.com/s/images/themes/product-{{ index }}.png{% endcapture %}
{{ imageUrl | img_tag }}
</a>
<p class="h6"><a href="/admin/products">{{ 'home_page.onboarding.product_title' | t }}</a></p>
<p class="h6"><a href="/admin/products">{{ 'homepage.onboarding.product_title' | t }}</a></p>
<p>$19.99</p>
</div>
{% assign index = index | plus: 1 %}
Expand Down
8 changes: 4 additions & 4 deletions snippets/onboarding-featured-collections.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<div class="helper-section">
<div class="helper-note">
<span class="helper-icon"></span>
<h3>{{ 'home_page.onboarding.modal_title' | t }}</h3>
<p>{{ 'home_page.onboarding.no_collections_html' | t }}</p>
<p><a class="admin-btn-primary" href="/admin/custom_collections">{{ 'home_page.onboarding.add_collection' | t }}</a></p>
<h3>{{ 'homepage.onboarding.modal_title' | t }}</h3>
<p>{{ 'homepage.onboarding.no_collections_html' | t }}</p>
<p><a class="admin-btn-primary" href="/admin/custom_collections">{{ 'homepage.onboarding.add_collection' | t }}</a></p>
</div>

<div class="grid-uniform text-center helper-content">
Expand All @@ -16,7 +16,7 @@
{{ imageUrl | img_tag }}
</a>
<p>
<a href="#">{{ 'home_page.onboarding.collection_title' | t }}</a><br>
<a href="#">{{ 'homepage.onboarding.collection_title' | t }}</a><br>
{{ 'collections.general.items_with_count' | t: count: i }}
</p>
</div>
Expand Down
8 changes: 4 additions & 4 deletions snippets/onboarding-featured-products.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<div class="helper-section">
<div class="helper-note">
<span class="helper-icon"></span>
<h3>{{ 'home_page.onboarding.modal_title' | t }}</h3>
<p>{{ 'home_page.onboarding.no_products_html' | t }}</p>
<p><a class="admin-btn-primary" href="/admin/collections?tutorial=Frontpage">{{ 'home_page.onboarding.add_product' | t }}</a></p>
<h3>{{ 'homepage.onboarding.modal_title' | t }}</h3>
<p>{{ 'homepage.onboarding.no_products_html' | t }}</p>
<p><a class="admin-btn-primary" href="/admin/collections?tutorial=Frontpage">{{ 'homepage.onboarding.add_product' | t }}</a></p>
</div>

<div class="grid-uniform helper-content">
Expand All @@ -15,7 +15,7 @@
{% capture imageUrl %}//cdn.shopify.com/s/images/themes/product-{{ i }}.png{% endcapture %}
{{ imageUrl | img_tag }}
</a>
<p class="h6"><a href="/admin/products">{{ 'home_page.onboarding.product_title' | t }}</a></p>
<p class="h6"><a href="/admin/products">{{ 'homepage.onboarding.product_title' | t }}</a></p>
<p>$19.99</p>
</div>
{% endfor %}
Expand Down
6 changes: 3 additions & 3 deletions templates/index.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
- http://docs.shopify.com/themes/liquid-variables/global
{% endcomment %}

<h2>{{ 'home_page.sections.frontpage_title' | t }}</h2>
<h2>{{ 'homepage.sections.frontpage_title' | t }}</h2>

{% comment %}
Use class grid-uniform to have evenly sized columns clear
Expand Down Expand Up @@ -48,7 +48,7 @@

<hr>

<h2>{{ 'home_page.sections.featured_title' | t }}</h2>
<h2>{{ 'homepage.sections.featured_title' | t }}</h2>

<div class="grid-uniform">

Expand Down Expand Up @@ -119,7 +119,7 @@
handle we want to focus on. For this example we'll use the default 'news',
but you can create a blog page-specific content if you want.
{% endcomment %}
<h2>{{ 'home_page.sections.news_title' | t }}</h2>
<h2>{{ 'homepage.sections.news_title' | t }}</h2>

<div class="grid">
{% for article in blogs['news'].articles limit:3 %}
Expand Down

0 comments on commit c8560d0

Please sign in to comment.