[ljcom] r11762: LJSUP-11857: Cyr sub domains

U   trunk/bin/upgrading/en_LJ.dat
U   trunk/htdocs/stc/shop/shop.css
U   trunk/templates/Shop/DomainRU.tmpl

Modified: trunk/bin/upgrading/en_LJ.dat
===================================================================
--- trunk/bin/upgrading/en_LJ.dat	2012-04-23 13:02:02 UTC (rev 11761)
+++ trunk/bin/upgrading/en_LJ.dat	2012-04-23 14:15:28 UTC (rev 11762)
@@ -8448,8 +8448,15 @@
 shop.view.renameaccount.title|staleness=1
 shop.view.renameaccount.title=Rename Account
 
+
 shop.view.domainru.authas=You are now working as the username <strong>'[[username]]'</strong>.
 
+shop.view.domainru.buy=Buy
+
+shop.view.domainru.buydomain=Buy domain
+
+shop.view.domainru.checkbox=Yes, I understand rules and want to buy this domain
+
 shop.view.domainru.current|staleness=1
 shop.view.domainru.current=Current account
 
@@ -8460,29 +8467,27 @@
 shop.view.domainru.desired|staleness=1
 shop.view.domainru.desired=Desired domain
 
+shop.view.domainru.exists=Domain already exists
+
 shop.view.domainru.intro.text<<
 Brief description of the service
 .
 
-shop.view.domainru.checkbox=Yes, I understand rules and want to buy this domain
+shop.view.domainru.invalid=Domain invalid
 
+shop.view.domainru.managedomains=Manage domains
+
+shop.view.domainru.remove=Remove domain
+
 shop.view.domainru.intro.title=Domain РФ
 
 shop.view.domainru.title|staleness=1
 shop.view.domainru.title=Domain РФ
 
-shop.view.domainru.remove=Remove domain
-
-shop.view.domainru.buy=Buy
-
 shop.view.domainru.total=Total:
 
 shop.view.domainru.tokens=LJ Tokens
 
-shop.view.domainru.buydomain=BUY DOMAIN
-
-shop.view.domainru.managedomains=MANAGE DOMAINS
-
 shop.view.domainru.url=.zhzh.rf
 
 

Modified: trunk/htdocs/stc/shop/shop.css
===================================================================
--- trunk/htdocs/stc/shop/shop.css	2012-04-23 13:02:02 UTC (rev 11761)
+++ trunk/htdocs/stc/shop/shop.css	2012-04-23 14:15:28 UTC (rev 11762)
@@ -1915,6 +1915,14 @@
 			margin: 0;
 			padding: 0;
 			}
+			.b-domainru-field .b-bubble {
+				display: none;
+				margin: 10px 0 0 !important;
+				}
+			.b-domainru-exists .b-domainru-error-exists,
+			.b-domainru-invalid .b-domainru-error-invalid {
+				display: block;
+				}
 	.b-domainru-name {
 		width: 220px;
 		}

Modified: trunk/templates/Shop/DomainRU.tmpl
===================================================================
--- trunk/templates/Shop/DomainRU.tmpl	2012-04-23 13:02:02 UTC (rev 11761)
+++ trunk/templates/Shop/DomainRU.tmpl	2012-04-23 14:15:28 UTC (rev 11762)
@@ -39,6 +39,8 @@
                             <dd class="b-domainru-field-body">
                                 <input type="text" name="src_name" id="src_name" class="b-domainru-name" />
                                 <TMPL_VAR expr="ml('shop.view.domainru.url')">
+                                <p class="b-bubble b-bubble-noarrow b-bubble-warning b-domainru-error-exists"><TMPL_VAR expr="ml('shop.view.domainru.exists')"></p>
+                                <p class="b-bubble b-bubble-noarrow b-bubble-warning b-domainru-error-invalid"><TMPL_VAR expr="ml('shop.view.domainru.invalid')"></p>
                             </dd>
                         </dl>
 
@@ -51,7 +53,7 @@
                     </div>
 
                     <div class="b-buy-total canyon">
-                        <p class="canyon-section"><TMPL_VAR expr="ml('shop.view.domainru.total')"> <strong><TMPL_VAR total_cost></strong><TMPL_VAR expr="ml('shop.view.domainru.tokens')"></p>
+                        <p class="canyon-section"><TMPL_VAR expr="ml('shop.view.domainru.total')"> <strong><TMPL_VAR total_cost></strong>&nbsp;<TMPL_VAR expr="ml('shop.view.domainru.tokens')"></p>
                         <button class="canyon-side" type="submit"><TMPL_VAR expr="ml('shop.view.domainru.buy')"></button>
                     </div>
                 </fieldset>
@@ -63,7 +65,7 @@
                     <TMPL_LOOP domains>
                         <tr class="<TMPL_IF __odd__>b-domainru-domains-odd<TMPL_ELSE>b-domainru-domains-even</TMPL_IF">
                             <td class="b-domainru-domains-user">
-                                <TMPL_VAR current_ljuser>
+                                <TMPL_VAR auth_display>
                             </td>
                             <td class="b-domainru-domains-domain">
                                 <a href="http://<TMPL_VAR dom><TMPL_VAR expr="ml('shop.view.domainru.url')">" target="_blank"><TMPL_VAR dom><TMPL_VAR expr="ml('shop.view.domainru.url')"></a>