social footer ui update, add BrowserPolicy for velocity

reactioncommerce · Mar 24, 2015 · 7638f31 · 7638f31
1 parent ea04f61
commit 7638f31
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/.meteor/packages b/.meteor/packages
@@ -29,4 +29,4 @@ reactioncommerce:reaction-paypal
 reactioncommerce:reaction-braintree
 reactioncommerce:reaction-stripe
 reactioncommerce:reaction-auth-net
-#reactioncommerce:reaction-social
+reactioncommerce:reaction-social
diff --git a/client/templates/layout/footer/footer.coffee b/client/templates/layout/footer/footer.coffee
@@ -8,6 +8,6 @@ Template.layoutFooter.helpers
     placement: 'footer'
     faClass: 'square'
     faSize: 'fa-3x'
-    appsOrder: ['facebook', 'twitter', 'googleplus', 'pinterest']
+    appsOrder: ['facebook', 'twitter', 'pinterest', 'googleplus']
 
 Template.footer.replaces "layoutFooter"
diff --git a/client/templates/layout/footer/footer.html b/client/templates/layout/footer/footer.html
@@ -30,8 +30,8 @@
         </ul>
       </div>
 
-      <div class="col-xs-5 col-sm-5 col-md-5 col-lg-5">
-      <ul class="list-unstyled">
+      <div class="col-xs-5 col-xs-offset-1 col-sm-6 col-sm-offset-0 col-md-5">
+      <ul class="list-unstyled pull-right">
         {{#each reactionApps provides="social" name="reaction-social"}}
           {{> Template.dynamic template=template data=customSocialSettings }}
         {{/each}}

diff --git a/server/policy.coffee b/server/policy.coffee
@@ -2,7 +2,14 @@
 # set browser policies
 ###
 
-#allow google fonts
+# allow google fonts (required for core-theme)
 BrowserPolicy.content.allowFontDataUrl()
 BrowserPolicy.content.allowOriginForAll("fonts.googleapis.com")
 BrowserPolicy.content.allowOriginForAll("fonts.gstatic.com")
+
+# allow velocity testing (optional for velocity)
+if process.env.NODE_ENV is 'development'
+  BrowserPolicy.content.allowOriginForAll 'localhost:*'
+  BrowserPolicy.content.allowConnectOrigin 'ws://localhost:5000'
+  BrowserPolicy.content.allowConnectOrigin 'http://localhost:5000'
+  BrowserPolicy.framing.allowAll()