Merge theme into ecomm

app/index.html

@@ -40,6 +40,12 @@
             <li data-ui-sref-active="active">
               <a data-ui-sref="i18n.style-guide" data-translate="index.styleGuide">Style Guide</a>
             </li>
+            <li data-ui-sref-active="active">
+              <a data-ui-sref="i18n.about" data-translate="index.about">About</a>
+            </li>
+            <li data-ui-sref-active="active">
+              <a data-ui-sref="i18n.contact" data-translate="index.contact">Contact</a>
+            </li>
             <li class="dropdown">
               <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span data-translate="index.dropdown"></span> <b class="caret"></b></a>
               <ul class="dropdown-menu">

app/scripts/app.js

@@ -83,6 +83,26 @@ angular.module('volusionApp')
           }]
         }
       })
+      .state('i18n.about', {
+        url: '/about',
+        templateUrl: 'views/about.html',
+        controller: 'AboutCtrl',
+        resolve: {
+          translations: ['translate', function(translate) {
+            return translate.addParts('about');
+          }]
+        }
+      })
+      .state('i18n.contact', {
+        url: '/contact',
+        templateUrl: 'views/contact.html',
+        controller: 'ContactCtrl',
+        resolve: {
+          translations: ['translate', function(translate) {
+            return translate.addParts('contact');
+          }]
+        }
+      })
       .state('i18n.category', {
         url: '/:categoryName/c/:categoryId',
         templateUrl: 'views/category.html',
@@ -114,13 +134,16 @@ angular.module('volusionApp')
     $templateCache.put('views/i18n.html', require('./views/i18n.html'));
     $templateCache.put('views/home.html', require('./views/home.html'));
     $templateCache.put('views/style-guide.html', require('./views/style-guide.html'));
+    $templateCache.put('views/about.html', require('./views/about.html'));
+    $templateCache.put('views/contact.html', require('./views/contact.html'));
     $templateCache.put('views/category.html', require('./views/category.html'));
     $templateCache.put('views/product.html', require('./views/product.html'));
   })
   .factory('storage', require('./services/storage'))
   .controller('IndexCtrl', require('./controllers/index'))
   .controller('HomeCtrl', require('./controllers/home'))
   .controller('StyleGuideCtrl', require('./controllers/style-guide'))
+  .controller('AboutCtrl', require('./controllers/about'))
+  .controller('ContactCtrl', require('./controllers/contact'))
   .controller('CategoryCtrl', require('./controllers/category'))
-  .controller('ProductCtrl', require('./controllers/product'))
-  .controller('IndexCtrl', require('./controllers/index'));
+  .controller('ProductCtrl', require('./controllers/product'));

app/scripts/controllers/about.js

@@ -0,0 +1,15 @@
+'use strict';
+
+module.exports = [
+  '$scope',
+  function(
+    $scope) {
+
+    $scope.awesomeThings = [
+      'HTML5 Boilerplate',
+      'AngularJS',
+      'Karma'
+    ];
+
+  }
+];

app/scripts/controllers/contact.js

@@ -0,0 +1,15 @@
+'use strict';
+
+module.exports = [
+  '$scope',
+  function(
+    $scope) {
+
+    $scope.awesomeThings = [
+      'HTML5 Boilerplate',
+      'AngularJS',
+      'Karma'
+    ];
+
+  }
+];

app/scripts/controllers/home.js

@@ -2,11 +2,14 @@
 
 module.exports = [
   '$scope',
-  function($scope) {
+  function(
+    $scope) {
+
     $scope.awesomeThings = [
       'HTML5 Boilerplate',
       'AngularJS',
       'Karma'
     ];
+
   }
 ];

app/scripts/controllers/index.js

@@ -1,20 +1,22 @@
 'use strict';
 
 module.exports = [
-  '$state',
   '$scope',
+  '$state',
   '$http',
   'api',
-
-  function ($state, $scope, $http, api) {
+  function(
+    $scope,
+    $state,
+    $http,
+    api) {
 
     $scope.$on('$stateChangeSuccess', function(event, toState) {
       if (toState.name === 'i18n') {
         $state.go('.home', null, { location: 'replace' });
       }
     });
 
-
     $scope.global = {
       cart: {
         itemCount: 10

app/scripts/controllers/style-guide.js

@@ -1,6 +1,5 @@
 'use strict';
 
 module.exports = [
-  function() {
-  }
+  function() {}
 ];

app/translations/about/en.json

@@ -0,0 +1,4 @@
+{
+  "about": {
+  }
+}

app/translations/contact/en.json

@@ -0,0 +1,4 @@
+{
+  "contact": {
+  }
+}

app/translations/index/en.json

@@ -7,6 +7,8 @@
     "bootstrapTheme": "Bootstrap theme",
     "home": "Home",
     "styleGuide": "Style Guide",
+    "about": "About",
+    "contact": "Contact",
     "dropdown": "Dropdown",
     "action": "Action",
     "anotherAction": "Another action",

app/views/about.html

@@ -0,0 +1 @@
+<p>This is the about view.</p>

app/views/category.html

@@ -1,45 +1,43 @@
-<div class="container">
-  <section class="category">
-    <h1>Category</h1>
-    <dl>
-      <dt>Id</dt>
-      <dd>{{category.id}}</dd>
-      <dt>Name</dt>
-      <dd>{{category.name}}</dd>
-    </dl>
-  </section>
-  <section class="category-subcategories">
-    <h2>Sub-Categories</h2>
-    <dl data-ng-repeat="subCategory in category.subCategories">
-      <dt>Id</dt>
-      <dd>{{subCategory.id}}</dd>
-      <dt>Name</dt>
-      <dd>{{subCategory.name}}</dd>
-    </dl>
-  </section>
-  <section class="category-products">
-    <h2>Products</h2>
-    <dl data-ng-repeat="product in category.products">
-      <dt>Id</dt>
-      <dd>{{product.id}}</dd>
-      <dt>Name</dt>
-      <dd>{{product.name}}</dd>
-      <dt>Url</dt>
-      <dd>{{product.url}}</dd>
-      <dt>Main Image Url</dt>
-      <dd>{{product.mainImageUrl}}</dd>
-      <dt>Code</dt>
-      <dd>{{product.code}}</dd>
-      <dt>Is On Sale</dt>
-      <dd>{{product.isOnSale}}</dd>
-      <dt>Is New</dt>
-      <dd>{{product.isNew}}</dd>
-      <dt>Regular Price</dt>
-      <dd>{{product.pricing.regularPrice}}</dd>
-      <dt>Sale Price</dt>
-      <dd>{{product.pricing.salePrice}}</dd>
-      <dt>List Price</dt>
-      <dd>{{product.pricing.listPrice}}</dd>
-    </dl>
-  </section>
-</div>
+<section class="category">
+  <h1>Category</h1>
+  <dl>
+    <dt>Id</dt>
+    <dd>{{category.id}}</dd>
+    <dt>Name</dt>
+    <dd>{{category.name}}</dd>
+  </dl>
+</section>
+<section class="category-subcategories">
+  <h2>Sub-Categories</h2>
+  <dl data-ng-repeat="subCategory in category.subCategories">
+    <dt>Id</dt>
+    <dd>{{subCategory.id}}</dd>
+    <dt>Name</dt>
+    <dd>{{subCategory.name}}</dd>
+  </dl>
+</section>
+<section class="category-products">
+  <h2>Products</h2>
+  <dl data-ng-repeat="product in category.products">
+    <dt>Id</dt>
+    <dd>{{product.id}}</dd>
+    <dt>Name</dt>
+    <dd>{{product.name}}</dd>
+    <dt>Url</dt>
+    <dd>{{product.url}}</dd>
+    <dt>Main Image Url</dt>
+    <dd>{{product.mainImageUrl}}</dd>
+    <dt>Code</dt>
+    <dd>{{product.code}}</dd>
+    <dt>Is On Sale</dt>
+    <dd>{{product.isOnSale}}</dd>
+    <dt>Is New</dt>
+    <dd>{{product.isNew}}</dd>
+    <dt>Regular Price</dt>
+    <dd>{{product.pricing.regularPrice}}</dd>
+    <dt>Sale Price</dt>
+    <dd>{{product.pricing.salePrice}}</dd>
+    <dt>List Price</dt>
+    <dd>{{product.pricing.listPrice}}</dd>
+  </dl>
+</section>

app/views/contact.html

@@ -0,0 +1 @@
+<p>This is the contact view.</p>

app/views/home.html

@@ -1,3 +1 @@
-<div class="container">
-  <p>This is the home view.</p>
-</div>
+<p>This is the home view.</p>

app/views/i18n.html

@@ -1 +1 @@
-<div data-ui-view=""></div>
+<div class="container" data-ui-view=""></div>