Merge branch 'ventro-amir'

ventro updates

.gitignore

@@ -0,0 +1,7 @@
+# System files
+.DS_Store
+desktop.ini
+Thumbs.db
+.sass-cache
+*.cfg
+node_modules

README.md

@@ -1 +1,21 @@
-# lscloud-theme-ventro
+Ventro Theme For LemonStand Cloud
+=================
+
+A simple responsive theme for LemonStand thats easy to customize.
+
+It's based on the Bootstrap CSS framework.
+
+# Features
+
+* Responsive / mobile-friendly
+* Upload your own logo and banner image
+* Upload your own favicon.ico image
+* Simple checkout pages
+* Breadcrumbs
+* Supports product options, variants, attributes
+* Guest and registered checkout
+* "Copy billing information" on checkout
+
+[Visit LemonStand](www.lemonstand.com)
+
+[LemonStand Docs](docs.lemonstand.com)

gulpfile.js

@@ -0,0 +1,31 @@
+// Getting started with gulp:
+// https://markgoodyear.com/2014/01/getting-started-with-gulp/
+
+// Load plugins
+var gulp = require('gulp'),
+    uglify = require('gulp-uglify'),
+    concat = require('gulp-concat'),
+    rename = require('gulp-rename'),
+    notify = require('gulp-notify');
+
+// Scripts
+gulp.task('scripts', function() {
+  return gulp.src('resources/js/**/*.js')
+    .pipe(concat('main.js'))
+    .pipe(gulp.dest('resources/js'))
+    .pipe(rename({ suffix: '.min' }))
+    .pipe(uglify())
+    .pipe(gulp.dest('resources/js'))
+    .pipe(notify({ message: 'Scripts task complete' }));
+});
+
+// Watch
+gulp.task('watch', function() {
+
+  // Watch .js files
+  gulp.watch('resources/js/*.js', ['scripts']);
+
+});
+
+// Default task
+gulp.task('default', ['scripts', 'watch']);

package.json

@@ -0,0 +1,26 @@
+{
+  "name": "lscloud-theme-ventro",
+  "version": "1.0.0",
+  "description": "A theme for LemonStand 2",
+  "main": "theme.yaml",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lemonstand/lscloud-theme-ventro.git"
+  },
+  "author": "Daniel Park",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/lemonstand/lscloud-theme-ventro/issues"
+  },
+  "homepage": "https://github.com/lemonstand/lscloud-theme-ventro#readme",
+  "devDependencies": {
+    "gulp": "^3.9.0",
+    "gulp-concat": "^2.6.0",
+    "gulp-notify": "^2.2.0",
+    "gulp-rename": "^1.2.2",
+    "gulp-uglify": "^1.2.0"
+  }
+}

pages/about/page-about.htm

@@ -23,8 +23,8 @@ <h1>About Ventro</h1>
 		</div>
 		<div class="col-md-3">
 			<div class="col-md-12">
-				<img src="{{ 'images/dpark.jpg'|theme_resource }}" alt="">
-				<h3>Daniel Park</h3>
+				<img src="{{ 'images/young-woman.jpg'|theme_resource }}" alt="Hannah Simpson smiling">
+				<h3>Hannah Simpson</h3>
 				<p>Co-founder/Product Manager</p>
 			</div>
 		</div>

pages/category/page-category.htm

@@ -2,7 +2,7 @@
 action: 'shop:category'
 template: default
 protocol: all
-published: true
+published: 1
 name: Category
 url: '/category/:urlName@/:page?'
 ---

pages/contact/page-contact.htm

@@ -19,7 +19,7 @@ <h1>Contact Ventro</h1>
 		<div class="col-md-9">
 			{{ open_form({'data-ajax-handler': 'system:onSendMessage'}) }}
 			{{ flash() }}
-				<div class="form">
+				<div class="form" id="contact-form">
 					<h3>Need to send a message?</h3>
 					<div class="form-group">
 						<input class="required input-sm form-control" placeholder="Email Address*" value="" name="fields[email]" id="fields_email"/>
@@ -31,6 +31,7 @@ <h3>Need to send a message?</h3>
 						<textarea rows="10" class="required input-sm form-control" placeholder="Message*" value="" name="fields[message]" id="fields_message"></textarea>
 						<span class="error"></span>
 					</div>
+					<input type="hidden" name="redirect" value="/sample"/>
 					<input type="submit" class="btn-default btn" value="Submit"/>
 					<input type="text" name="hp" value="" style="display: none"/>
 				</div>
@@ -44,3 +45,4 @@ <h3>Contact Us here</h3>
 		</div>
 	</div>
 </div>
+

pages/home/page-home.htm

@@ -10,10 +10,10 @@
 <div class="container-fluid home-feature">
 	<div class="container">
 		<div class="row">
-			<div class="col-md-4">
+			<div class="col-md-12">
 				<h1>{{ theme.homeHeaderTitle }}</h1>
 				<p>{{ theme.homeHeaderSubtitle }}</p>
-				<a href="/category/{{ theme.homeHeaderButtonURL }}" class="btn btn-default">{{ theme.homeHeaderButtonTitle }}</a>
+				<a href="/category/{{ theme.homeHeaderButtonURL }}" class="btn btn-default btn-cta">{{ theme.homeHeaderButtonTitle }}</a>
 			</div>
 		</div>
 	</div>
@@ -62,8 +62,6 @@ <h2 class="text-center">Latest Products</h2>
 
 	</div>
 </div>
-{{ partial('newsletter') }}
-
 
 <div class="container-fluid home-features">
 	<div class="container">

pages/sample/page-sample.htm

@@ -0,0 +1,13 @@
+---
+template: default
+protocol: all
+published: true
+name: Sample
+url: /sample
+---
+
+<div>
+  <p id="contact-name"></p>
+  <p id="contact-email"></p>
+  <p id="contact-message"></p>
+</div>

pages/search/page-search.htm

@@ -0,0 +1,27 @@
+---
+action: 'shop:search'
+template: home
+protocol: all
+published: true
+name: Search
+url: /search
+---
+<div class="container-fluid product-grid">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-12 text-center">
+        <p>Products found: {{ products.get().count() }}</p>
+      </div>
+      <div class="col-md-12">
+        {% set productCounter = 0 %}
+        {% for product in products.get()|extended_sort('created_at', false) %}
+          {% if productCounter < products.get().count() %}
+            {{ partial('shop-grid-item', {'product': product}) }}
+          {% endif %}
+          {% set productCounter = productCounter + 1 %}
+        {% endfor %}
+
+      </div>
+    </div>
+  </div>
+</div>

partials/layout-footer.htm

@@ -52,13 +52,8 @@ <h5>Follow us Socially</h5>
 	</div>
 </footer>
 
-
-
-
-
-
-
-<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"></script>
 <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
 <script src="{{ 'js/ajaxchimp.min.js'|theme_resource }}"></script>
 <script src="{{ 'js/hammer.min.js'|theme_resource }}"></script>

partials/layout-head.htm

@@ -1,8 +1,9 @@
-
+<title>{{ theme.title }}</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="Description" content="{{ page.description }}"/>
 <meta name="Keywords" content="{{ page.keywords }}"/>
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
+<link rel="icon" type="image/png" href="{{ theme.faviconImage.thumbnail('16', '16') }}"/>
 
 <link rel="shortcut icon" href="{{ theme.faviconImage.thumbnail('auto', 'auto') }}" type="image/png">
 <link rel="icon" href="{{ theme.faviconImage.thumbnail('auto', 'auto') }}" type="image/png">
@@ -17,22 +18,30 @@
 
 <link rel="stylesheet" href="{{ 'stylesheets/main.css'|theme_resource }}">
 <link rel="stylesheet" href="{{ 'stylesheets/checkout.css'|theme_resource }}">
+<link rel="stylesheet" href="{{ 'stylesheets/custom.css'|theme_resource }}">
 
 
 <style>
 
-.home-feature{
+.home-feature {
  	background: url({{ theme.homeHeaderImage.thumbnail('auto', 'auto') }} )no-repeat center right;
  	-webkit-background-size: cover;
   -moz-background-size: cover;
   -o-background-size: cover;
   background-size: cover;
 }
 
-
+@media screen and (max-width: 992px) {
+  .home-feature {
+  -webkit-background-size: 100%;
+  background-size: 100%;
+  }
+}
 @media screen and (max-width: 480px) {
-	.home-feature{
-		background: white;
+	.home-feature {
+  -webkit-background-size: 90%;
+  background-size: 90%;
 	}
+
 }
 </style>

partials/layout-header.htm

@@ -16,7 +16,11 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="navbar-brand" href="/">Ventro</a>
+      <a class="navbar-brand" href="{{ site_url('/') }}">{{ theme.title }}</a>
+
+      <!-- logo in the header  -->
+      <a class="navbar-logo" href="{{ site_url('/') }}"><img src="{{ theme.logoImage.thumbnail('auto','auto') }}" alt="Ventro Store Logo"/></a>
+
     </div>
 
     <!-- Collect the nav links, forms, and other content for toggling -->
@@ -47,8 +51,7 @@
 
           <li class="dropdown yamm-fw">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">About</a>
-            <ul class="dropdown-menu shop-drop">
-            <li>
+            <ul class="dropdown-menu shop-drop default-drop">
               <div class="container yamm-content">
                 <ul class="cat-box">
                   <li><a href="/about">About Us</a></li>
@@ -58,8 +61,6 @@
             </ul>
           </li>
 
-
-
       </ul>
       <ul class="nav navbar-nav navbar-right">
         <li class="dropdown yamm-fw login-drop">
@@ -79,6 +80,16 @@
             </div>
           </ul>
         </li>
+        <li class="dropdown yamm-fw login-drop" >
+          <a href="#" class="search-botton dropdown-toggle" data-toggle="dropdown" aria-expanded="false">Search</a>
+          <ul class="dropdown-menu shop-drop">
+            {{ open_form({'class': 'search', 'method': 'get', 'action': site_url('search')}) }}
+              <input class="search-box" type="text" name="query" value="{{query|unescape}}" placeholder="Search store&hellip;"/>
+            {{ close_form() }}
+          </ul>
+
+        </li>
+
         <li class="dropdown yamm-fw login-drop" >
             <a href="#" class="dropdown-toggle" id="cart-totals" data-toggle="dropdown">{{ partial('shop-minicart-totals') }}</a>
           <ul class="dropdown-menu shop-drop" id="login-drop">
@@ -90,11 +101,6 @@
         </li>
       </ul>
 
-
-
-
-
-
 
     </div><!-- /.navbar-collapse -->
   </div><!-- /.container-fluid -->

partials/newsletter.htm

@@ -1,14 +1,14 @@
 <div class="container-fluid newsletter">
 	<div class="container">
 		<div class="row">
-			<div class="col-md-12 text-center">
-				<h3 class="col-md-4">Sign up for updates</h3>
-				<div class="form-group col-md-8">
-			      <div class="col-sm-12">
+			<div class="col-xs-12 text-center">
+				<h3 class="col-xs-12 col-sm-4">Sign up for updates</h3>
+				<div class="form-group col-xs-12 col-sm-8">
+			      <div>
 			      	<form id="mc-form">
-			      		<input type="email" class="form-control input-sm col-md-8" placeholder="Email Address" size="40" id="mc-email"/>	
+			      		<input type="email" class="form-control input-sm" placeholder="Email Address" size="40" id="mc-email"/>	
 			      		<label for="mc-email"></label>
-			      		<button class="btn btn-default col-md-4">Submit</button>
+			      		<button class="btn btn-default">Submit</button>
 			      	</form>
 			      </div>
         		</div>

partials/shop-grid-item.htm

@@ -1,4 +1,4 @@
-<div class="col-md-3 col-xs-6 grid-item text-center">
+<div class="col-md-3 col-xs-12 grid-item text-center">
 	<a href="/product/{{ product.url_name }}">
 		<img src="{{ product.images.first.thumbnail(400, 500) }}" alt="">
 		<h1>{{ product.name }}</h1>

partials/shop-minicart-totals.htm

@@ -1 +1,8 @@
-<span id="navbar-totals">{{ cart.getItemNum() }} Item{{ cart.getItemNum == 0 or cart.getItemNum > 1 ? 's' : null }}</span>
+<span id="navbar-totals">
+  <span class="cart-icon"></span>
+  <span class="cart-items">
+    {% if cart.getItemNum() > 0 %}
+    {{ cart.getItemNum() }}
+    {% endif %}
+  </span>
+</span>

partials/shop-product-grid.htm

@@ -13,6 +13,7 @@ <h1>{{ product.name }}</h1>
 						View 
 					</a>
 				</div>
+
 			</div>
 
 		{% endfor %}
@@ -32,6 +33,7 @@ <h1>{{ product.name }}</h1>
 			<a href="/product/{{ product.url_name }}" class="btn btn-default">
 				View 
 			</a>
+
 		</div>
 	</div>