[ljcom] r11841: LJSUP-11638: Client-side development for...

U   trunk/htdocs/stc/shop/shop.css
U   trunk/templates/Shop/SelfPromo.tmpl

Modified: trunk/htdocs/stc/shop/shop.css
===================================================================
--- trunk/htdocs/stc/shop/shop.css	2012-04-27 08:34:07 UTC (rev 11840)
+++ trunk/htdocs/stc/shop/shop.css	2012-04-27 09:04:20 UTC (rev 11841)
@@ -76,6 +76,10 @@
 
 /* Shop tabs
 -------------------------------------- */
+.b-shop .m-shop-tabs-wrapper {
+	position: relative;
+	overflow: hidden;
+	}
 .b-shop .m-shop-tabs {
 	width: 100%;
 	padding: 0;
@@ -1735,7 +1739,19 @@
         } 
     
 /* Selfpromo ua */
-
+.b-shop-promo-switcher {
+	position: absolute;
+	top: 10px;
+	right: 0;
+	}
+	.b-shop-promo-switcher LI {
+		display: inline;
+		padding-left: 5px;
+		border-left: 1px solid #CCC;
+		}
+	.b-shop-promo-switcher LI:first-child {
+		border: 0;
+		}
 .selfpromo-ua .selfpromo-shop-list {
 	overflow: hidden;
 	background: url(/img/statistics/selfpromo-ua.png?ver=1) 0 50% no-repeat #FFFEE3;

Modified: trunk/templates/Shop/SelfPromo.tmpl
===================================================================
--- trunk/templates/Shop/SelfPromo.tmpl	2012-04-27 08:34:07 UTC (rev 11840)
+++ trunk/templates/Shop/SelfPromo.tmpl	2012-04-27 09:04:20 UTC (rev 11841)
@@ -5,14 +5,34 @@
 	<p><TMPL_VAR expr="ml('shop.view.selfpromo.promo.text')"></p>
 </div>
 
-<TMPL_IF is_regional_promos>
-    <ul class="opt-menu opt-menu-sort">
+<div class="m-shop-tabs-wrapper">
+    <ul class="m-shop-tabs" id="mTabsShop">
+        <TMPL_IF name="tab_entry_active">
+            <li class="current"><a href="<TMPL_VAR self_uri>?type=entry&country=<TMPL_VAR country>"> <TMPL_VAR expr="ml('/shop/selfpromo.bml.tab.entry')"></a></li>
+            <li><a href="<TMPL_VAR self_uri>?type=journal&country=<TMPL_VAR country>"><TMPL_VAR expr="ml('/shop/selfpromo.bml.tab.journal')"></a></li>
+            <li><a href="<TMPL_VAR self_uri>?type=community&country=<TMPL_VAR country>"><TMPL_VAR expr="ml('/shop/selfpromo.bml.tab.community')"></a></li>
+        <TMPL_ELSIF name="tab_journal_active">
+        	<li><a href="<TMPL_VAR self_uri>?type=entry&country=<TMPL_VAR country>"><TMPL_VAR expr="ml('/shop/selfpromo.bml.tab.entry')"></a></li>
+            <li class="current"><a href="<TMPL_VAR self_uri>?type=journal&country=<TMPL_VAR country>"><TMPL_VAR expr="ml('/shop/selfpromo.bml.tab.journal')"></a></li>
+            <li><a href="<TMPL_VAR self_uri>?type=community&country=<TMPL_VAR country>"><TMPL_VAR expr="ml('/shop/selfpromo.bml.tab.community')"></a></li>
+        <TMPL_ELSIF name="tab_community_active">
+        	<li><a href="<TMPL_VAR self_uri>?type=entry&country=<TMPL_VAR country>"><TMPL_VAR expr="ml('/shop/selfpromo.bml.tab.entry')"></a></li>
+            <li><a href="<TMPL_VAR self_uri>?type=journal&country=<TMPL_VAR country>"><TMPL_VAR expr="ml('/shop/selfpromo.bml.tab.journal')"></a></li>
+            <li class="current"><a href="<TMPL_VAR self_uri>?type=community&country=<TMPL_VAR country>"><TMPL_VAR expr="ml('/shop/selfpromo.bml.tab.community')"></a></li>
+        <TMPL_ELSE>
+            <li><a href="<TMPL_VAR self_uri>?type=entry&country=<TMPL_VAR country>"><TMPL_VAR expr="ml('/shop/selfpromo.bml.tab.entry')"></a></li>
+            <li><a href="<TMPL_VAR self_uri>?type=journal&country=<TMPL_VAR country>"><TMPL_VAR expr="ml('/shop/selfpromo.bml.tab.journal')"></a></li>
+            <li><a href="<TMPL_VAR self_uri>?type=community&country=<TMPL_VAR country>"><TMPL_VAR expr="ml('/shop/selfpromo.bml.tab.community')"></a></li>
+        </TMPL_IF>
+    </ul>
+    <ul class="b-shop-promo-switcher">
         <li>
-            <TMPL_IF EXPR="country eq 'ua'">
-                <strong><TMPL_VAR expr="ml('/shop/selfpromo.bml.ratings.view.ua')"></strong>
-            <TMPL_ELSE>
-                <a href="<TMPL_VAR self_uri>?type=<TMPL_VAR type>&country=ua" title="<TMPL_VAR expr="ml('/shop/selfpromo.bml.ratings.view.ua.description')">"><TMPL_VAR expr="ml('/shop/selfpromo.bml.ratings.view.ua')"></a>
-            </TMPL_IF>
+            <TMPL_IF is_regional_promos>
+                <TMPL_IF EXPR="country eq 'ua'">
+                    <strong><TMPL_VAR expr="ml('/shop/selfpromo.bml.ratings.view.ua')"></strong>
+                   <TMPL_ELSE>
+                       <a href="<TMPL_VAR self_uri>?type=<TMPL_VAR type>&country=ua" title="<TMPL_VAR expr="ml('/shop/selfpromo.bml.ratings.view.ua.description')">"><TMPL_VAR expr="ml('/shop/selfpromo.bml.ratings.view.ua')"></a>
+                </TMPL_IF>
         </li>
         <li>
             <TMPL_IF EXPR="country eq 'ua'">
@@ -22,28 +42,7 @@
             </TMPL_IF>
         </li>
     </ul>
-</TMPL_IF>
-
-<ul class="m-shop-tabs" id="mTabsShop">
-<TMPL_IF name="tab_entry_active">
-    <li class="current"><a href="<TMPL_VAR self_uri>?type=entry&country=<TMPL_VAR country>"> <TMPL_VAR expr="ml('/shop/selfpromo.bml.tab.entry')"></a></li>
-    <li><a href="<TMPL_VAR self_uri>?type=journal&country=<TMPL_VAR country>"><TMPL_VAR expr="ml('/shop/selfpromo.bml.tab.journal')"></a></li>
-    <li><a href="<TMPL_VAR self_uri>?type=community&country=<TMPL_VAR country>"><TMPL_VAR expr="ml('/shop/selfpromo.bml.tab.community')"></a></li>
-<TMPL_ELSIF name="tab_journal_active">
-	<li><a href="<TMPL_VAR self_uri>?type=entry&country=<TMPL_VAR country>"><TMPL_VAR expr="ml('/shop/selfpromo.bml.tab.entry')"></a></li>
-    <li class="current"><a href="<TMPL_VAR self_uri>?type=journal&country=<TMPL_VAR country>"><TMPL_VAR expr="ml('/shop/selfpromo.bml.tab.journal')"></a></li>
-    <li><a href="<TMPL_VAR self_uri>?type=community&country=<TMPL_VAR country>"><TMPL_VAR expr="ml('/shop/selfpromo.bml.tab.community')"></a></li>
-<TMPL_ELSIF name="tab_community_active">
-	<li><a href="<TMPL_VAR self_uri>?type=entry&country=<TMPL_VAR country>"><TMPL_VAR expr="ml('/shop/selfpromo.bml.tab.entry')"></a></li>
-    <li><a href="<TMPL_VAR self_uri>?type=journal&country=<TMPL_VAR country>"><TMPL_VAR expr="ml('/shop/selfpromo.bml.tab.journal')"></a></li>
-    <li class="current"><a href="<TMPL_VAR self_uri>?type=community&country=<TMPL_VAR country>"><TMPL_VAR expr="ml('/shop/selfpromo.bml.tab.community')"></a></li>
-<TMPL_ELSE>
-    <li><a href="<TMPL_VAR self_uri>?type=entry&country=<TMPL_VAR country>"><TMPL_VAR expr="ml('/shop/selfpromo.bml.tab.entry')"></a></li>
-    <li><a href="<TMPL_VAR self_uri>?type=journal&country=<TMPL_VAR country>"><TMPL_VAR expr="ml('/shop/selfpromo.bml.tab.journal')"></a></li>
-    <li><a href="<TMPL_VAR self_uri>?type=community&country=<TMPL_VAR country>"><TMPL_VAR expr="ml('/shop/selfpromo.bml.tab.community')"></a></li>
-</TMPL_IF>
-</ul>
-
+</div>
 	<TMPL_INCLUDE name="templates/Shop/Error.tmpl">
 	<div id="selfpromo-preview-errors" style="display: none;" class="errorbar"></div>
 <ul class="b-wallet-tokens" id="mTabsShopContent">