From e7850304b1ae830f7c203f46a77cddc5d6a53ddb Mon Sep 17 00:00:00 2001
From: Gena <opengena@gmail.com>
Date: Fri, 12 Jun 2015 22:38:58 +0600
Subject: [PATCH] no message

---
 batiskaf/templates/jinja2/base.jinja  |  3 +-
 batiskaf/templates/jinja2/index.jinja |  2 +
 static/less/_.css                     | 31 ------------
 static/less/_.less                    | 68 +++++++++++++--------------
 store/views.py                        |  2 +-
 5 files changed, 38 insertions(+), 68 deletions(-)

diff --git a/batiskaf/templates/jinja2/base.jinja b/batiskaf/templates/jinja2/base.jinja
index 072e7b5..10c4090 100644
--- a/batiskaf/templates/jinja2/base.jinja
+++ b/batiskaf/templates/jinja2/base.jinja
@@ -108,7 +108,7 @@
                 <ul class="nav navbar-nav">
                     {% for category in main_categories %}
                         <li class="dropdown yamm-fw"><a href="#" data-toggle="dropdown"
-                                                        class="dropdown-toggle">{{ category.title }}</a>
+                                                        class="dropdown-toggle ">{{ category.title }}</a>
                             <ul class="dropdown-menu">
                                 <li>
                                     <div class="yamm-content">
@@ -396,6 +396,5 @@
         {% endfor %}
     </script>
 {% endif %}
-<embed height="188" width="355" bgcolor="#ffffff"  name="vishnu" src="http://iii.ru/static/Vishnu3.swf" wmode="transparent" flashvars="uuid=9a13ee03-be70-459d-b7d4-f3911cd9621f&disableRuOverride=1&home=7d5fe16c606e3884d1b1329a3cfd3dd4&skin_color=0xFFF8C1&vertical_layout=0" type="application/x-shockwave-flash" quality="high" style="position: fixed; bottom: 0; right: 0; "></embed>
 </body>
 </html>
diff --git a/batiskaf/templates/jinja2/index.jinja b/batiskaf/templates/jinja2/index.jinja
index 22952db..88df00f 100644
--- a/batiskaf/templates/jinja2/index.jinja
+++ b/batiskaf/templates/jinja2/index.jinja
@@ -309,4 +309,6 @@
 {#            </div>#}
 {#        </div>#}
     </div>
+    <embed height="188" width="355" bgcolor="#ffffff"  name="vishnu" src="http://iii.ru/static/Vishnu3.swf" wmode="transparent" flashvars="uuid=9a13ee03-be70-459d-b7d4-f3911cd9621f&disableRuOverride=1&home=7d5fe16c606e3884d1b1329a3cfd3dd4&skin_color=0xFFF8C1&vertical_layout=0" type="application/x-shockwave-flash" quality="high" style="position: fixed; bottom: 0; right: 0; z-index:4000"></embed>
+
 {% endblock %}
\ No newline at end of file
diff --git a/static/less/_.css b/static/less/_.css
index ddf463d..8fdce8b 100644
--- a/static/less/_.css
+++ b/static/less/_.css
@@ -499,37 +499,6 @@ body,
 .navbar-default .navbar-nav .open .dropdown-menu > li > a {
   color: #333;
 }
-ul.nav li.dropdown:hover > ul.dropdown-menu {
-  display: block;
-  color: #333;
-  position: absolute;
-  float: left;
-  background-color: #434a54;
-  color: #ffffff;
-  border-width: 0 1px 1px;
-  border-radius: 0 0 2px 2px;
-  -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
-  box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
-}
-ul.nav li.dropdown:hover > ul.dropdown-menu ul {
-  list-style-type: none;
-  padding: 0px;
-  margin: 0px 0 15px 0px;
-}
-ul.nav li.dropdown:hover > ul.dropdown-menu a {
-  color: #ffffff;
-  border: none;
-  font-weight: normal;
-  font-size: 11px;
-}
-ul.nav li.dropdown:hover > ul.dropdown-menu a.title {
-  color: #73beff !important;
-  font-weight: bold;
-}
-ul.nav li.dropdown:hover > ul.dropdown-menu a:hover {
-  text-decoration: underline;
-  color: #fed000;
-}
 .navbar .navbar-nav .open .dropdown-menu > li > a:hover,
 .navbar .navbar-nav .open .dropdown-menu > li > a:focus,
 .navbar .navbar-nav .open .dropdown-menu > .active > a,
diff --git a/static/less/_.less b/static/less/_.less
index 6fd773f..64cb35d 100644
--- a/static/less/_.less
+++ b/static/less/_.less
@@ -256,40 +256,40 @@ span.yellow {
   color: #333;
 }
 
-ul.nav li.dropdown:hover > ul.dropdown-menu {
-  display: block;
-  color: #333;
-  position: absolute;
-  float: left;
-  background-color: @brand-gray;
-  color: @white;
-  ul {
-
-    list-style-type: none;
-    padding: 0px;
-    margin: 0px 0 15px 0px;
-  }
-  a {
-    color: @white;
-    border: none;
-    font-weight: normal;
-    font-size: 11px;
-    &.title {
-      color: lighten(@blue, 30%) !important;
-      font-weight: bold;
-    }
-    &:hover {
-      text-decoration: underline;
-      color: @brand-yellow;
-    }
-  }
-  //border: 1px solid #ccc;
-  //border: 1px solid rgba(0, 0, 0, .15);
-  border-width: 0 1px 1px;
-  border-radius: 0 0 2px 2px;
-  -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
-  box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
-}
+//ul.nav li.dropdown:hover > ul.dropdown-menu {
+//  display: block;
+//  color: #333;
+//  position: absolute;
+//  float: left;
+//  background-color: @brand-gray;
+//  color: @white;
+//  ul {
+//
+//    list-style-type: none;
+//    padding: 0px;
+//    margin: 0px 0 15px 0px;
+//  }
+//  a {
+//    color: @white;
+//    border: none;
+//    font-weight: normal;
+//    font-size: 11px;
+//    &.title {
+//      color: lighten(@blue, 30%) !important;
+//      font-weight: bold;
+//    }
+//    &:hover {
+//      text-decoration: underline;
+//      color: @brand-yellow;
+//    }
+//  }
+//  //border: 1px solid #ccc;
+//  //border: 1px solid rgba(0, 0, 0, .15);
+//  border-width: 0 1px 1px;
+//  border-radius: 0 0 2px 2px;
+//  -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
+//  box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
+//}
 
 .navbar .navbar-nav .open .dropdown-menu > li > a:hover,
 .navbar .navbar-nav .open .dropdown-menu > li > a:focus,
diff --git a/store/views.py b/store/views.py
index 800db84..821f28e 100644
--- a/store/views.py
+++ b/store/views.py
@@ -190,7 +190,7 @@ class CartDetailView(TemplateView):
                     cart.weight,
                     order.deliv_type,
                 ))
-                order.amount = order_amount['AmountPlusFSAmount']
+                order.amount = order_amount['AmountPlusFSAmount'] + cart.total
                 order.save()
                 return redirect('/order/{}/'.format(order.pk))
             else: