[ljcom] r11747: LJSUP-11857: Cyr sub domains
Committer: esavintcev
LJSUP-11857: Cyr sub domainsU 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-20 13:27:40 UTC (rev 11746)
+++ trunk/bin/upgrading/en_LJ.dat 2012-04-20 13:50:10 UTC (rev 11747)
@@ -8471,13 +8471,20 @@
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.buydomain=BUY DOMAIN
+
shop.view.domainru.managedomains=MANAGE DOMAINS
+shop.view.domainru.url=.zhzh.rf
+
shop.view.selfpromo.promo.text<<
This service allows you to promote any of your entries (from your journal or community) at the LiveJournal homepage.
<br />The promoted entry will be placed on the LiveJournal homepage for up to 3 hours but it can be displaced by another user's entry. <br />
Modified: trunk/htdocs/stc/shop/shop.css
===================================================================
--- trunk/htdocs/stc/shop/shop.css 2012-04-20 13:27:40 UTC (rev 11746)
+++ trunk/htdocs/stc/shop/shop.css 2012-04-20 13:50:10 UTC (rev 11747)
@@ -1888,4 +1888,71 @@
.b-commpromo-calendar .b-commpromo-calendar-inner {
width: 100%;
background-color: #FFF;
- }
\ No newline at end of file
+ }
+
+
+
+/* Domain RU
+------------------------------------------------------------------------*/
+.b-domainru {
+ padding-top: 15px;
+ }
+ .b-shop .b-domainru-field {
+ margin: 0 0 1em 11em;
+ padding: 0;
+ clear: left;
+ }
+ .b-shop .b-domainru-field-head {
+ position: relative;
+ left: -11em;
+ float: left;
+ width: 10em;
+ margin: 0 -10em 0 0;
+ padding: 0;
+ font-weight: bold;
+ }
+ .b-shop .b-domainru-field-body {
+ margin: 0;
+ padding: 0;
+ }
+ .b-domainru-name {
+ width: 220px;
+ }
+ .b-domainru-domains {
+ width: 100%;
+ margin: 0 0 10px;
+ padding: 0;
+ }
+ .b-domainru-domains TD {
+ padding: 10px 0 10px 15px;
+ vertical-align: top;
+ text-align: left;
+ }
+ .b-domainru-domains-odd TD {
+ background: #F5F5F5;
+ }
+ .b-domainru-domains .b-domainru-domains-remove {
+ padding: 10px 15px 10px 0;
+ text-align: right;
+ }
+ .b-domainru-remove {
+ overflow: hidden;
+ display: inline-block;
+ width: 12px;
+ height: 12px;
+ margin: 0;
+ padding: 0;
+ vertical-align: -15px;
+ text-indent: -200px;
+ *display: inline;
+ *zoom: 1;
+ }
+ .b-domainru-remove-icon {
+ display: block;
+ width: 12px;
+ height: 12px;
+ margin: 0;
+ padding: 0;
+ background: url(/img/popup-cls.png?v=1) no-repeat 0 0;
+ font: 0/0 serif;
+ }
Modified: trunk/templates/Shop/DomainRU.tmpl
===================================================================
--- trunk/templates/Shop/DomainRU.tmpl 2012-04-20 13:27:40 UTC (rev 11746)
+++ trunk/templates/Shop/DomainRU.tmpl 2012-04-20 13:50:10 UTC (rev 11747)
@@ -3,48 +3,80 @@
<div id="shop_domainru">
<div class="b-shop-intro b-renacc-intro">
- <h3><TMPL_VAR expr="ml('shop.view.domainru.intro.title')"></h3>
- <p><TMPL_VAR expr="ml('shop.view.domainru.intro.text')"></p>
+ <h3><TMPL_VAR expr="ml('shop.view.domainru.intro.title')"></h3>
+ <p><TMPL_VAR expr="ml('shop.view.domainru.intro.text')"></p>
</div>
-<a href="<TMPL_VAR self_uri>?type=buy"><TMPL_VAR expr="ml('shop.view.domainru.buydomain')"></a>
-<a href="<TMPL_VAR self_uri>?type=manage"><TMPL_VAR expr="ml('shop.view.domainru.managedomains')"></a>
+<div class="b-buy">
+ <ul class="m-buy-types">
+ <li class="m-buy-types-item<TMPL_IF EXPR="type eq 'buy'"> current</TMPL_IF>">
+ <a href="<TMPL_VAR self_uri>?type=buy">
+ <TMPL_VAR expr="ml('shop.view.domainru.buydomain')">
+ </a>
+ </li>
+ <li class="m-buy-types-item<TMPL_IF EXPR="type ne 'buy'"> current</TMPL_IF>">
+ <a href="<TMPL_VAR self_uri>?type=manage">
+ <TMPL_VAR expr="ml('shop.view.domainru.managedomains')">
+ </a>
+ </li>
+ </ul>
+ <ul class="b-buy-goods">
+ <li class="b-buy-goods-item<TMPL_IF EXPR="type eq 'buy'"> current</TMPL_IF>">
+ <form method="post">
+ <fieldset>
+ <TMPL_VAR form_auth>
-<tmpl_if expr="type eq 'buy'">
-<tmpl_if is_authas><p class="b-bubble b-bubble-success b-bubble-intext"><tmpl_var current_username></p></tmpl_if>
-<div class="b-renacc-form">
- <form method="post">
- <TMPL_VAR form_auth>
- <fieldset>
- <dl class="b-renacc-fields">
- <dt><TMPL_VAR expr="ml('shop.view.domainru.current')">:</dt>
- <dd id="authas_container"><TMPL_VAR authas_select></dd>
- </dl>
- <dl class="b-renacc-fields">
- <dt><label for="src_name"><TMPL_VAR expr="ml('shop.view.domainru.desired')">:</label>
- <dd><input type="text" name="src_name" id="src_name" />.жж.рф</dd>
- </dl>
- <p class="b-shop-desc"><TMPL_VAR expr="ml('shop.view.domainru.desc')"></p>
- <input type="checkbox" name="confirm" id="domainru-confirm">
- <label for="domainru-confirm"><TMPL_VAR expr="ml('shop.view.domainru.checkbox')"></label>
- </fieldset>
- <TMPL_IF 0>
- <TMPL_VAR expr="ml('shop.view.domainru.total')">
- <TMPL_VAR total_cost>
- </TMPL_IF>
- <button type="submit"><TMPL_VAR expr="ml('shop.view.domainru.buy')"></button>
- </form>
-</div>
+ <div class="b-buy-intro b-domainru">
+ <dl class="b-domainru-field">
+ <dt class="b-domainru-field-head"><TMPL_VAR expr="ml('shop.view.domainru.current')"></dt>
+ <dd class="b-domainru-field-body">
+ <TMPL_VAR authas_select>
+ </dd>
+ </dl>
-<tmpl_else>
+ <dl class="b-domainru-field">
+ <dt class="b-domainru-field-head"><label for="src_name"><TMPL_VAR expr="ml('shop.view.domainru.desired')"></dt>
+ <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')">
+ </dd>
+ </dl>
-<ul>
-<tmpl_loop domains>
- <li><tmpl_var current_ljuser> <tmpl_var dom> <a href=?type=manage&delete=1&auth=<tmpl_var auth>&dom=<tmpl_var dom>>X</a></li>
-</tmpl_loop>
-</ul>
+ <p class="b-shop-desc"><TMPL_VAR expr="ml('shop.view.domainru.desc')"></p>
-</tmpl_if>
+ <p>
+ <input type="checkbox" name="confirm" id="domainru-confirm">
+ <label for="domainru-confirm"><TMPL_VAR expr="ml('shop.view.domainru.checkbox')"></label>
+ </p>
+ </div>
+ <div class="b-buy-total canyon">
+ <p class="canyon-section"><TMPL_VAR expr="ml('shop.view.domainru.total')"><strong>$<span class="i-total"></span></strong></p>
+ <button class="canyon-side" type="submit"><TMPL_VAR expr="ml('shop.view.domainru.buy')"></button>
+ </div>
+ </fieldset>
+ </form>
+ </li>
+ <li class="b-buy-goods-item<TMPL_IF EXPR="type ne 'buy'"> current</TMPL_IF>">
+ <div class="b-buy-intro">
+ <table class="b-domainru-domains">
+ <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>
+ </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>
+ </td>
+ <td class="b-domainru-domains-remove">
+ <a href="?type=manage&delete=1&auth=<TMPL_VAR auth>&dom=<TMPL_VAR dom>" title="<TMPL_VAR expr="ml('shop.view.domainru.remove')">" class="b-domainru-remove" title="<TMPL_VAR expr="ml('shop.view.domainru.remove')">"><i class="b-domainru-remove-icon"></i><TMPL_VAR expr="ml('shop.view.domainru.remove')"></a>
+ </td>
+ </tr>
+ </TMPL_LOOP>
+ </table>
+ </div>
+ </li>
+ </ul>
</div>
+</div>