From d278e324581b21509c4ce3b750b3d8230472a5a4 Mon Sep 17 00:00:00 2001
From: Vitaliy <dockdep@gmail.com>
Date: Fri, 3 Jun 2016 17:09:12 +0300
Subject: [PATCH] 090316

---
 src/app/frontend/views/landing_ukr.php   | 12 ++++++------
 src/app/frontend/views/menu/contacts.php |  7 -------
 www-backend/images/order_ru.gif          | Bin 282199 -> 0 bytes
 www-backend/images/order_ru1.gif         | Bin 0 -> 282199 bytes
 www-backend/images/order_uk.gif          | Bin 279790 -> 0 bytes
 www-backend/images/order_uk1.gif         | Bin 0 -> 279790 bytes
 www/js/main_ru.js                        | 12 ++++++------
 www/landing_semena/vsojest_RUS-01.png    | Bin 1427256 -> 0 bytes
 8 files changed, 12 insertions(+), 19 deletions(-)
 create mode 100644 www-backend/images/order_ru1.gif
 create mode 100644 www-backend/images/order_uk1.gif

diff --git a/src/app/frontend/views/landing_ukr.php b/src/app/frontend/views/landing_ukr.php
index 0586f30..286eef7 100644
--- a/src/app/frontend/views/landing_ukr.php
+++ b/src/app/frontend/views/landing_ukr.php
@@ -346,7 +346,7 @@
 
                 </div>
                 <div class="one_item_image">
-                    <a href="http://semena.in.ua/gazonnye_travy_1c_20/semena_gazonnykh_trav_1c_21/klever_dekorativnyy_milvus_1c2-88/ru" title="">
+                    <a href="http://semena.in.ua/gazonnye_travy_1c_20/semena_gazonnykh_trav_1c_21/klever_dekorativnyy_milvus_1c2-88" title="">
                         <img src="http://storage.semena.in.ua/avatar/3/a/2/c/3a2c59304e1290d769277f9ca3f81bbc/200x.jpg" title="" width="126" height="200">
                     </a>
                     <div id="img-pre1"><img src="/landing_semena/images2/pic-1.png" /></div>
@@ -354,8 +354,8 @@
                     <div id="img-pre3"><img src="/landing_semena/images2/pic-7.png" /></div>
                 </div>
                 <div class="one_item_title">
-                    <a href="http://semena.in.ua/gazonnye_travy_1c_20/semena_gazonnykh_trav_1c_21/klever_dekorativnyy_milvus_1c2-88/ru" title="">
-                        <h3>Клевер декоративний Мільвус</h3>
+                    <a href="http://semena.in.ua/gazonnye_travy_1c_20/semena_gazonnykh_trav_1c_21/klever_dekorativnyy_milvus_1c2-88" title="">
+                        <h3>Конюшина декоративна Мільвус</h3>
                     </a>
                 </div>
                 <div class="one_item_description">
@@ -380,7 +380,7 @@
                     </div>
                 </div>
                 <div class="one_item_image">
-                    <a href="http://semena.in.ua/gazonnye_travy_1c_20/semena_gazonnykh_trav_1c_21/klever_dekorativnyy_rivendel_1c2-92/ru" title="">
+                    <a href="http://semena.in.ua/gazonnye_travy_1c_20/semena_gazonnykh_trav_1c_21/klever_dekorativnyy_rivendel_1c2-92" title="">
                         <img src="http://storage.semena.in.ua/avatar/3/5/a/4/35a403d0efe32a05dadf2736200d03af/200x.jpg" title="" alt="" width="126" height="200">
                     </a>
                     <div id="img-pre1"><img src="/landing_semena/images2/pic-3.png"></div>
@@ -388,8 +388,8 @@
                     <div id="img-pre3"><img src="/landing_semena/images2/pic-8.png"></div>
                 </div>
                 <div class="one_item_title">
-                    <a href="http://semena.in.ua/gazonnye_travy_1c_20/semena_gazonnykh_trav_1c_21/klever_dekorativnyy_rivendel_1c2-92/ru" title="">
-                        <h3>Клевер декоративний Рівендел</h3>
+                    <a href="http://semena.in.ua/gazonnye_travy_1c_20/semena_gazonnykh_trav_1c_21/klever_dekorativnyy_rivendel_1c2-92" title="">
+                        <h3>Конюшина декоративна Рівендел</h3>
                     </a>
                 </div>
                 <div class="one_item_description">
diff --git a/src/app/frontend/views/menu/contacts.php b/src/app/frontend/views/menu/contacts.php
index e0376d7..95a592c 100644
--- a/src/app/frontend/views/menu/contacts.php
+++ b/src/app/frontend/views/menu/contacts.php
@@ -309,13 +309,6 @@
             <td class="contacts_list_phone">050-432-86-82</td>
             <!--<td class="contacts_list_phone"><a href="https://www.google.com.ua/maps/place/%D0%A5%D0%B0%D1%80%D0%BA%D1%96%D0%B2%D1%81%D1%8C%D0%BA%D0%B5+%D1%88.,+166,+%D0%9A%D0%B8%D1%97%D0%B2,+%D0%BC%D1%96%D1%81%D1%82%D0%BE+%D0%9A%D0%B8%D1%97%D0%B2/@50.414657,30.660084,17z/data=!3m1!4b1!4m2!3m1!1s0x40d4c4e339783c01:0x9de857a6571ac29a?hl=ru" title="<?= $t->_("rout_map") ?>" target="_blank" rel="no-follow"><?= $t->_("rout_map") ?></a></td>-->
         </tr>
-        <tr>
-            <td class="contacts_list_phone"><?= $t->_("kiev") ?></td>
-            <td><?= $t->_("new_address_twelve") ?></td>
-            <td>9.00-19.00 (<?= $t->_("pn_sb") ?>)</td>
-            <td class="contacts_list_phone">050-448-28-07</td>
-            <!--<td class="contacts_list_phone"><a href="https://www.google.com.ua/maps/place/%D0%A5%D0%B0%D1%80%D0%BA%D1%96%D0%B2%D1%81%D1%8C%D0%BA%D0%B5+%D1%88.,+166,+%D0%9A%D0%B8%D1%97%D0%B2,+%D0%BC%D1%96%D1%81%D1%82%D0%BE+%D0%9A%D0%B8%D1%97%D0%B2/@50.414657,30.660084,17z/data=!3m1!4b1!4m2!3m1!1s0x40d4c4e339783c01:0x9de857a6571ac29a?hl=ru" title="<?= $t->_("rout_map") ?>" target="_blank" rel="no-follow"><?= $t->_("rout_map") ?></a></td>-->
-        </tr>
     </table>
 
 
diff --git a/www-backend/images/order_ru.gif b/www-backend/images/order_ru.gif
index fa96f35..fe0cd04 100644
Binary files a/www-backend/images/order_ru.gif and b/www-backend/images/order_ru.gif differ
diff --git a/www-backend/images/order_ru1.gif b/www-backend/images/order_ru1.gif
new file mode 100644
index 0000000..fa96f35
Binary files /dev/null and b/www-backend/images/order_ru1.gif differ
diff --git a/www-backend/images/order_uk.gif b/www-backend/images/order_uk.gif
index 4aeef50..8559157 100644
Binary files a/www-backend/images/order_uk.gif and b/www-backend/images/order_uk.gif differ
diff --git a/www-backend/images/order_uk1.gif b/www-backend/images/order_uk1.gif
new file mode 100644
index 0000000..4aeef50
Binary files /dev/null and b/www-backend/images/order_uk1.gif differ
diff --git a/www/js/main_ru.js b/www/js/main_ru.js
index 410105d..1d20142 100644
--- a/www/js/main_ru.js
+++ b/www/js/main_ru.js
@@ -275,12 +275,12 @@ function change_items( next_page, block_class, news_id )
                         html +=
                             '<div class="one_item float '+( (i == 4) ? 'last' : '' )+'">'+
                             '<div class="one_item_image">'+
-                            '<a href="'+data[i]['alias']+'" title="'+data[i]['title']+'">'+
+                            '<a href="'+data[i]['alias']+'/ru'+'" title="'+data[i]['title']+'">'+
                             '<img src="'+data[i]['cover']+'" alt="'+data[i]['title']+'" width="126" height="200" />'+
                             '</a>'+
                             '</div>'+
                             '<div class="one_item_title">'+
-                            '<a href="'+data[i]['alias']+'" title="'+data[i]['title']+'">'+
+                            '<a href="'+data[i]['alias']+'/ru'+'" title="'+data[i]['title']+'">'+
                             '<h3>'+data[i]['title']+'</h3>'+
                             '</a>'+
                             '</div>'+
@@ -289,7 +289,7 @@ function change_items( next_page, block_class, news_id )
                             '<span>' + parseFloat(data[i]['price2']).toFixed(2) + '</span> грн' +
                             '</div>' +
                             '<div class="one_item_buttons">' +
-                            '<a href="' + data[i]['alias'] + '" title="' + data[i]['title'] + '" class="btn grey">подробнее</a>' +
+                            '<a href="' + data[i]['alias'] +'/ru'+ '" title="' + data[i]['title'] + '" class="btn grey">подробнее</a>' +
                             '<a data-group_id="' + data[i]['group_id'] + '" href="#" title="" class="btn green buy">купить</a>' +
                             '</div>'+
                             '<div class="one_item_compare">' +
@@ -369,12 +369,12 @@ function change_similar_items( catalog_id, group_id, similar )
                         )+
                         '</div>'+
                         '<div class="one_item_image">'+
-                        '<a href="'+ data[i]['alias'] +'" title="'+data[i]['title']+'">'+
+                        '<a href="'+ data[i]['alias'] +'/ru'+'" title="'+data[i]['title']+'">'+
                         '<img src="'+data[i]['cover']+'" alt="'+data[i]['title']+'" width="126" height="200" />'+
                         '</a>'+
                         '</div>'+
                         '<div class="one_item_title">'+
-                        '<a href="'+ data[i]['alias'] +'" title="'+data[i]['title']+'">'+
+                        '<a href="'+ data[i]['alias'] +'/ru'+'" title="'+data[i]['title']+'">'+
                         '<h3>'+data[i]['title']+'</h3>'+
                         '</a>'+
                         '</div>'+
@@ -384,7 +384,7 @@ function change_similar_items( catalog_id, group_id, similar )
                         '<div class="align_bottom">'+
                         '<div class="one_item_price">цена от <span>'+parseFloat(data[i]['price']).toFixed(2)+'</span> грн</div>'+
                         '<div class="one_item_buttons">'+
-                        '<a href="' + data[i]['alias'] + '" title="" class="btn grey">подробности</a>' +
+                        '<a href="' + data[i]['alias'] +'/ru'+ '" title="" class="btn grey">подробности</a>' +
                         '<a data-group_id="' + data[i]['group_id'] + '" href="javascript:;" title="" class="' + (data[i]['count_available'] != 0 ? 'btn green buy' : 'not_available grey') + '">купить</a>' +
                         '</div>'+
                         '<div class="one_item_compare">'+
diff --git a/www/landing_semena/vsojest_RUS-01.png b/www/landing_semena/vsojest_RUS-01.png
index 64fbb50..69fa549 100644
Binary files a/www/landing_semena/vsojest_RUS-01.png and b/www/landing_semena/vsojest_RUS-01.png differ
--
libgit2 0.21.4