Савинцев Егор 🚶 (savintsev_egor) wrote in changelog,
Савинцев Егор 🚶
savintsev_egor
changelog

[livejournal] r17148: LJSUP-6473: Facebook

Committer: esavintcev
LJSUP-6473: Facebook
U   trunk/templates/CommentForm/Author-Anonymous.tmpl
U   trunk/templates/CommentForm/Author-OpenID.tmpl
U   trunk/templates/CommentForm/Author-User.tmpl
U   trunk/templates/CommentForm/Form.tmpl
U   trunk/templates/Identity/Login-openid.tmpl
Modified: trunk/templates/CommentForm/Author-Anonymous.tmpl
===================================================================
--- trunk/templates/CommentForm/Author-Anonymous.tmpl	2010-08-18 07:13:13 UTC (rev 17147)
+++ trunk/templates/CommentForm/Author-Anonymous.tmpl	2010-08-18 07:48:12 UTC (rev 17148)
@@ -1,39 +1,39 @@
 <TMPL_IF everyone_can_comment>
     <TMPL_UNLESS is_public>
         <tr valign='middle'>
-        <td align='center' width='20'><img src='<TMPL_VAR lj_imgprefix>/anonymous.gif' /></td>
-        <td align='center'>(  )</td>
-        <td align='left' colspan='2'>
-            <font color='#c0c0c0'><b><TMPL_VAR expr="ml('/talkpost.bml.opt.anonymous')"></b></font>
-            <p class="i-bubble b-bubble-yellow b-postform-openid"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.opt.noanonpost.nonpublic')"></p>
+        <td class="b-postform-icon" width='20'><img src='<TMPL_VAR lj_imgprefix>/anonymous.gif' /></td>
+        <td class="b-postform-radio">(  )</td>
+        <td class="b-postform-data b-postform-active" colspan='2'>
+            <span class="i-postform-label i-postform-disabled"><b><TMPL_VAR expr="ml('/talkpost.bml.opt.anonymous')"></b></span>
+            <span class="i-bubble b-bubble-yellow b-postform-openid"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.opt.noanonpost.nonpublic')"></span>
         </td>
         </tr>
     <TMPL_ELSE>
         <tr valign='center'>
-        <td align='center'><img src='<TMPL_VAR lj_imgprefix>/anonymous.gif' onclick='handleRadios(0);'/></td>
-        <td align='center'><input type='radio' name='usertype' value='anonymous' id='talkpostfromanon' <TMPL_IF whocheck_anonymous>checked='checked'</TMPL_IF> /></td>
-        <td align='left'>
-            <b><label for='talkpostfromanon'><TMPL_VAR expr="ml('/talkpost.bml.opt.anonymous')"></label></b>
+        <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/anonymous.gif' onclick='handleRadios(0);'/></td>
+        <td class="b-postform-radio"><input type='radio' name='usertype' value='anonymous' id='talkpostfromanon' <TMPL_IF whocheck_anonymous>checked='checked'</TMPL_IF> /></td>
+        <td class="b-postform-data">
+            <label for='talkpostfromanon' class="i-postform-label"><b><TMPL_VAR expr="ml('/talkpost.bml.opt.anonymous')"></b></label>
             <TMPL_VAR ml_willscreen>
         </td>
         </tr>
     </TMPL_IF>
 <TMPL_ELSIF registered_can_comment>
     <tr valign='middle'>
-    <td align='center' width='20'><img src='<TMPL_VAR lj_imgprefix>/anonymous.gif' /></td>
-    <td align='center'>(  )</td>
-    <td align='left' colspan='2'>
-        <font color='#c0c0c0'><b><TMPL_VAR expr="ml('/talkpost.bml.opt.anonymous')"></b></font>
-        <p class="i-bubble b-bubble-yellow b-postform-openid"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.opt.noanonpost')"></p>
+    <td class="b-postform-icon" width='20'><img src='<TMPL_VAR lj_imgprefix>/anonymous.gif' /></td>
+    <td class="b-postform-radio">(  )</td>
+    <td class="b-postform-data b-postform-active" colspan='2'>
+        <span class="i-postform-label i-postform-disabled"><b><TMPL_VAR expr="ml('/talkpost.bml.opt.anonymous')"></b></span>
+        <span class="i-bubble b-bubble-yellow b-postform-openid"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.opt.noanonpost')"></span>
     </td>
     </tr>
 <TMPL_ELSIF friends_can_comment>
     <tr valign='middle'>
-    <td align='center' width='20'><img src='<TMPL_VAR lj_imgprefix>/anonymous.gif' /></td>
-    <td align='center'>(  )</td>
-    <td align='left' colspan='2'>
-        <font color='#c0c0c0'><b><TMPL_VAR expr="ml('/talkpost.bml.opt.anonymous')"></b></font>
-        <p class="i-bubble b-bubble-yellow b-postform-openid"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR ml_friendsonly></p>
+    <td class="b-postform-icon" width='20'><img src='<TMPL_VAR lj_imgprefix>/anonymous.gif' /></td>
+    <td class="b-postform-radio">(  )</td>
+    <td class="b-postform-data b-postform-active" colspan='2'>
+        <span class="i-postform-label i-postform-disabled"><b><TMPL_VAR expr="ml('/talkpost.bml.opt.anonymous')"></b></span>
+        <span class="i-bubble b-bubble-yellow b-postform-openid"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR ml_friendsonly></span>
     </td>
     </tr>
 </TMPL_IF>

Modified: trunk/templates/CommentForm/Author-OpenID.tmpl
===================================================================
--- trunk/templates/CommentForm/Author-OpenID.tmpl	2010-08-18 07:13:13 UTC (rev 17147)
+++ trunk/templates/CommentForm/Author-OpenID.tmpl	2010-08-18 07:48:12 UTC (rev 17148)
@@ -2,22 +2,22 @@
     <TMPL_IF everyone_can_comment>
         <TMPL_IF is_identity>
             <tr valign='middle' id='oidli' name='oidli'>
-            <td align='center'><img src='<TMPL_VAR lj_imgprefix>/openid-profile.gif' onclick='handleRadios(4);' /></td>
-            <td align='center'><input type='radio' name='usertype' value='openid_cookie' id='talkpostfromoidli' <TMPL_IF whocheck_openid_cookie>checked='checked'</TMPL_IF> /></td>
-            <td align='left'>
-                <b><label for='talkpostfromoid' onclick='handleRadios(4);return false;'>OpenID identity:</label></b>
+            <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/openid-profile.gif' onclick='handleRadios(4);' /></td>
+            <td class="b-postform-radio"><input type='radio' name='usertype' value='openid_cookie' id='talkpostfromoidli' <TMPL_IF whocheck_openid_cookie>checked='checked'</TMPL_IF> /></td>
+            <td class="b-postform-data">
+                <label for='talkpostfromoid' onclick='handleRadios(4);return false;' class="i-postform-label"><b>OpenID identity:</b></label>
                 <strong><TMPL_VAR remote_display_name></strong>
                 <TMPL_VAR ml_willscreen>
             </td>
             </tr>
         <TMPL_ELSE>
             <tr valign='middle' id='oidlo' name='oidlo'>
-            <td align='center'><img src='<TMPL_VAR lj_imgprefix>/openid-profile.gif' onclick='handleRadios(3);' /></td>
-            <td align='center'><input type='radio' name='usertype' value='openid' id='talkpostfromoidlo' <TMPL_IF whocheck_openid>checked='checked'</TMPL_IF> /></td>
-            <td align='left' class="b-postform-td">
-                <b><label for='talkpostfromoidlo' onclick='handleRadios(4);return false;'>OpenID</label></b>
+            <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/openid-profile.gif' onclick='handleRadios(3);' /></td>
+            <td class="b-postform-radio"><input type='radio' name='usertype' value='openid' id='talkpostfromoidlo' <TMPL_IF whocheck_openid>checked='checked'</TMPL_IF> /></td>
+            <td class="b-postform-data">
+                <label for='talkpostfromoidlo' onclick='handleRadios(4);return false;' class="i-postform-label"><b>OpenID</b></label>
                 <TMPL_VAR ml_willscreen>
-                <p id="oid_more" class="i-bubble b-bubble-lite b-postform-openid"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><label for="openid:url"><TMPL_VAR expr="ml('/talkpost.bml.openid.identity.url')">&nbsp;</label><input class='textbox' name='openid:url' maxlength='60' size='42' id='openid:url' value='<TMPL_VAR openid_url_default>' /> <input type='hidden' name='oiddo_login' id='oidlogincheck' <TMPL_VAR oiddo_login_checked> /> <TMPL_VAR helpicon_openid></p>
+                <span id="oid_more" class="i-bubble b-bubble-lite b-postform-openid"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><label for="openid:url"><TMPL_VAR expr="ml('/talkpost.bml.openid.identity.url')">&nbsp;</label><input class='textbox' name='openid:url' maxlength='60' size='42' id='openid:url' value='<TMPL_VAR openid_url_default>' /> <input type='hidden' name='oiddo_login' id='oidlogincheck' <TMPL_VAR oiddo_login_checked> /> <TMPL_VAR helpicon_openid></span>
             </td>
             </tr>
         </TMPL_IF>
@@ -26,14 +26,14 @@
         <TMPL_IF is_trusted_identity>
             <tr valign='middle' id='oidli' name='oidli'>
             <TMPL_IF remote_banned>
-                <td align='center'><img src='<TMPL_VAR lj_imgprefix>/openid-profile.gif' /></td>
-                <td align='center'>( )</td>
-                <td align='left'><span class='ljdeem'><TMPL_VAR ml_loggedin></font><TMPL_VAR ml_banned></td>
+                <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/openid-profile.gif' /></td>
+                <td class="b-postform-radio">( )</td>
+                <td class="b-postform-data"><span class='ljdeem'><TMPL_VAR ml_loggedin></font><TMPL_VAR ml_banned></td>
             <TMPL_ELSE>
-                <td align='center'><img src='<TMPL_VAR lj_imgprefix>/openid-profile.gif' onclick='handleRadios(4);' /></td>
-                <td align='center'><input type='radio' name='usertype' value='openid_cookie' id='talkpostfromoidli' <TMPL_IF whocheck_openid_cookie>checked='checked'</TMPL_IF> /></td>
-                <td align='left'>
-                    <b><label for='talkpostfromoid' onclick='handleRadios(4);return false;'>OpenID identity:</label></b>
+                <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/openid-profile.gif' onclick='handleRadios(4);' /></td>
+                <td class="b-postform-radio"><input type='radio' name='usertype' value='openid_cookie' id='talkpostfromoidli' <TMPL_IF whocheck_openid_cookie>checked='checked'</TMPL_IF> /></td>
+                <td class="b-postform-data">
+                    <label for='talkpostfromoid' onclick='handleRadios(4);return false;' class="i-postform-label"><b>OpenID identity:</b></label>
                     <strong><TMPL_VAR remote_display_name></strong>
                     <TMPL_VAR ml_willscreen>
                 </td>
@@ -41,10 +41,10 @@
             </tr>
         <TMPL_ELSE>
             <tr valign='middle'>
-            <td align='center'><img src='<TMPL_VAR lj_imgprefix>/openid-profile.gif' onclick='handleRadios(3);' /></td>
-            <td align='center'>(  )</td>
-            <td align='left' colspan='2'>
-                <font color='#c0c0c0'><b>OpenID</b></font>
+            <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/openid-profile.gif' onclick='handleRadios(3);' /></td>
+            <td class="b-postform-radio">(  )</td>
+            <td class="b-postform-data" colspan='2'>
+                <span class="i-postform-label i-postform-disabled"><b>OpenID</b></span>
                 <TMPL_IF is_identity><TMPL_VAR ml_noopenidpost></TMPL_IF>
                 <TMPL_VAR helpicon_openid>
             </td>
@@ -53,19 +53,19 @@
     <TMPL_ELSIF friends_can_comment>
         <TMPL_IF is_identity>
             <tr valign='middle' id='oidli' name='oidli'>
-            <td align='center'><img src='<TMPL_VAR lj_imgprefix>/openid-profile.gif' onclick='handleRadios(4);' /></td>
+            <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/openid-profile.gif' onclick='handleRadios(4);' /></td>
 
             <TMPL_IF remote_can_comment>
-                <td align='center'><input type='radio' name='usertype' value='openid_cookie' id='talkpostfromoidli' <TMPL_IF whocheck_openid_cookie>checked='checked'</TMPL_IF> /></td>
-                <td align='left'>
-                    <b><label for='talkpostfromoid' onclick='handleRadios(4);return false;'>OpenID identity:</label></b>
+                <td class="b-postform-radio"><input type='radio' name='usertype' value='openid_cookie' id='talkpostfromoidli' <TMPL_IF whocheck_openid_cookie>checked='checked'</TMPL_IF> /></td>
+                <td class="b-postform-data">
+                    <b><label for='talkpostfromoid' onclick='handleRadios(4);return false;' class="i-postform-label">OpenID identity:</label></b>
                     <strong><TMPL_VAR remote_display_name></strong>
                     <TMPL_VAR ml_willscreen>
                 </td>
             <TMPL_ELSE>
-                <td align='center'>( )</td>
-                <td align='left'>
-                    <b><font color='#c0c0c0'>OpenID identity:</font></b>&nbsp;
+                <td class="b-postform-radio">( )</td>
+                <td class="b-postform-data">
+                    <span class="i-postform-label i-postform-disabled"><b>OpenID identity:</b></span>&nbsp;
                     <strong><TMPL_VAR remote_display_name></strong>
                     <TMPL_VAR ml_notafriend>
                     <TMPL_VAR ml_willscreen>
@@ -75,16 +75,15 @@
             </tr>
         <TMPL_ELSE>
             <tr valign='middle' id='oidlo' name='oidlo'>
-            <td align='center'><img src='<TMPL_VAR lj_imgprefix>/openid-profile.gif' onclick='handleRadios(3);' /></td>
-            <td align='center'><input type='radio' name='usertype' value='openid' id='talkpostfromoidlo' <TMPL_IF whocheck_openid>checked='checked'</TMPL_IF> /></td>
-            <td align='left' class="b-postform-td">
-                <b><label for='talkpostfromoidlo' onclick='handleRadios(4);return false;'>OpenID</label></b>
+            <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/openid-profile.gif' onclick='handleRadios(3);' /></td>
+            <td class="b-postform-radio"><input type='radio' name='usertype' value='openid' id='talkpostfromoidlo' <TMPL_IF whocheck_openid>checked='checked'</TMPL_IF> /></td>
+            <td class="b-postform-data" class="b-postform-td">
+                <label for='talkpostfromoidlo' onclick='handleRadios(4);return false;' class="i-postform-label"><b>OpenID</b></label>
                 <TMPL_VAR ml_willscreen>
-                <p id="oid_more" class="i-bubble b-bubble-lite b-postform-openid"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><label for="openid:url"><TMPL_VAR expr="ml('/talkpost.bml.openid.identity.url')">&nbsp;</label><input class='textbox' name='openid:url' maxlength='60' size='42' id='openid:url' value='<TMPL_VAR openid_url_default>' /> <input type='hidden' name='oiddo_login' id='oidlogincheck' <TMPL_VAR oiddo_login_checked> /> <TMPL_VAR helpicon_openid></p>
+                <span id="oid_more" class="i-bubble b-bubble-lite b-postform-openid"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><label for="openid:url"><TMPL_VAR expr="ml('/talkpost.bml.openid.identity.url')">&nbsp;</label><input class='textbox' name='openid:url' maxlength='60' size='42' id='openid:url' value='<TMPL_VAR openid_url_default>' /> <input type='hidden' name='oiddo_login' id='oidlogincheck' <TMPL_VAR oiddo_login_checked> /> <TMPL_VAR helpicon_openid></span>
             </td>
             </tr>
         </TMPL_IF>
-s
     </TMPL_IF>
 </TMPL_IF>
 

Modified: trunk/templates/CommentForm/Author-User.tmpl
===================================================================
--- trunk/templates/CommentForm/Author-User.tmpl	2010-08-18 07:13:13 UTC (rev 17147)
+++ trunk/templates/CommentForm/Author-User.tmpl	2010-08-18 07:48:12 UTC (rev 17148)
@@ -2,9 +2,9 @@
     <tr valign='middle' id='<TMPL_VAR css_ljuser_row_id>'>
 
     <TMPL_IF remote_banned>
-        <td align='center'><img src='<TMPL_VAR lj_imgprefix>/userinfo.gif' /></td>
-        <td align='center'>( )</td>
-        <td align='left'>
+        <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/userinfo.gif' /></td>
+        <td class="b-postform-radio">( )</td>
+        <td class="b-postform-data">
             <span class='ljdeem'><TMPL_VAR ml_loggedin></font>
             <TMPL_VAR ml_banned>
 
@@ -16,11 +16,11 @@
             </script>
         </td>
     <TMPL_ELSE>
-        <td align='center'><img src='<TMPL_VAR lj_imgprefix>/userinfo.gif'  onclick='handleRadios(1);' /></td>
+        <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/userinfo.gif'  onclick='handleRadios(1);' /></td>
         <TMPL_IF remote_can_comment>
-            <td align='center'><input type='radio' name='usertype' value='cookieuser' id='talkpostfromremote' <TMPL_IF whocheck_remote>checked="checked"</TMPL_IF> /></td>
-            <td align='left'>
-                <label for='talkpostfromremote'><TMPL_VAR ml_loggedin></label>
+            <td class="b-postform-radio"><input type='radio' name='usertype' value='cookieuser' id='talkpostfromremote' <TMPL_IF whocheck_remote>checked="checked"</TMPL_IF> /></td>
+            <td class="b-postform-data">
+                <label for='talkpostfromremote' class="i-postform-label"><TMPL_VAR ml_loggedin></label>
 
                 <TMPL_IF 0> Don't worry about a real href since js hides the row anyway </TMPL_IF>
                 <script language='JavaScript'>
@@ -32,9 +32,9 @@
                 <TMPL_VAR ml_willscreen>
             </td>
         <TMPL_ELSE>
-            <td align='center'>( )</td>
-            <td align='left'>
-                <font color='#c0c0c0'><TMPL_VAR ml_loggedin></font>
+            <td class="b-postform-radio">( )</td>
+            <td class="b-postform-data">
+                <span class="i-postform-label i-postform-disabled"><TMPL_VAR ml_loggedin></span>
                 &nbsp;- <TMPL_VAR ml_notafriend>
                 <input type='hidden' name='cookieuser' value='<TMPL_VAR remote_username>' id='cookieuser' />
                 <TMPL_VAR ml_willscreen>
@@ -45,10 +45,10 @@
 </TMPL_IF>
 
 <tr valign='middle' id='otherljuser_row' name='otherljuser_row'>
-<td align='center'><img src='<TMPL_VAR lj_imgprefix>/pencil.gif' onclick='handleRadios(2);' /></td>
-<td align='center'><input type='radio' name='usertype' value='user' id='talkpostfromlj' <TMPL_IF whocheck_ljuser>checked="checked"</TMPL_IF> /></td>
-<td align='left'>
-    <b><label for='talkpostfromlj' onclick='handleRadios(2); return false;'><TMPL_VAR expr="ml('/talkpost.bml.opt.ljuser2')"></label></b>
+<td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/pencil.gif' onclick='handleRadios(2);' /></td>
+<td class="b-postform-radio"><input type='radio' name='usertype' value='user' id='talkpostfromlj' <TMPL_IF whocheck_ljuser>checked="checked"</TMPL_IF> /></td>
+<td class="b-postform-data">
+    <label for='talkpostfromlj' onclick='handleRadios(2); return false;' class="i-postform-label"><b><TMPL_VAR expr="ml('/talkpost.bml.opt.ljuser2')"></b></label>
     <TMPL_VAR ml_willscreen>
     <TMPL_VAR ml_willscreenfriend>
 </td>

Modified: trunk/templates/CommentForm/Form.tmpl
===================================================================
--- trunk/templates/CommentForm/Form.tmpl	2010-08-18 07:13:13 UTC (rev 17147)
+++ trunk/templates/CommentForm/Form.tmpl	2010-08-18 07:48:12 UTC (rev 17148)
@@ -22,7 +22,7 @@
 <tr>
     <td align='right' valign='top'><TMPL_VAR expr="ml('/talkpost.bml.opt.from')"></td>
     <td> <TMPL_IF 0> Internal for "From" options </TMPL_IF>
-        <table>
+        <table class="b-postform-from">
             <TMPL_IF editid>
                 <tr valign='middle' id='ljuser_row'>
                     <TMPL_IF remote_banned>
@@ -109,9 +109,7 @@
                 <TMPL_VAR helpicon_userpics>
             </TMPL_IF>
 
-            &nbsp;&nbsp;<label for='prop_opt_preformatted'><TMPL_VAR expr="ml('/talkpost.bml.opt.noautoformat')"></label>
-            <input type="checkbox" name="prop_opt_preformatted" id="prop_opt_preformatted" value="1" <TMPL_IF opt_preformatted_selected>checked="checked"</TMPL_IF>>
-            <TMPL_VAR helpicon_noautoformat>
+            &nbsp;&nbsp;<input type="checkbox" name="prop_opt_preformatted" id="prop_opt_preformatted" value="1"<TMPL_IF opt_preformatted_selected> checked="checked"</TMPL_IF> /><label for='prop_opt_preformatted'>&nbsp;<TMPL_VAR expr="ml('/talkpost.bml.opt.noautoformat')">&nbsp;</label><TMPL_VAR helpicon_noautoformat>
 
             <TMPL_IF show_quick_quote>
                 <script type='text/javascript' language='JavaScript'>

Modified: trunk/templates/Identity/Login-openid.tmpl
===================================================================
--- trunk/templates/Identity/Login-openid.tmpl	2010-08-18 07:13:13 UTC (rev 17147)
+++ trunk/templates/Identity/Login-openid.tmpl	2010-08-18 07:48:12 UTC (rev 17148)
@@ -1,3 +1,3 @@
 <p class="b-auth-desc"><TMPL_VAR expr="ml('.openid.desc')"></p>
 <p class="b-auth-openid-form"><label for=""><TMPL_VAR expr="ml('.openid.label.url')"></label> <input type="url" name="openid:url" id="" value="http://" class="b-auth-openid-input" /> <button type="submit"><TMPL_VAR expr="ml('.openid.btn.login')"></button></p>
-<TMPL_IF errors><TMPL_LOOP errors><p class="b-auth-error"><span class="i-message i-message-error"><?errorbar <TMPL_VAR error> errorbar?></span></p></TMPL_LOOP></TMPL_IF>
+<TMPL_IF errors><TMPL_LOOP errors><p class="b-auth-error"><span class="i-message i-message-error"><TMPL_VAR error></span></p></TMPL_LOOP></TMPL_IF>

Tags: livejournal, savintsev_egor, tmpl
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments