Committer: esavintcev
LJSUP-6473: FacebookU trunk/templates/CommentForm/Author-Facebook.tmpl U trunk/templates/Identity/Login-facebook.tmpl U trunk/templates/Settings/FacebookConnect.tmpl U trunk/templates/Settings/TwitterConnect.tmpl
Modified: trunk/templates/CommentForm/Author-Facebook.tmpl =================================================================== --- trunk/templates/CommentForm/Author-Facebook.tmpl 2010-08-18 03:52:10 UTC (rev 9351) +++ trunk/templates/CommentForm/Author-Facebook.tmpl 2010-08-18 07:48:50 UTC (rev 9352) @@ -1,23 +1,23 @@ <TMPL_IF everyone_can_comment> <TMPL_IF is_identity> <tr valign='middle' id='fbli' name='fbli'> - <td align='center'><img src='<TMPL_VAR lj_imgprefix>/facebook-profile.gif' onclick='handleRadios(4);' /></td> - <td align='center'><input type='radio' name='usertype' value='facebook_cookie' id='talkpostfromfbli' <TMPL_IF whocheck_facebook_cookie>checked='checked'</TMPL_IF> /></td> - <td align='left'> - <b><label for='talkpostfromfb' onclick='handleRadios(3);return false;'>Facebook identity:</label></b> + <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/facebook-profile.gif' onclick='handleRadios(4);' /></td> + <td class="b-postform-radio"><input type='radio' name='usertype' value='facebook_cookie' id='talkpostfromfbli' <TMPL_IF whocheck_facebook_cookie>checked='checked'</TMPL_IF> /></td> + <td class="b-postform-data"> + <label for='talkpostfromfb' onclick='handleRadios(3);return false;' class="i-postform-label"><b>Facebook identity:</b></label> <strong><TMPL_VAR remote_display_name></strong> <TMPL_VAR ml_willscreen> </td> </tr> <TMPL_ELSE> <tr valign='middle' id='fblo' name='fblo'> - <td align='center'><img src='<TMPL_VAR lj_imgprefix>/facebook-profile.gif' onclick='handleRadios(3);' /></td> - <td align='center'><input type='radio' name='usertype' value='facebook' id='talkpostfromfblo' <TMPL_IF whocheck_facebook>checked='checked'</TMPL_IF> /></td> - <td align='left' class="b-postform-td"> - <b><label for='talkpostfromfblo' onclick='handleRadios(3);return false;'>Facebook</label></b> + <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/facebook-profile.gif' onclick='handleRadios(3);' /></td> + <td class="b-postform-radio"><input type='radio' name='usertype' value='facebook' id='talkpostfromfblo' <TMPL_IF whocheck_facebook>checked='checked'</TMPL_IF> /></td> + <td class="b-postform-data"> + <label for='talkpostfromfblo' onclick='handleRadios(3);return false;' class="i-postform-label"><b>Facebook</b></label> <TMPL_VAR helpicon_facebook> <TMPL_VAR ml_willscreen> - <p id="fb_more" class="i-bubble b-bubble-lite b-postform-fb"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.facebook.who.you.are')"></p> + <span id="fb_more" class="i-bubble b-bubble-lite b-postform-fb"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.facebook.who.you.are')"></span> </td> </tr> </TMPL_IF> @@ -26,14 +26,14 @@ <TMPL_IF is_trusted_identity> <tr valign='middle' id='fbli' name='fbli'> <TMPL_IF remote_banned> - <td align='center'><img src='<TMPL_VAR lj_imgprefix>/facebook-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>/facebook-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>/facebook-profile.gif' onclick='handleRadios(4);' /></td> - <td align='center'><input type='radio' name='usertype' value='facebook_cookie' id='talkpostfromfbli' <TMPL_IF whocheck_facebook_cookie>checked='checked'</TMPL_IF> /></td> - <td align='left'> - <b><label for='talkpostfromfb' onclick='handleRadios(3);return false;'>Facebook identity:</label></b> + <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/facebook-profile.gif' onclick='handleRadios(4);' /></td> + <td class="b-postform-radio"><input type='radio' name='usertype' value='facebook_cookie' id='talkpostfromfbli' <TMPL_IF whocheck_facebook_cookie>checked='checked'</TMPL_IF> /></td> + <td class="b-postform-data"> + <label for='talkpostfromfb' onclick='handleRadios(3);return false;' class="i-postform-label"><b>Facebook 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>/facebook-profile.gif' onclick='handleRadios(3);' /></td> - <td align='center'>( )</td> - <td align='left' colspan='2'> - <font color='#c0c0c0'><b>Facebook</b></font> + <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/facebook-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>Facebook</b></span> <TMPL_IF is_identity><TMPL_VAR ml_nofacebookpost></TMPL_IF> <TMPL_VAR helpicon_facebook> </td> @@ -53,19 +53,19 @@ <TMPL_ELSIF friends_can_comment> <TMPL_IF is_identity> <tr valign='middle' id='fbli' name='fbli'> - <td align='center'><img src='<TMPL_VAR lj_imgprefix>/facebook-profile.gif' onclick='handleRadios(4);' /></td> + <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/facebook-profile.gif' onclick='handleRadios(4);' /></td> <TMPL_IF remote_can_comment> - <td align='center'><input type='radio' name='usertype' value='facebook_cookie' id='talkpostfromfbli' <TMPL_IF whocheck_facebook_cookie>checked='checked'</TMPL_IF> /></td> - <td align='left'> - <b><label for='talkpostfromfb' onclick='handleRadios(3);return false;'>Facebook identity:</label></b> + <td class="b-postform-radio"><input type='radio' name='usertype' value='facebook_cookie' id='talkpostfromfbli' <TMPL_IF whocheck_facebook_cookie>checked='checked'</TMPL_IF> /></td> + <td class="b-postform-data"> + <label for='talkpostfromfb' onclick='handleRadios(3);return false;' class="i-postform-label"><b>Facebook identity:</b></label> <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'>Facebook identity:</font></b> + <td class="b-postform-radio">( )</td> + <td class="b-postform-data"> + <span class="i-postform-label i-postform-disabled"><b>Facebook identity:</b></span> <strong><TMPL_VAR remote_display_name></strong> <TMPL_VAR ml_notafriend> <TMPL_VAR ml_willscreen> @@ -75,13 +75,13 @@ </tr> <TMPL_ELSE> <tr valign='middle' id='fblo' name='fblo'> - <td align='center'><img src='<TMPL_VAR lj_imgprefix>/facebook-profile.gif' onclick='handleRadios(3);' /></td> - <td align='center'><input type='radio' name='usertype' value='facebook' id='talkpostfromfblo' <TMPL_IF whocheck_facebook>checked='checked'</TMPL_IF> /></td> - <td align='left' class="b-postform-td"> - <b><label for='talkpostfromfblo' onclick='handleRadios(3);return false;'>Facebook</label></b> + <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/facebook-profile.gif' onclick='handleRadios(3);' /></td> + <td class="b-postform-radio"><input type='radio' name='usertype' value='facebook' id='talkpostfromfblo' <TMPL_IF whocheck_facebook>checked='checked'</TMPL_IF> /></td> + <td class="b-postform-data"> + <label for='talkpostfromfblo' onclick='handleRadios(3);return false;' class="i-postform-label"><b>Facebook</b></label> <TMPL_VAR helpicon_facebook> <TMPL_VAR ml_willscreen> - <p id="fb_more" class="i-bubble b-bubble-lite b-postform-fb"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.facebook.who.you.are')"></p> + <span id="fb_more" class="i-bubble b-bubble-lite b-postform-fb"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.facebook.who.you.are')"></span> </td> </tr> </TMPL_IF> Modified: trunk/templates/Identity/Login-facebook.tmpl =================================================================== --- trunk/templates/Identity/Login-facebook.tmpl 2010-08-18 03:52:10 UTC (rev 9351) +++ trunk/templates/Identity/Login-facebook.tmpl 2010-08-18 07:48:50 UTC (rev 9352) @@ -1,3 +1,3 @@ <button type="submit" class="b-auth-fbconnect" title="<TMPL_VAR expr="ml('.facebook.btn.connect')">"><span><i></i><TMPL_VAR expr="ml('.facebook.btn.connect')"></span></button> <p class="b-auth-desc"><TMPL_VAR expr="ml('.facebook.desc')"></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> Modified: trunk/templates/Settings/FacebookConnect.tmpl =================================================================== --- trunk/templates/Settings/FacebookConnect.tmpl 2010-08-18 03:52:10 UTC (rev 9351) +++ trunk/templates/Settings/FacebookConnect.tmpl 2010-08-18 07:48:50 UTC (rev 9352) @@ -30,23 +30,10 @@ <p class="details"><TMPL_VAR expr="ml('setting.facebookconnect.note.connected')"></p> <TMPL_ELSE> - <p> - <input type="submit" name="<TMPL_VAR form_field_prefix>connect" value="<TMPL_VAR expr="ml('setting.facebookconnect.button.facebook_connect')">"> - </p> - - <p class="disabled"> - <input type="checkbox" name="<TMPL_VAR form_field_prefix>repost_entries" value="1" id="<TMPL_VAR form_field_prefix>repost_entries" disabled="disabled" - <TMPL_IF repost_entries>checked="checked"</TMPL_IF> - > - <label for="<TMPL_VAR form_field_prefix>repost_entries"><TMPL_VAR expr="ml('setting.facebookconnect.option.entries_facebook')"></label> - </p> - - <p class="disabled"> - <input type="checkbox" name="<TMPL_VAR form_field_prefix>repost_comments" value="1" id="<TMPL_VAR form_field_prefix>repost_comments" disabled="disabled" - <TMPL_IF repost_comments>checked="checked"</TMPL_IF> - > - <label for="<TMPL_VAR form_field_prefix>repost_comments"><TMPL_VAR expr="ml('setting.facebookconnect.option.comments_facebook')"></label> - </p> - + <p class="b-manage-connectbtn"><button type="submit" name="<TMPL_VAR form_field_prefix>connect" value="<TMPL_VAR expr="ml('setting.facebookconnect.button.facebook_connect')">" class="b-connectbtn b-connectbtn-facebook" title="<TMPL_VAR expr="ml('setting.facebookconnect.button.facebook_connect')">"><span><i></i><TMPL_VAR expr="ml('setting.facebookconnect.button.facebook_connect')"></span></button></p> + <ul class="b-manage-connectopt"> + <li class="disabled"><input type="checkbox" name="<TMPL_VAR form_field_prefix>repost_entries" value="1" id="<TMPL_VAR form_field_prefix>repost_entries" disabled="disabled"<TMPL_IF repost_entries> checked="checked"</TMPL_IF>> <label for="<TMPL_VAR form_field_prefix>repost_entries"><TMPL_VAR expr="ml('setting.facebookconnect.option.entries_facebook')"></label></li> + <li class="disabled"><input type="checkbox" name="<TMPL_VAR form_field_prefix>repost_comments" value="1" id="<TMPL_VAR form_field_prefix>repost_comments" disabled="disabled"<TMPL_IF repost_comments> checked="checked"</TMPL_IF>> <label for="<TMPL_VAR form_field_prefix>repost_comments"><TMPL_VAR expr="ml('setting.facebookconnect.option.comments_facebook')"></label></li> + </ul> <p class="details"><TMPL_VAR expr="ml('setting.facebookconnect.note.disconnected')"></p> </TMPL_IF> Modified: trunk/templates/Settings/TwitterConnect.tmpl =================================================================== --- trunk/templates/Settings/TwitterConnect.tmpl 2010-08-18 03:52:10 UTC (rev 9351) +++ trunk/templates/Settings/TwitterConnect.tmpl 2010-08-18 07:48:50 UTC (rev 9352) @@ -28,23 +28,10 @@ <p class="details"><TMPL_VAR expr="ml('setting.twitterconnect.note.connected')"></p> <TMPL_ELSE> - <p> - <input type="submit" name="<TMPL_VAR form_field_prefix>connect" value="<TMPL_VAR expr="ml('setting.twitterconnect.button.twitter_connect')">"> - </p> - - <p class="disabled"> - <input type="checkbox" name="<TMPL_VAR form_field_prefix>repost_entries" value="1" id="<TMPL_VAR form_field_prefix>repost_entries" disabled="disabled" - <TMPL_IF repost_entries>checked="checked"</TMPL_IF> - > - <label for="<TMPL_VAR form_field_prefix>repost_entries"><TMPL_VAR expr="ml('setting.twitterconnect.option.entries_twitter')"></label> - </p> - - <p class="disabled"> - <input type="checkbox" name="<TMPL_VAR form_field_prefix>repost_comments" value="1" id="<TMPL_VAR form_field_prefix>repost_comments" disabled="disabled" - <TMPL_IF repost_comments>checked="checked"</TMPL_IF> - > - <label for="<TMPL_VAR form_field_prefix>repost_comments"><TMPL_VAR expr="ml('setting.twitterconnect.option.comments_twitter')"></label> - </p> - + <p class="b-manage-connectbtn"><button type="submit" name="<TMPL_VAR form_field_prefix>connect" value="<TMPL_VAR expr="ml('setting.twitterconnect.button.twitter_connect')">" class="b-connectbtn b-connectbtn-twitter" title="<TMPL_VAR expr="ml('setting.twitterconnect.button.twitter_connect')">"><span><i></i><TMPL_VAR expr="ml('setting.twitterconnect.button.twitter_connect')"></span></button></p> + <ul class="b-manage-connectopt"> + <li class="disabled"><input type="checkbox" name="<TMPL_VAR form_field_prefix>repost_entries" value="1" id="<TMPL_VAR form_field_prefix>repost_entries" disabled="disabled"<TMPL_IF repost_entries> checked="checked"</TMPL_IF>> <label for="<TMPL_VAR form_field_prefix>repost_entries"><TMPL_VAR expr="ml('setting.twitterconnect.option.entries_twitter')"></label></p> + <li class="disabled"><input type="checkbox" name="<TMPL_VAR form_field_prefix>repost_comments" value="1" id="<TMPL_VAR form_field_prefix>repost_comments" disabled="disabled"<TMPL_IF repost_comments> checked="checked"</TMPL_IF>> <label for="<TMPL_VAR form_field_prefix>repost_comments"><TMPL_VAR expr="ml('setting.twitterconnect.option.comments_twitter')"></label></li> + </ul> <p class="details"><TMPL_VAR expr="ml('setting.twitterconnect.note.disconnected')"></p> </TMPL_IF>