Committer: skomarov
LJSUP-9157: Self promoU trunk/bin/upgrading/en_LJ.dat U trunk/htdocs/stc/shop/shop.css U trunk/templates/Shop/Error.tmpl U trunk/templates/Shop/SelfPromo.tmpl U trunk/templates/Shop/Warnings.tmpl
Modified: trunk/bin/upgrading/en_LJ.dat
===================================================================
--- trunk/bin/upgrading/en_LJ.dat 2011-08-19 03:42:25 UTC (rev 10887)
+++ trunk/bin/upgrading/en_LJ.dat 2011-08-19 09:29:28 UTC (rev 10888)
@@ -6222,6 +6222,8 @@
shop.view.text.paidonly=Available to <a href="[[siteroot]]/paidaccounts/">paid account</a> members only. If you're signed up for <a href="[[siteroot]]/manage/account/modify.bml">automatic payments</a>, you can add this feature to your account <a href="[[siteroot]]/manage/account/modify.bml">here</a>.
+shop.view.selfpromo.promo.text=Renaming your account allows you to change your username without affecting the rest of your journal. Your account status, profile, entries, and other account related information remain the same.
+
shop.view.total=TOTAL:
shop.view.userhead.price.free=Free
Modified: trunk/htdocs/stc/shop/shop.css
===================================================================
--- trunk/htdocs/stc/shop/shop.css 2011-08-19 03:42:25 UTC (rev 10887)
+++ trunk/htdocs/stc/shop/shop.css 2011-08-19 09:29:28 UTC (rev 10888)
@@ -27,6 +27,20 @@
padding: 0;
border: 0;
}
+/* Error bar */
+.errorbar {
+ background-image: url(/img/message-error.gif);
+ }
+ .errorbar P {
+ margin: 0 0 5px 0;
+ }
+/* Warning bar */
+.warningbar {
+ background-image: url(/img/warning-error.gif);
+ }
+ .warningbar P {
+ margin: 0 0 5px 0;
+ }
/* Shop typografic
--------------------------------------
@@ -1588,3 +1602,49 @@
.paybysms-phone {
font-size: 2em;
}
+
+/* Self promo
+------------------------------------------------------------------------*/
+.selfpromo H3 {
+ margin-bottom: 10px;
+ line-height: 16px;
+ font-style: normal;
+ font-size: 14px;
+ color: #000;
+ }
+/* Self promo intro */
+.b-selfpromo-intro {
+ min-height: 230px;
+ background: url(/img/shop/selfpromo-intro.jpg?v=1) no-repeat 100% 100%;
+ }
+/* Self promo price */
+.b-selfpromo-price {
+ margin-top: 20px;
+ }
+ .b-selfpromo-price LABEL {
+ display: inline-block;
+ width: 128px;
+ }
+ .b-selfpromo-price .input-text {
+ font-size: 12px;
+ }
+ .b-selfpromo-price FIELDSET {
+ margin: 0 0 7px 0;
+ }
+ .b-selfpromo-price .entry-link .input-text {
+ width: 320px;
+ }
+ .b-selfpromo-price .your-price .input-text {
+ width: 115px;
+ }
+ .b-selfpromo-price .current-price SPAN {
+ font-weight: bold;
+ font-size: 15px;
+ }
+ .b-selfpromo-price .price-description P {
+ font-size: 11px;
+ color: #404040;
+ }
+ .b-selfpromo-price .submit-options {
+ padding-top: 10px;
+ }
Modified: trunk/templates/Shop/Error.tmpl
===================================================================
--- trunk/templates/Shop/Error.tmpl 2011-08-19 03:42:25 UTC (rev 10887)
+++ trunk/templates/Shop/Error.tmpl 2011-08-19 09:29:28 UTC (rev 10888)
@@ -1,11 +1,9 @@
<TMPL_IF errors_occured>
- <div class="errorbar" style="background-image: URL('<TMPL_VAR lj_imgprefix>/message-error.gif');">
- <strong><TMPL_VAR expr="ml('error.procrequest')"></strong>
- <ul>
- <TMPL_LOOP name="errors">
- <li><TMPL_VAR error></li>
- </TMPL_LOOP>
- </ul>
+ <div class="errorbar">
+ <p><strong><TMPL_VAR expr="ml('error.procrequest')"></strong></p>
+ <TMPL_LOOP name="errors">
+ <p><TMPL_VAR error></p>
+ </TMPL_LOOP>
</div>
</TMPL_IF>
Modified: trunk/templates/Shop/SelfPromo.tmpl
===================================================================
--- trunk/templates/Shop/SelfPromo.tmpl 2011-08-19 03:42:25 UTC (rev 10887)
+++ trunk/templates/Shop/SelfPromo.tmpl 2011-08-19 09:29:28 UTC (rev 10888)
@@ -1,94 +1,72 @@
-[homer.png]
-
<TMPL_INCLUDE name="templates/Shop/Error.tmpl">
-<div id="selfpromo-preview-errors" style="background-image: URL('<TMPL_VAR lj_imgprefix>/message-error.gif'); display: none;" class="errorbar"></div>
+<div id="selfpromo-preview-errors" style="display: none;" class="errorbar"></div>
<TMPL_INCLUDE name="templates/Shop/Warnings.tmpl">
-<TMPL_LOOP data_selfpromo>
-<div class="selfpromo">
- <TMPL_IF can_withdraw>
- <form action="" method="post">
- <TMPL_VAR form_auth>
- <input type="hidden" name="action" value="withdraw">
- <input type="hidden" name="withdraw_url" value="<TMPL_VAR post_url>">
-
- <p>You already promote an entry</p>
- <dl class="rate-posts-item">
- <dt>
- <em><a href="<TMPL_VAR post_url>"><TMPL_IF subject><TMPL_VAR subject><TMPL_ELSE>no subject</TMPL_IF></a></em>
- <TMPL_VAR ljuser>
- </dt>
- <TMPL_IF body><dd><TMPL_VAR body></dd></TMPL_IF>
- </dl>
-
- <button type="submit">Withdraw</button>
- </form>
- <TMPL_ELSE>
- <p>Somebody already promotes an entry</p>
- <dl class="rate-posts-item">
- <dt>
- <em><a href="<TMPL_VAR post_url>"><TMPL_IF subject><TMPL_VAR subject><TMPL_ELSE>no subject</TMPL_IF></a></em>
- <TMPL_VAR ljuser>
- </dt>
- <TMPL_IF body><dd><TMPL_VAR body></dd></TMPL_IF>
- </dl>
- </TMPL_IF>
+<div class="b-shop-intro b-selfpromo-intro">
+ <h3><TMPL_VAR expr="ml('/shop/selfpromo.bml.title')"></h3>
+ <p><TMPL_VAR expr="ml('shop.view.selfpromo.promo.text')"></p>
</div>
-<hr>
-
+<TMPL_LOOP data_selfpromo>
+ <div class="selfpromo">
+ <TMPL_IF can_withdraw>
+ <form action="" method="post">
+ <TMPL_VAR form_auth>
+ <input type="hidden" name="action" value="withdraw" />
+ <input type="hidden" name="withdraw_url" value="<TMPL_VAR post_url>" />
+ <h3>You already promote an entry</h3>
+ <dl class="rate-posts-item">
+ <dt>
+ <em><a href="<TMPL_VAR post_url>"><TMPL_IF subject><TMPL_VAR subject><TMPL_ELSE>no subject</TMPL_IF></a></em>
+ <TMPL_VAR ljuser>
+ </dt>
+ <TMPL_IF body><dd><TMPL_VAR body></dd></TMPL_IF>
+ </dl>
+ <button type="submit">Withdraw</button>
+ </form>
+ <TMPL_ELSE>
+ <h3>Somebody already promotes an entry</h3>
+ <dl class="rate-posts-item selfpromo-post">
+ <dt>
+ <em><a href="<TMPL_VAR post_url>"><TMPL_IF subject><TMPL_VAR subject><TMPL_ELSE>no subject</TMPL_IF></a></em>
+ <TMPL_VAR ljuser>
+ </dt>
+ <TMPL_IF body><dd><TMPL_VAR body></dd></TMPL_IF>
+ </dl>
+ </TMPL_IF>
+ </div>
</TMPL_LOOP>
<TMPL_UNLESS hide_buyout>
-
- <form action="" method="post">
- <TMPL_VAR form_auth>
- <input type="hidden" name="action" value="promote">
-
- <table>
- <tr>
- <td><label for="entry_link"><TMPL_VAR expr="ml('/shop/selfpromo.bml.label.entry_link')"></label></td>
- <td>
- <input type="text" name="entry_link" id="entry_link" value="<TMPL_VAR form:entry_link ESCAPE=HTML>">
- <button type="button" id="selfpromo-preview-button">Preview</button>
- </td>
- </tr>
-
- <tr>
- <td><TMPL_VAR expr="ml('/shop/selfpromo.bml.label.current_price')"></td>
- <td><span id="current_price"><TMPL_VAR ml_current_price></span></td>
- </tr>
-
- <tr>
- <td><label for="price"><TMPL_VAR expr="ml('/shop/selfpromo.bml.label.price')"></label></td>
- <td><input type="text" name="price" id="price" value="<TMPL_VAR buyout_cost ESCAPE=HTML>"></td>
- </tr>
-
- <tr>
- <td colspan="2">
- <p id="price_description"><TMPL_VAR expr="ml('/shop/selfpromo.bml.price_description')"></p>
- </td>
- </tr>
-
- <tr style="display:none;">
- <td id="selfpromo-preview" colspan="2"> </td>
- </tr>
-
- <tr>
- <td colspan="2">
- <button type="submit"><TMPL_VAR expr="ml('/shop/selfpromo.bml.btn.submit')"></button>
- </td>
- </tr>
-
- </table>
-
- </form>
-
+ <form action="" method="post">
+ <TMPL_VAR form_auth>
+ <input type="hidden" name="action" value="promote" />
+ <div class="b-selfpromo-price">
+ <fieldset class="entry-link">
+ <label for="entry_link"><TMPL_VAR expr="ml('/shop/selfpromo.bml.label.entry_link')"></label>
+ <input type="text" name="entry_link" id="entry_link" value="<TMPL_VAR form:entry_link ESCAPE=HTML>" placeholder="<TMPL_VAR expr="ml('/shop/selfpromo.bml.placeholder.entry_link')">" class="input-text" />
+ </fieldset>
+ <fieldset class="current-price">
+ <label><TMPL_VAR expr="ml('/shop/selfpromo.bml.label.current_price')"></label>
+ <span id="current_price"><TMPL_VAR ml_current_price></span>
+ </fieldset>
+ <fieldset class="your-price">
+ <label for="price"><TMPL_VAR expr="ml('/shop/selfpromo.bml.label.price')"></label>
+ <input type="text" name="price" id="price" value="<TMPL_VAR buyout_cost ESCAPE=HTML>" placeholder="<TMPL_VAR expr="ml('/shop/selfpromo.bml.placeholder.price')">" class="input-text" />
+ </fieldset>
+ <fieldset class="price-description">
+ <p id="price_description"><TMPL_VAR expr="ml('/shop/selfpromo.bml.price_description')"></p>
+ </fieldset>
+ <fieldset class="submit-options">
+ <button type="button" id="selfpromo-preview-button">Preview</button>
+ <button type="submit"><TMPL_VAR expr="ml('/shop/selfpromo.bml.btn.submit')"></button>
+ </fieldset>
+ </div>
</TMPL_UNLESS>
<script type="text/javascript">
window.shop_selfpromo_ml = {
- 'entry_link_placeholder' : "<TMPL_VAR expr="ml('/shop/selfpromo.bml.placeholder.entry_link')">",
+ 'placeholder.entry_link' : "<TMPL_VAR expr="ml('/shop/selfpromo.bml.placeholder.entry_link')">",
'price_placeholder' : "<TMPL_VAR expr="ml('/shop/selfpromo.bml.placeholder.price')">",
};
Modified: trunk/templates/Shop/Warnings.tmpl
===================================================================
--- trunk/templates/Shop/Warnings.tmpl 2011-08-19 03:42:25 UTC (rev 10887)
+++ trunk/templates/Shop/Warnings.tmpl 2011-08-19 09:29:28 UTC (rev 10888)
@@ -1,11 +1,9 @@
<TMPL_IF has_warnings>
- <div class="warningbar" style="background-image: URL('<TMPL_VAR lj_imgprefix>/message-warning.gif');">
- <strong><TMPL_VAR expr="ml('label.warning')"></strong>
- <ul>
- <TMPL_LOOP name="warnings">
- <li><TMPL_VAR warning></li>
- </TMPL_LOOP>
- </ul>
+ <div class="warningbar">
+ <p><strong><TMPL_VAR expr="ml('label.warning')"></strong></p>
+ <TMPL_LOOP name="warnings">
+ <p><TMPL_VAR warning></p>
+ </TMPL_LOOP>
</div>
</TMPL_IF>