From ecbe58c626834fff3863e4f230f5a73cb2c9b6d0 Mon Sep 17 00:00:00 2001
From: Senad Uka <senad.uka@gmail.com>
Date: Mon, 20 Apr 2015 05:49:23 +0200
Subject: [PATCH] money in upper right works now - zavrsi narudzbu is white

---
 front-ui/app/components/cart/cartIcon.js  |  4 +++-
 front-ui/app/components/cart/cartTotal.js | 10 +++++++---
 front-ui/app/css/main.css                 | 15 +++++++++++----
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/front-ui/app/components/cart/cartIcon.js b/front-ui/app/components/cart/cartIcon.js
index 77a8be8..ae31adf 100644
--- a/front-ui/app/components/cart/cartIcon.js
+++ b/front-ui/app/components/cart/cartIcon.js
@@ -3,6 +3,8 @@ var CartStore = require('../../stores/cartStore.js');
 var CartActions = require('../../actions/cartActions.js');
 var NavigationActions = require('../../actions/navigationActions.js');
 var LoginStatus = require('../shared/loginStatus');
+CartTotal = require('./cartTotal');
+
   
  
 
@@ -29,7 +31,7 @@ var CartIcon = React.createClass({
          <ul className="nav navbar-nav navbar-right">
                             <li><LoginStatus /></li>
                             <li onClick={this._onClick} style={{borderTop: 'solid lightgray 1px', borderBottom: 'solid lightgray 1px', borderLeft: 'solid lightgray 1px', paddingBottom: 22}}><a ><div className="mycart"><span>{normalizeCount(this.state.count)}</span></div></a></li>
-                            <li onClick={this._onClick} style={{borderTop: 'solid lightgray 1px', borderBottom: 'solid lightgray 1px', paddingBottom: 2}}><a href="#">0,00 KM</a></li>
+                            <li onClick={this._onClick} style={{borderTop: 'solid lightgray 1px', borderBottom: 'solid lightgray 1px', paddingBottom: 2}}><a href="#"><CartTotal items={this.state.items} itemCounts={this.state.itemCounts} deliveryCosts={this.state.deliveryCosts} justMerchandise={true}/> </a></li>
                             <li onClick={this._onClick} style={{borderTop: 'solid lightgray 1px', borderBottom: 'solid lightgray 1px', borderRight: 'solid lightgray 1px'}}><a style={{marginLeft: 20, marginBottom: 10, marginRight: 15}} className="mybutton" href="#">Završi narudžbu</a></li>                            
           </ul>
         );
diff --git a/front-ui/app/components/cart/cartTotal.js b/front-ui/app/components/cart/cartTotal.js
index 4a8cee0..925f759 100644
--- a/front-ui/app/components/cart/cartTotal.js
+++ b/front-ui/app/components/cart/cartTotal.js
@@ -6,9 +6,6 @@ var Router = require('react-router');
 
 
 
-
-
-
 var CartTotal = React.createClass({
 
     render: function() {
@@ -26,6 +23,8 @@ var CartTotal = React.createClass({
 
       var deliveryCosts = this.props.deliveryCosts.get('delivery_price');
 
+      if (!this.props.justMerchandise) {
+
       return (  
         <div className="col-md-3 cart-total">
           <div>
@@ -41,6 +40,11 @@ var CartTotal = React.createClass({
         </div>
         );       
 
+      }
+       else {
+         return (  <span>{Globals.FormatCurrency(total)}</span>);
+       }
+
     }
 
 });
diff --git a/front-ui/app/css/main.css b/front-ui/app/css/main.css
index 8adf26c..b399ea0 100644
--- a/front-ui/app/css/main.css
+++ b/front-ui/app/css/main.css
@@ -36,6 +36,9 @@ h1 h2 h3 h4 h5{
     margin: 5% auto;
 }
 
+
+
+
 .mybutton{
     background-color: #00a8a8;
     padding: 6px 22px !important;
@@ -43,6 +46,7 @@ h1 h2 h3 h4 h5{
     border-radius: 3px;
     margin-top: 8px;
     border: solid #06c3c3 1px;
+    color: #ffffff !important;
 }
 
 
@@ -54,6 +58,7 @@ h1 h2 h3 h4 h5{
     display: block;
     border-radius: 3px;
     border: solid #06c3c3 1px;
+    color: #ffffff !important;
 }
 
 a{
@@ -93,7 +98,7 @@ background: none;
     display: block;
     border-radius: 3px;
     border: solid #06c3c3 1px;
-    color: black;
+    color: #ffffff;
 }
 .mynav li .mybutton:hover  {
     background-color: #06c3c3;
@@ -102,8 +107,10 @@ background: none;
     display: block;
     border-radius: 3px;
     border: solid #06c3c3 1px;
+    color: #ffffff;
 }
 
+
 .productbox{
 cursor: pointer;
 -moz-box-shadow: 1px 2px 2px #cccccc;
@@ -182,14 +189,14 @@ color: white;
 color: white;
 
 }
-#madein:hover{
+#madeinbih:hover{
 background: url("https://res.cloudinary.com/du5pdibul/image/upload/v1428813559/made-in-bih-bg_uusqpm.png");
 background-position:  center ;
 background-size: 100% 100%;
 color: white;
     background-repeat: no-repeat;
 }
-#madein:hover a{
+#madeinbih:hover a{
 
 color: white;
 
@@ -349,7 +356,7 @@ background-size: cover;
 position: absolute;
 left: 13.4px;
 top: 4px;
-color: black;
+color: #ffffff;
 
 }
 .mycart span:hover{