Merge branch 'master' of https://github.com/senaduka/ribica

Conflicts: front-ui/app/components/cart/cartPage.js
2015-05-26 18:12:26 +02:00
parent 8bed4eb3f7 db6dd6a1ab
commit 12f48ab0e7
2 changed files with 9 additions and 6 deletions
--- a/front-ui/app/components/cart/cartPage.js
+++ b/front-ui/app/components/cart/cartPage.js
@@ -96,7 +96,6 @@ var CartPage = React.createClass({


      return (
-
        <div className="col-lg-12">
          <LinkBanner locationName="thankYouPage" />
           <div className="cart-title">KORPA</div>
@@ -116,6 +115,13 @@ var CartPage = React.createClass({
               {displayedItems}
             </tbody>
           </table>
+
+
+        <div className="cart-page center">
+          <LinkBanner locationName="cartPage" />
+
+           {displayedItems}
+
           {buySomethingMessage}
           {cartTotal}
        </div>