reactioncommerce · aaronjudd · May 2, 2016 · Apr 13, 2016 · Apr 14, 2016 · Apr 15, 2016
diff --git a/.eslintrc b/.eslintrc
@@ -200,7 +200,7 @@
     "no-array-constructor": 2, // http://eslint.org/docs/rules/no-array-constructor
     "no-spaced-func": 2, // http://eslint.org/docs/rules/no-spaced-func
     "no-trailing-spaces": 2, // http://eslint.org/docs/rules/no-trailing-spaces
-    "no-extra-parens": 2, // http://eslint.org/docs/rules/no-extra-parens
+    "no-extra-parens": [2, "functions"], // http://eslint.org/docs/rules/no-extra-parens
     "no-underscore-dangle": 0, // http://eslint.org/docs/rules/no-underscore-dangle
     "one-var": [2, "never"], // http://eslint.org/docs/rules/one-var
     "padded-blocks": [2, "never"], // http://eslint.org/docs/rules/padded-blocks

diff --git a/.meteor/versions b/.meteor/versions
@@ -156,14 +156,14 @@ reactioncommerce:[email protected]
 reactioncommerce:[email protected]
 reactioncommerce:[email protected]
 reactioncommerce:[email protected]
-reactioncommerce:reaction-product-variant@1.0.1
+reactioncommerce:reaction-product-variant@1.1.0
 reactioncommerce:[email protected]
 reactioncommerce:[email protected]
 reactioncommerce:[email protected]
 reactioncommerce:[email protected]
 reactioncommerce:[email protected]
 reactioncommerce:[email protected]
-reactioncommerce:[email protected].0
+reactioncommerce:[email protected].1
 reactioncommerce:[email protected]
 reactioncommerce:[email protected]
 [email protected]

diff --git a/packages/reaction-collections/client/collections.js b/packages/reaction-collections/client/collections.js
@@ -0,0 +1,2 @@
+// Export collections for client
+export const Collections = ReactionCore.Collections;
diff --git a/packages/reaction-collections/common/collections/collections.js b/packages/reaction-collections/common/collections/collections.js
@@ -126,7 +126,7 @@ ReactionCore.Collections.Packages.attachSchema(ReactionCore.Schemas.PackageConfi
 /**
 * ReactionCore Collections Products
 */
-ReactionCore.Collections.Products = new Mongo.Collection("Products");
+export const Products = ReactionCore.Collections.Products = new Mongo.Collection("Products");
 
 ReactionCore.Collections.Products.attachSchema(ReactionCore.Schemas.Product,
   { selector: { type: "simple" } });

diff --git a/packages/reaction-collections/package.js b/packages/reaction-collections/package.js
@@ -80,6 +80,10 @@ Package.onUse(function (api) {
   api.imply("meteorhacks:subs-manager");
   api.imply("reactioncommerce:reaction-schemas");
 
+  // Main modules
+  api.mainModule("client/collections.js", "client");
+  api.mainModule("server/collections.js", "server");
+
   // ensure schemas vars are passed through
   api.export("ReactionCore");
   api.export("ReactionSubscriptions");

diff --git a/packages/reaction-collections/server/collections.js b/packages/reaction-collections/server/collections.js
@@ -0,0 +1,2 @@
+// Export collections for server
+export const Collections = ReactionCore.Collections;
diff --git a/packages/reaction-core-theme/default/alerts.less b/packages/reaction-core-theme/default/alerts.less
@@ -21,3 +21,40 @@
     margin-bottom: 2rem;
   }
 }
+
+.rui.alert {
+  display: flex;
+  padding: 0;
+  border-radius: 0;
+}
+
+.rui.alert > .content {
+  flex: 1 1 auto;
+  padding: 20px;
+  .padding-right(10px);
+}
+
+.rui.alert > .controls {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.rui.alert > .controls .control {
+  flex: 0 0 auto;
+  width: 44px;
+  min-height: 44px;
+}
+
+.rui.alert .s-alert-close {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: static;
+  text-indent: 0;
+  height: auto;
+  transform: none;
+  &:before, &:after {
+    content: none;
+  }
+}
diff --git a/packages/reaction-core-theme/theme/products/productDetail/productDetail.less b/packages/reaction-core-theme/theme/products/productDetail/productDetail.less
@@ -142,7 +142,25 @@
   }
 }
 
+.pdp-container .rui.tag.edit {
+  width: 100%;
+}
+
+.pdp-container .rui.tags > .rui.item {
+  width: 50%;
 
+  @media only screen and (max-width: @screen-md-max) {
+    width: 100%;
+  }
+}
+
+.pdp-container .rui.tags > .rui.item .fa-bookmark {
+  color: @btn-success-bg;
+}
+
+.pdp-container .rui.tags > .rui.item input {
+  width: 0;
+}
 
 
 @media only screen and (max-width: @screen-xs-max) {

diff --git a/packages/reaction-layout/client/templates/layout/alerts/alerts.html b/packages/reaction-layout/client/templates/layout/alerts/alerts.html
@@ -3,37 +3,42 @@
 </body>
 
 <template name="reactionToastAlert">
-    <div class="custom-alert-class s-alert-box s-alert-{{this.condition}} s-alert-{{position}} s-alert-effect-{{effect}} s-alert-show" id="{{_id}}" style="{{boxPosition}}">
-        <div class="s-alert-box-inner">
-            <div class="alert-header">
-                <h1><i class="fa fa-{{sAlertIcon}}"></i> {{sAlertTitle}}</h1>
-            </div>
-            <div class="alert-content">
-                <i class="fa fa-fw fa-cog"></i>
-                {{message}}
-            </div>
+  <div class="rui alert s-alert-box s-alert-{{this.condition}} s-alert-{{position}} s-alert-effect-{{effect}} s-alert-show" id="{{_id}}" style="{{boxPosition}}">
+    <div class="content">
+      {{#if sAlertTitle}}
+        <div class="header">
+          <h1><i class="fa fa-{{sAlertIcon}}"></i> {{sAlertTitle}}</h1>
         </div>
-        <span class="s-alert-close"></span>
+      {{/if}}
+      <div class="message">
+        {{message}}
+      </div>
     </div>
+    <div class="controls">
+      <span class="control s-alert-close">
+        <i class="fa fa-times"></i>
+      </span>
+    </div>
+  </div>
 </template>
 
 <template name="inlineAlerts">
-    {{#each alerts placement id}}
-      {{> inlineAlert}}
-    {{/each}}
+  {{#each alerts placement id}}
+    {{> inlineAlert}}
+  {{/each}}
 </template>
 
 
 <template name="inlineAlert">
-    <div class="alert alert-{{mode}} {{#if options.dismissable}}alert-dismissable{{/if}} {{#if isFirstRender}}hide{{/if}} {{options.classes}}">
-        {{#if options.dismissable}}
-        <!--suppress CheckDtdReferences -->
-        <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
-        {{/if}}
-        {{#unless options.html}}
-            {{message}}
-        {{else}}
-            {{{message}}}
-        {{/unless}}
-    </div>
+  <div class="alert alert-{{mode}} {{#if options.dismissable}}alert-dismissable{{/if}} {{#if isFirstRender}}hide{{/if}} {{options.classes}}">
+    {{#if options.dismissable}}
+    <!--suppress CheckDtdReferences -->
+    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
+    {{/if}}
+    {{#unless options.html}}
+      {{message}}
+    {{else}}
+      {{{message}}}
+    {{/unless}}
+  </div>
 </template>
diff --git a/packages/reaction-layout/client/templates/layout/alerts/reactionAlerts.js b/packages/reaction-layout/client/templates/layout/alerts/reactionAlerts.js
@@ -1,38 +1,33 @@
-
 // Extends Bootstaps alerts and add more alert types
-
-
 Meteor.startup(function () {
-
-    sAlert.config({
-        effect: 'stackslide',
-        position: 'bottom-left',
-        timeout: 5000,
-        html: false,
-        onRouteClose: true,
-        stack: true,
-        // or you can pass an object:
-        // stack: {
-        //     spacing: 10 // in px
-        //     limit: 3 // when fourth alert appears all previous ones are cleared
-        // }
-        offset: 0, // in px - will be added to first alert (bottom or top - depends of the position in config)
-        beep: false,
-        // examples:
-        // beep: '/beep.mp3'  // or you can pass an object:
-        // beep: {
-        //     info: '/beep-info.mp3',
-        //     error: '/beep-error.mp3',
-        //     success: '/beep-success.mp3',
-        //     warning: '/beep-warning.mp3'
-        // }
-        //onClose: _.noop //
-        // examples:
-        // onClose: function() {
-        //     /* Code here will be executed once the alert closes. */
-        // }
-    });
-
+  sAlert.config({
+    effect: "stackslide",
+    position: "bottom-left",
+    timeout: 5000,
+    html: false,
+    onRouteClose: true,
+    stack: true,
+    // or you can pass an object:
+    // stack: {
+    //     spacing: 10 // in px
+    //     limit: 3 // when fourth alert appears all previous ones are cleared
+    // }
+    offset: 0, // in px - will be added to first alert (bottom or top - depends of the position in config)
+    beep: false
+    // examples:
+    // beep: '/beep.mp3'  // or you can pass an object:
+    // beep: {
+    //     info: '/beep-info.mp3',
+    //     error: '/beep-error.mp3',
+    //     success: '/beep-success.mp3',
+    //     warning: '/beep-warning.mp3'
+    // }
+    // onClose: _.noop //
+    // examples:
+    // onClose: function() {
+    //     /* Code here will be executed once the alert closes. */
+    // }
+  });
 });
 
 Object.assign(Alerts, {

diff --git a/packages/reaction-product-variant/client/templates/products/productDetail/productDetail.html b/packages/reaction-product-variant/client/templates/products/productDetail/productDetail.html
@@ -42,8 +42,14 @@ <h2 id="pageTitle">{{>fieldComponent field="pageTitle" value=pageTitle}}</h2>
           <div class="col-sm-5 pdp-left-column">
             {{> productImageGallery}}
             <!-- Product Tags -->
-            {{>tagsComponent tags=tags}}
-            <h3 data-i18n="productDetail.details">Details</h3>
+            {{#if showTagTitle}}
+              <h3 data-i18n="productDetail.tags">Tags</h3>
+            {{/if}}
+            {{> tagList tagListProps}}
+
+            {{#if showDetailTitle}}
+              <h3 data-i18n="productDetail.details">Details</h3>
+            {{/if}}
             {{> metaComponent }}
           </div>
           <!-- END Left Side -->
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		// Export collections for client
		export const Collections = ReactionCore.Collections;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		// Export collections for server
		export const Collections = ReactionCore.Collections;