diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..fc40782 Binary files /dev/null and b/.DS_Store differ diff --git a/.gitignore b/.gitignore index d57ee8b..d3a1c90 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ desktop.ini Thumbs.db .sass-cache *.cfg -node_modules \ No newline at end of file +node_modules +package.json \ No newline at end of file diff --git a/.sass-cache/.DS_Store b/.sass-cache/.DS_Store new file mode 100644 index 0000000..012880c Binary files /dev/null and b/.sass-cache/.DS_Store differ diff --git a/content/review-response-8.htm b/content/review-response-8.htm new file mode 100644 index 0000000..0f0ae6e --- /dev/null +++ b/content/review-response-8.htm @@ -0,0 +1,7 @@ +--- +name: 'Review Response 8' +content_type: html +--- +

Store Response: 

+

Hi there, 

+

Sorry to hear you had a bad experience with the Ionic Band. We're sending you a replacement :)

\ No newline at end of file diff --git a/package.json b/package.json index 0793dbf..ec7c70f 100644 --- a/package.json +++ b/package.json @@ -1,4 +1,10 @@ { +<<<<<<< HEAD + "name": "lscloud-theme-ventro", + "version": "1.0.0", + "description": "A theme for LemonStand 2", + "main": "theme.yaml", +======= "name": "Ventro", "version": "1.0.0", "description": "Ventro is a modern responsive theme with clean lines, and minimal color. It is full-width, allowing you to use large hero images to express your value proposition and highlight your latest product. The homepage also has space for three featured categories, with a focus on imagery for visual appeal. The product pages continue with the modern layout with product images on the left, a description on the right, and then a section below for further details or product specifications.", @@ -15,6 +21,7 @@ "full": "https://raw.githubusercontent.com/lemonstand/lscloud-theme-ventro/master/resources/screenshots/full-size.png" } }, +>>>>>>> 323673364813ac849fc3de1bbd80e44aefee256e "scripts": { "test": "echo \"Error: no test specified\" && exit 1" }, @@ -22,7 +29,11 @@ "type": "git", "url": "git+https://github.com/lemonstand/lscloud-theme-ventro.git" }, +<<<<<<< HEAD + "author": "Daniel Park", +======= "author": "LemonStand (http://docs.lemonstand.com)", +>>>>>>> 323673364813ac849fc3de1bbd80e44aefee256e "license": "MIT", "bugs": { "url": "https://github.com/lemonstand/lscloud-theme-ventro/issues" @@ -34,6 +45,9 @@ "gulp-notify": "^2.2.0", "gulp-rename": "^1.2.2", "gulp-uglify": "^1.2.0" +<<<<<<< HEAD + } +======= }, "keywords": [ "1-page-checkout", @@ -41,4 +55,5 @@ "responsive", "electronics" ] +>>>>>>> 323673364813ac849fc3de1bbd80e44aefee256e } diff --git a/pages/.DS_Store b/pages/.DS_Store new file mode 100644 index 0000000..48913b6 Binary files /dev/null and b/pages/.DS_Store differ diff --git a/pages/blog-categories/code-breadcrumbs.htm b/pages/blog-categories/code-breadcrumbs.htm new file mode 100644 index 0000000..2b7d6f1 --- /dev/null +++ b/pages/blog-categories/code-breadcrumbs.htm @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/pages/blog-categories/code-setup.htm b/pages/blog-categories/code-setup.htm new file mode 100644 index 0000000..508ac3d --- /dev/null +++ b/pages/blog-categories/code-setup.htm @@ -0,0 +1 @@ +{% global active_page = 'blog' %} \ No newline at end of file diff --git a/pages/blog-categories/page-blog-categories.htm b/pages/blog-categories/page-blog-categories.htm new file mode 100644 index 0000000..1e3608c --- /dev/null +++ b/pages/blog-categories/page-blog-categories.htm @@ -0,0 +1,53 @@ +--- +action: 'cmscontent:archive' +description: 'Blog Categories' +template: default +protocol: all +published: true +name: 'Blog Categories' +url: '/archives/:type/:category' +--- +
+
+
+
+
+
+

Categories

+ {{ partial('blog-categories') }} +
+
+
+
+
+
+

{{ category }}

+
+
+ + {% if archives | length > 0 %} + {% paginate archives by 5 %} + {% for post in pagination.items %} +
+

{{ post.title }}

+
{{ post.excerpt | unescape }}
+ +
+
+ {% endfor %} +
+ {% navigation %} +
+ {% endpaginate %} + {% else %} +
+
+

Not found

+

No {{ type }} posts found in category: {{ category }} {{ categoryID }}

+
+
+ {% endif %} +
+
+
+
\ No newline at end of file diff --git a/pages/blog-post/code-breadcrumbs.htm b/pages/blog-post/code-breadcrumbs.htm new file mode 100644 index 0000000..3854aff --- /dev/null +++ b/pages/blog-post/code-breadcrumbs.htm @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/pages/blog-post/page-blog-post.htm b/pages/blog-post/page-blog-post.htm index 6522c33..7cf2c7b 100644 --- a/pages/blog-post/page-blog-post.htm +++ b/pages/blog-post/page-blog-post.htm @@ -4,6 +4,57 @@ protocol: all published: true name: 'Blog Post' +<<<<<<< HEAD +url: '/blog/:slug' +--- +{% if featured_image %} +
+
+ {{ featured_image.alt }} +
+
+{% endif %} + +
+
+
+
+
+ +
+
+

{{ post.title }}

+
+
+

Published {{ post.published_on | date("F j, Y") }} In {{ post.type }}

+
+
+
+ {{ post.body | unescape }} +
+ +
+ {% if profile_image %} + {{ profile_image.alt }} + {% endif %} + {{ post.author_name }} + +
+ {{ post.user.user_bio|unescape }} +
+
+
+
+
+
+
+======= url: /blog/:slug ---
@@ -24,4 +75,5 @@ {{ post.user.user_bio|unescape }}
- \ No newline at end of file + +>>>>>>> 323673364813ac849fc3de1bbd80e44aefee256e diff --git a/pages/blog/page-blog.htm b/pages/blog/page-blog.htm index 067d286..afe2bd4 100644 --- a/pages/blog/page-blog.htm +++ b/pages/blog/page-blog.htm @@ -1,30 +1,46 @@ --- action: 'cmscontent:archive' +description: 'blog template' template: default protocol: all published: true name: Blog -url: /blog +url: '/archives/:type' --- -
-
- {% set publishedPosts = 0 %} - {% for post in archives %} - {% if post.status == "published" %} +
+
+
+ {% if archives | length > 0 or publishedPosts > 0 %} + {% paginate archives by 5 %} + {% set publishedPosts = 0 %} +
+
+
+

Categories

+ {{ partial('blog-categories') }} +
+
+
+
+ {% for post in archives %} + {% if post.status == "published" %} {% set publishedPosts = publishedPosts + 1 %} - {% endif %} -
-

{{ post.title }}

+ {% endif %} +
+

{{ post.title }}

{{ post.excerpt | unescape }}
- -
-
- {% endfor %} - - {% if archives | length == 0 or publishedPosts == 0 %} -
-

No posts found

-
- {% endif %} + +
+
+ {% endfor %} +
+ {% navigation %} +
+
+ {% endpaginate %} + {% else %} +

No posts found

+ {% endif %}
-
\ No newline at end of file +
+ diff --git a/pages/contact/page-contact.htm b/pages/contact/page-contact.htm index a0aca19..8244c76 100644 --- a/pages/contact/page-contact.htm +++ b/pages/contact/page-contact.htm @@ -5,7 +5,6 @@ name: Contact url: /contact --- -
@@ -34,6 +33,7 @@

Need to send a message?

+
{{ close_form() }}
@@ -45,4 +45,3 @@

Contact Us here

- diff --git a/pages/product/code-breadcrumbs.htm b/pages/product/code-breadcrumbs.htm index f4a02f2..993b351 100644 --- a/pages/product/code-breadcrumbs.htm +++ b/pages/product/code-breadcrumbs.htm @@ -1,17 +1,17 @@ -{% set category = product ? product.categories[0] : null %} - -
-

- Home - / - {% if category %} - {% for parent in category.listAllParents() %} - {{ parent.name }} - / - {% endfor %} - {{ category.name }} - / - {% endif %} - {{ product.name }} -

+{% set category = product ? product.categories[0] : null %} + +
+

+ Home + / + {% if category %} + {% for parent in category.listAllParents() %} + {{ parent.name }} + / + {% endfor %} + {{ category.name }} + / + {% endif %} + {{ product.name }} +

\ No newline at end of file diff --git a/pages/product/page-product.htm b/pages/product/page-product.htm index ea62160..84186aa 100644 --- a/pages/product/page-product.htm +++ b/pages/product/page-product.htm @@ -6,7 +6,6 @@ name: Product url: '/product/:urlName' --- - {{ open_form({'class': 'custom', 'onsubmit': 'return false'}) }} {% if product %}
@@ -16,9 +15,6 @@

We are sorry, the requested product was not found.

{% endif %} {{ close_form() }} + {{ partial('shop-product-review-form') }} {{ partial('shop-product-review') }} - - - - \ No newline at end of file diff --git a/pages/review/review.htm b/pages/review/review.htm new file mode 100644 index 0000000..94454ca --- /dev/null +++ b/pages/review/review.htm @@ -0,0 +1,56 @@ +--- +template: default +protocol: all +published: true +name: review +url: /review +--- +{{ open_form({'data-ajax-handler': 'system:onSendMessage', 'data-test': 'true'}) }} +

Review this product

+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+ ☆☆☆☆☆ +
+
+ + +
+
+ + + + + + +{{ close_form() }} \ No newline at end of file diff --git a/partials/blog-categories.htm b/partials/blog-categories.htm new file mode 100644 index 0000000..bb44a22 --- /dev/null +++ b/partials/blog-categories.htm @@ -0,0 +1,15 @@ +{% set blogCategories = [] %} +
+ {% for post in cmsContent('blog')|extended_sort('published_on', false) %} + {% for category in post.categories %} + {% if category.name not in blogCategories %} +
+
+ {{ category.name }} +
+
+ {% set blogCategories = blogCategories|merge([category.name]) %} + {% endif %} + {% endfor %} + {% endfor %} +
\ No newline at end of file diff --git a/partials/breadcrumb-bar.htm b/partials/breadcrumb-bar.htm new file mode 100644 index 0000000..8ecc6c0 --- /dev/null +++ b/partials/breadcrumb-bar.htm @@ -0,0 +1,9 @@ +
+
+
+
+ {{ code_block('breadcrumbs') }} +
+
+
+
\ No newline at end of file diff --git a/partials/layout-header.htm b/partials/layout-header.htm index fede456..2423efb 100644 --- a/partials/layout-header.htm +++ b/partials/layout-header.htm @@ -1,9 +1,6 @@ - + +{{ content_block('promotion-text') }} +
-
  • - Blog + Blog
    • - -
  • - -
    • -