Permalink
Browse files

Обновление

  • Loading branch information...
1 parent 612a53c commit fdb5c0958791404c7f209d94aa428d972aebd8b7 @gz0t gz0t committed Apr 11, 2014
Showing with 50 additions and 18 deletions.
  1. +26 −1 inc/counters.html
  2. +1 −1 inc/footer.html
  3. +0 −2 inc/ui-design.html
  4. +21 −12 mod/ShopExpressSocialTabs.html
  5. +2 −2 mod/merchants/yandexmoney.html
View
@@ -49,7 +49,32 @@
yaCounter{$GLOBS.YACOUNTER}.reachGoal('ProductPutFromProduct');
});
});
-(function (d, w, c) { (w[c] = w[c] || []).push(function() { try { w.yaCounter{$GLOBS.YACOUNTER} = new Ya.Metrika({ id:{$GLOBS.YACOUNTER}, webvisor:true, clickmap:true, trackLinks:true, accurateTrackBounce:true }); } catch(e) { } }); var n = d.getElementsByTagName("script")[0], s = d.createElement("script"), f = function () { n.parentNode.insertBefore(s, n); }; s.type = "text/javascript"; s.async = true; s.src = (d.location.protocol == "https:" ? "https:" : "http:") + "//mc.yandex.ru/metrika/watch.js"; if (w.opera == "[object Opera]") { d.addEventListener("DOMContentLoaded", f, false); } else { f(); } })(document, window, "yandex_metrika_callbacks");</script><noscript><div><img src="//mc.yandex.ru/watch/{$GLOBS.YACOUNTER}" style="position:absolute; left:-9999px;" alt="" /></div></noscript>
+(function (d, w, c) {
+ (w[c] = w[c] || []).push(function() {
+ try {
+ w.yaCounter{$GLOBS.YACOUNTER} = new Ya.Metrika( { id:{$GLOBS.YACOUNTER},
+ webvisor:true,
+ clickmap:true,
+ trackLinks:true,
+ accurateTrackBounce:true,
+ trackHash:true } );
+ } catch(e) { }
+ });
+
+ var n = d.getElementsByTagName("script")[0],
+ s = d.createElement("script"),
+ f = function () { n.parentNode.insertBefore(s, n); };
+ s.type = "text/javascript";
+ s.async = true;
+ s.src = (d.location.protocol == "https:" ? "https:" : "http:") + "//mc.yandex.ru/metrika/watch.js";
+
+ if (w.opera == "[object Opera]") {
+ d.addEventListener("DOMContentLoaded", f, false);
+ } else { f(); }
+})(document, window, "yandex_metrika_callbacks");
+</script>
+<noscript><div><img src="//mc.yandex.ru/watch/{$GLOBS.YACOUNTER}" style="position:absolute; left:-9999px;" alt="" /></div></noscript>
+<!-- /Yandex.Metrika counter -->
{/if}
{if $GLOBS.JSCOUNTER && $GLOBS.JSCOUNTER|strpos:'Например' !== 0}
View
@@ -8,7 +8,7 @@
<div class="row-fluid">
<div class="span5">
<p>
- {$GLOBS.COPYRIGHT} &mdash; {$GLOBS.SITENAME}
+ {$GLOBS.COPYRIGHT}{if $GLOBS.SITENAME} &mdash; {$GLOBS.SITENAME}{/if}
{include file="$TMPL_FOLDER/mod/shopexpresscopyright.html"}
</p>
</div>
View
@@ -250,13 +250,11 @@
<img src="https://dl.dropboxusercontent.com/u/31110145/shopexpress/themes-icons/books.jpg" style="width:56px;height:56px;">
</a>
</li>
-<!--
<li>
<a class="selector{if $GLOBS.css eq 'pets'} active{/if}" href="/cabinet/" value="pets" title="pets">
<img src="https://dl.dropboxusercontent.com/u/31110145/shopexpress/themes-icons/pets.jpg" style="width:56px;height:56px;">
</a>
</li>
--->
<li>
<a class="selector{if $GLOBS.css eq 'mobile'} active{/if}" href="/cabinet/" value="mobile" title="mobile">
<img src="https://dl.dropboxusercontent.com/u/31110145/shopexpress/themes-icons/mobile.jpg" style="width:56px;height:56px;">
@@ -1,15 +1,6 @@
-
<link href="/media0/css/social-tabs.css" rel="stylesheet">
<script src="/media0/js/jquery.wiwi.js"></script>
-{if $shopexpresssocialtabs_fb}
-<div class="widget facebook">
- <div class="flag"></div>
- <div class="fb-like-box" data-href="https://www.facebook.com/{$shopexpresssocialtabs_fb}" data-width="400" data-colorscheme="light" data-show-faces="true" data-header="true" data-stream="false" data-show-border="true"></div>
- <div id="fb-root"></div>
- <script>(function(d, s, id) { var js, fjs = d.getElementsByTagName(s)[0]; if (d.getElementById(id)) return; js = d.createElement(s); js.id = id; js.src = "//connect.facebook.net/ru_RU/all.js#xfbml=1"; fjs.parentNode.insertBefore(js, fjs); }(document, 'script', 'facebook-jssdk'));</script>
-</div>
-{/if}
{if $shopexpresssocialtabs_vk}
<div class="widget vk">
<div class="flag"></div>
@@ -21,12 +12,22 @@
</script>
</div>
{/if}
-{if $shopexpresssocialtabs_map}
-<div class="widget map">
+{if $shopexpresssocialtabs_fb}
+<div class="widget facebook">
<div class="flag"></div>
- {$shopexpresssocialtabs_map}
+ <div class="fb-like-box" data-href="https://www.facebook.com/{$shopexpresssocialtabs_fb}" data-width="400" data-colorscheme="light" data-show-faces="true" data-header="true" data-stream="false" data-show-border="true"></div>
+ <div id="fb-root"></div>
+ <script>(function(d, s, id) { var js, fjs = d.getElementsByTagName(s)[0]; if (d.getElementById(id)) return; js = d.createElement(s); js.id = id; js.src = "//connect.facebook.net/ru_RU/all.js#xfbml=1"; fjs.parentNode.insertBefore(js, fjs); }(document, 'script', 'facebook-jssdk'));</script>
</div>
{/if}
+{if $shopexpresssocialtabs_twitter}
+<div class="widget twitter">
+ <div class="flag"></div>
+ {$shopexpresssocialtabs_twitter}
+<script>!function(d,s,id){ var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){ js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs); } }(document,"script","twitter-wjs");</script>
+</div>
+{/if}
+
{if $shopexpresssocialtabs_ok}
<div class="widget odkl">
<div class="flag"></div>
@@ -49,9 +50,17 @@
</script>
</div>
{/if}
+{if $shopexpresssocialtabs_map}
+<div class="widget map">
+ <div class="flag"></div>
+ {$shopexpresssocialtabs_map}
+</div>
+{/if}
+
<script>
!function ($) {
$(function(){
+{if $shopexpresssocialtabs_twitter}$.wiwis({ selector : '.twitter' });{/if}
{if $shopexpresssocialtabs_fb}$.wiwis({ selector : '.facebook' });{/if}
{if $shopexpresssocialtabs_vk}$.wiwis({ selector : '.vk' });{/if}
{if $shopexpresssocialtabs_map}$.wiwis({ selector : '.map' });{/if}
@@ -12,7 +12,7 @@
<input type="hidden" name="targets" value="{$GLOBS.merchants.yandexmoney.serviceName|default:'Оплата заказа №'}{$order_id}">
<input name="formcomment" type="hidden" value="{$GLOBS.SITENAME|escape}: {$GLOBS.merchants.yandexmoney.serviceName|default:'Оплата заказа №'}{$order_id}">
<input name="short-dest" type="hidden" value="{$GLOBS.SITENAME|escape}: {$GLOBS.merchants.yandexmoney.serviceName|default:'Оплата заказа №'}{$order_id}">
- <input data-type="number" type="hidden" name="sum" value="{($summ*1.005)|replace:',':'.'}">
+ <input data-type="number" type="hidden" name="sum" value="{if $summ*0.005<0.1}{$summ+0.1}{else}{($summ*1.005)|replace:',':'.'}{/if}">
<button type="submit" name="submit-button" class="btn btn-large" title="{$GLOBS.merchants.yandexmoney.btn|default:'Оплатить через Яндекс.Деньги'}" rel="tooltip"><img src="/media0/img/merchants/Yandex.png" alt="Яндекс.Деньги" width="150" /></button>
</form>
@@ -28,7 +28,7 @@
<input type="hidden" name="targets" value="{$GLOBS.merchants.yandexmoney.serviceName|default:'Оплата заказа №'}{$order_id}">
<input name="formcomment" type="hidden" value="{$GLOBS.SITENAME|escape}: {$GLOBS.merchants.yandexmoney.serviceName|default:'Оплата заказа №'}{$order_id}">
<input name="short-dest" type="hidden" value="{$GLOBS.SITENAME|escape}: {$GLOBS.merchants.yandexmoney.serviceName|default:'Оплата заказа №'}{$order_id}">
- <input data-type="number" type="hidden" name="sum" value="{($summ*1.02)|replace:',':'.'}">
+ <input data-type="number" type="hidden" name="sum" value="{($summ*1.02041)|string_format:"%.2f"|replace:',':'.'}">
<button type="submit" name="submit-button" class="btn btn-large" title="Оплатить через Visa или MasterCard" rel="tooltip"><img src="/media0/img/merchants/VisaMasterYandex.png" alt="Visa и MasterCard через Яндекс.Деньги" width="150" /></button>
</form>
{/if}

0 comments on commit fdb5c09

Please sign in to comment.