Skip to content

Commit

Permalink
publish: Merge pull request #121 from prabinv/master
Browse files Browse the repository at this point in the history 
generated from commit 989cd07
  • Loading branch information
deploy.sh committed Aug 27, 2014
1 parent a6e6056 commit 9b3e798
Show file tree
Hide file tree
Showing 11 changed files with 98 additions and 56 deletions.
4 changes: 2 additions & 2 deletions index.html
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!doctype html><html class="no-js" ng-app="methodApp" data-ng-strict-di><head data-vn-meta-tags data-title="seo.metaTagTitle" data-description="seo.metaTagDescription" data-keywords="seo.metaTagKeywords" data-robots="seo.enableRobotsMetatags" data-to-append="seo.globallyAppendedMetatags"><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="fragment" content="!"><title>Volusion AngularJS Method Theme</title><meta name="description" content=""><meta name="viewport" content="width=device-width"><link rel="stylesheet" href="/styles/fb000d18.vendor.css"><link rel="stylesheet" href="/styles/bb6fdcef.main.css"><link rel="stylesheet" ng-href="{{ overridesCSS }}"><base href="/"></head><body role="document" data-ng-controller="MainCtrl"><!--[if lt IE 9]>
<!doctype html><html class="no-js" ng-app="methodApp" data-ng-strict-di><head data-vn-meta-tags data-title="seo.metaTagTitle" data-description="seo.metaTagDescription" data-keywords="seo.metaTagKeywords" data-robots="seo.enableRobotsMetatags" data-to-append="seo.globallyAppendedMetatags"><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="fragment" content="!"><title>Volusion AngularJS Method Theme</title><meta name="description" content=""><meta name="viewport" content="width=device-width"><link rel="stylesheet" href="/styles/fb000d18.vendor.css"><link rel="stylesheet" href="/styles/537211b6.main.css"><link rel="stylesheet" ng-href="{{ overridesCSS }}"><base href="/"></head><body role="document" data-ng-controller="MainCtrl"><!--[if lt IE 9]>
<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a>
to improve your experience.</p>
<![endif]--><!-- Mobile Menu --><div data-ng-include=" 'views/partials/mobile-menu.html' "></div><div snap-content data-snap-ignore="true"><a id="top"></a> <!-- Header --><div id="header" ng-include=" 'views/partials/header.html' "></div><!-- Main Content --><div class="vn-showcase" role="main" autoscroll="false" ng-view=""></div><!-- Footer --><div ng-include=" 'views/partials/footer.html' "></div></div><script src="scripts/a1383347.vendor.js"></script><script src="/scripts/bf66a888.scripts.js"></script></body></html>
<![endif]--><!-- Mobile Menu --><div data-ng-include=" 'views/partials/mobile-menu.html' "></div><div snap-content data-snap-ignore="true"><a id="top"></a> <!-- Header --><div id="header" ng-include=" 'views/partials/header.html' "></div><!-- Main Content --><div class="vn-showcase" role="main" autoscroll="false" ng-view=""></div><!-- Footer --><div ng-include=" 'views/partials/footer.html' "></div></div><script src="scripts/vendor.js"></script><script src="/scripts/scripts.js"></script></body></html>
21 changes: 0 additions & 21 deletions scripts/a1383347.vendor.js
View file

This file was deleted.

2 changes: 0 additions & 2 deletions scripts/bf66a888.scripts.js
View file

This file was deleted.

4 changes: 2 additions & 2 deletions settings/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ angular.module('app', ['ui.bootstrap','ui.tinymce','angular-ladda'])
//in local development environment (i.e. grunt serve)
environment = 'dev';
apiUrl = '/settings/themeSettings.json';
cssUrl = '/styles/bb6fdcef.main.css';
cssUrl = '/styles/537211b6.main.css';
$scope.debug = true;
} else {
//in production
environment = 'prod';
var queryString = $location.search();
apiUrl = '/api/v1/themes/' + queryString.themeName + '/versions/' + queryString.themeVersion + '/settings';
cssUrl = '/themes/' + queryString.themeName + '/versions/' + queryString.themeVersion + '/styles/bb6fdcef.main.css';
cssUrl = '/themes/' + queryString.themeName + '/versions/' + queryString.themeVersion + '/styles/537211b6.main.css';
}
$http.get(apiUrl)
.success(function(data) {
Expand Down
2 changes: 1 addition & 1 deletion settings/themeInfo.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
}
],
"facets": {
"color-shade": "light",
"colorShade": "light",
"colors": ["white","black","red"],
"styles": ["modern","sleek","minimalist"]
},
Expand Down
89 changes: 71 additions & 18 deletions styles/bb6fdcef.main.css → styles/537211b6.main.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 19 additions & 6 deletions translations/message/en.json
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,22 @@
{
"message": {
"addToCartSuccess": "Item(s) are added to your cart",
"addToCartError" : "ERROR!",
"addToCartWarning": "Warning!",
"message": {
"addToCartSuccess": "Item(s) are added to your cart",
"addToCartError" : "ERROR!",
"addToCartWarning": "Warning!",

"unknown" : "Unknown server error"
}
"unknown" : "Unknown server error",
"CART_ITEM_UNAVAILABLE": "",
"CART_ITEM_WITH_OPTION_UNAVAILABLE": "",
"CART_MAX_ITEM_COUNT_EXCEEDED": "",
"CART_ITEM_MIN_ORDER_QTY": "",
"CART_ITEM_MAX_ORDER_QTY": "",
"CART_ITEM_PREVIOUSLY_ADDED_UNAVAILABLE": "",
"CART_ITEM_MINQTY_UNAVAILABLE": "",
"CART_ITEM_QTY_ADJUSTED_TO_AVAILABILITY": "",
"CART_ITEM_OUT_OF_STOCK": "",
"CART_KITITEM_MINQTY_UNAVAILABLE": "",
"CART_KITITEM_QTY_ADJUSTED_TO_AVAILABILITY": "",
"CART_KITITEM_NO_AVAILABLE_STOCK": "",
"CART_KITITEM_OUT_OF_STOCK": ""
}
}
2 changes: 1 addition & 1 deletion views/category.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<div class="container categories"><div class="row col-md-12"><div class="col-sm-3 col-lg-2 vn-faceted-search" ng-class="{ isMobileAndVisible: true == isMobileAndVisible }" data-ng-hide="!hasFacetsOrCategories"><h3 data-ng-show="!showMobileSearch">Narrow By</h3><div vn-faceted-search categories="categoryList" facets="facets" data-ng-show="mobileDisplay" class="vn-faceted-search-control"></div></div><div class="col-sm-9 col-lg-10 vn-category-product-tiles" ng-class="{ 'isMobileAndHidden': true == !isMobileAndHidden }"><div class="content-top"><div class="page-header"><div class="row"><h1 class="col-sm-10 col-md-10">{{category.name}}</h1><div vn-sort-search class="col-sm-2 col-md-2 vn-sort-desktop-search" data-ng-show="mobileDisplay" query-products="queryProducts()"></div></div><img class="banner img img-responsive" ng-hide="checkForFacetFilters()" ng-src="{{category.bannerImgUrl}}"><div class="description" itemprop="description" ng-hide="checkForFacetFilters()" data-ng-bind-html="category.description | legacyLinkify | html"></div></div></div><!-- Mobile Filtering & Sorting Controls --><div class="row mobile-filters" data-ng-hide="mobileDisplay" ng-class="{ isMobileAndVisible: true == isMobileAndVisible }"><a class="col-xs-6" href data-ng-click="toggleSearch()"><button class="btn btn-default pull-right vn-facet-search-control">Filter</button></a><div class="col-xs-6 vn-sort-mobile-search-control" vn-sort-search query-products="queryProducts()"></div><!-- place sort by button here --></div><div product-grid></div><div vn-paginator cursor="cursor" current-page="currentPage" query-fn="queryProducts()"></div></div></div></div>
<div class="container categories"><div class="row col-md-12"><div class="col-sm-3 col-lg-2 vn-faceted-search" ng-class="{ isMobileAndVisible: true == isMobileAndVisible }" data-ng-hide="!hasFacetsOrCategories"><h3 data-ng-show="!showMobileSearch">Narrow By</h3><div vn-faceted-search categories="categoryList" facets="facets" data-ng-show="mobileDisplay" class="vn-faceted-search-control"></div></div><div class="col-sm-9 col-lg-10 vn-category-product-tiles" ng-class="{ 'isMobileAndHidden': true == !isMobileAndHidden }"><div class="content-top"><div class="page-header"><div class="row"><h1 class="col-sm-10 col-md-10">{{category.name}}</h1><div vn-sort-search class="col-sm-2 col-md-2 vn-sort-desktop-search" data-ng-show="mobileDisplay" query-products="queryProducts()"></div></div><img class="banner img img-responsive" ng-hide="checkForFacetFilters()" ng-src="{{category.bannerImgUrl}}"><div class="description" itemprop="description" ng-hide="checkForFacetFilters()" data-ng-bind-html="category.description | legacyLinkify | html"></div></div></div><!-- Mobile Filtering & Sorting Controls --><div class="row mobile-filters" data-ng-hide="mobileDisplay" ng-class="{ isMobileAndVisible: true == isMobileAndVisible }"><a class="col-xs-6" href data-ng-click="toggleSearch()"><button class="btn btn-default pull-right vn-facet-search-control">Filter</button></a><div class="col-xs-6 vn-sort-mobile-search-control" vn-sort-search query-products="queryProducts()"></div><!-- place sort by button here --></div><div class="row"><div class="-product-tile-animation col-sm-6 col-md-4 col-lg-3" data-ng-repeat="product in products track by product.id"><div class="th-product"><span class="th-product__sale" data-ng-show="product.isOnSale"></span> <span class="th-product__new" data-ng-show="product.isNew"></span><div class="th-product__image"><a href="{{ product.url }}"><img data-ng-src="{{ getImagePath(product.imageCollections) }}" class="img-responsive" alt=""></a></div><div class="th-product__name"><a href="{{ product.url }}">{{ product.name }}</a></div><div class="th-product__price"><span class="th-price--reg" data-ng-show="product.pricing.regularPrice > 0"><span class="th-price" data-ng-class="{strike: product.pricing.salePrice > 0}">{{product.pricing.regularPrice | currency}}</span> <span class="th-price-text">Reg</span></span> <span class="th-price--now" data-ng-show="product.pricing.salePrice > 0"><span class="th-price">{{product.pricing.salePrice | currency}}</span> <span class="th-price-text">Now</span></span></div></div></div></div><div vn-paginator cursor="cursor" current-page="currentPage" query-fn="queryProducts()"></div></div></div></div>
Loading

0 comments on commit 9b3e798

Please sign in to comment.