[ljcom] r9341: LJSUP-6473: Facebook

U   trunk/templates/CommentForm/Author-Facebook.tmpl
U   trunk/templates/Identity/FacebookInterstitial.tmpl
U   trunk/templates/Identity/Login-facebook.tmpl
U   trunk/templates/Settings/FacebookConnect.tmpl

Modified: trunk/templates/CommentForm/Author-Facebook.tmpl
===================================================================
--- trunk/templates/CommentForm/Author-Facebook.tmpl	2010-08-16 07:32:35 UTC (rev 9340)
+++ trunk/templates/CommentForm/Author-Facebook.tmpl	2010-08-16 08:10:36 UTC (rev 9341)
@@ -4,7 +4,7 @@
         <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(4);return false;'>Facebook identity:</label></b>
+            <b><label for='talkpostfromfb' onclick='handleRadios(3);return false;'>Facebook identity:</label></b>
             <strong><TMPL_VAR remote_display_name></strong>
             <TMPL_VAR ml_willscreen>
         </td>
@@ -13,20 +13,15 @@
         <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'>
+        <td align='left' class="b-postform-td">
             <b><label for='talkpostfromfblo' onclick='handleRadios(3);return false;'>Facebook</label></b>
             <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>
         </td>
         </tr>
     </TMPL_IF>
 
-    <tr valign='middle' align='left' id='fb_more'>
-    <td colspan='2'></td>
-    <td>
-        We will figure who you are
-    </td>
-    </tr>
 <TMPL_ELSIF registered_can_comment>
     <TMPL_IF is_trusted_identity>
         <tr valign='middle' id='fbli' name='fbli'>
@@ -38,7 +33,7 @@
             <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(4);return false;'>Facebook identity:</label></b>
+                <b><label for='talkpostfromfb' onclick='handleRadios(3);return false;'>Facebook identity:</label></b>
                 <strong><TMPL_VAR remote_display_name></strong>
                 <TMPL_VAR ml_willscreen>
             </td>
@@ -63,7 +58,7 @@
         <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(4);return false;'>Facebook identity:</label></b>
+                <b><label for='talkpostfromfb' onclick='handleRadios(3);return false;'>Facebook identity:</label></b>
                 <strong><TMPL_VAR remote_display_name></strong>
                 <TMPL_VAR ml_willscreen>
             </td>
@@ -82,18 +77,13 @@
         <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'>
+        <td align='left' class="b-postform-td">
             <b><label for='talkpostfromfblo' onclick='handleRadios(3);return false;'>Facebook</label></b>
             <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>
         </td>
         </tr>
     </TMPL_IF>
 
-    <tr valign='middle' align='left' id='fb_more'>
-    <td colspan='2'></td>
-    <td>
-        We will figure who you are
-    </td>
-    </tr>
 </TMPL_IF>

Modified: trunk/templates/Identity/FacebookInterstitial.tmpl
===================================================================
--- trunk/templates/Identity/FacebookInterstitial.tmpl	2010-08-16 07:32:35 UTC (rev 9340)
+++ trunk/templates/Identity/FacebookInterstitial.tmpl	2010-08-16 08:10:36 UTC (rev 9341)
@@ -1,28 +1,13 @@
-<div><TMPL_VAR ml_congrats></div>
-
-<TMPL_IF errors>
-    <TMPL_LOOP errors>
-        <?errorbar <TMPL_VAR error> errorbar?>
-    </TMPL_LOOP>
-</TMPL_IF>
-
-<div><TMPL_VAR expr="ml('.heading.subscribe')"></div>
-
+<h3><TMPL_VAR ml_congrats></h3>
+<TMPL_IF errors><TMPL_LOOP errors><p class="b-message b-message-error"><?errorbar <TMPL_VAR error> errorbar?></p></TMPL_LOOP></TMPL_IF>
+<p><TMPL_VAR expr="ml('.desc')"></p>
+<h4 class="b-fbinterstitial-question"><TMPL_VAR expr="ml('.heading.subscribe')"></h4>
 <form action="" method="post">
 <TMPL_VAR form_intro>
-
-<div>
-<input type="radio" name="subscribe" value="1" id="subscribe_yes" checked="checked">
-<label for="subscribe_yes"><TMPL_VAR expr="ml('.label.subscribe.yes')"></label>
-</div>
-
-<div>
-<input type="radio" name="subscribe" value="0" id="subscribe_no">
-<label for="subscribe_no"><TMPL_VAR expr="ml('.label.subscribe.no')"></label>
-</div>
-
-<div>
-<button type="submit"><TMPL_VAR expr="ml('.btn.proceed')"></button>
-</div>
-
+<ul class="b-fbinterstitial-form">
+    <li><input type="radio" name="subscribe" value="1" id="subscribe_yes" checked="checked"><label for="subscribe_yes"><TMPL_VAR expr="ml('.label.subscribe.yes')"></label></li>
+    <li><input type="radio" name="subscribe" value="0" id="subscribe_no"><label for="subscribe_no"><TMPL_VAR expr="ml('.label.subscribe.no')"></label></li>
+    <li class="b-fbinterstitial-submit"><button type="submit"><TMPL_VAR expr="ml('.btn.proceed')"></button></li>
+</ul>
 </form>
+

Modified: trunk/templates/Identity/Login-facebook.tmpl
===================================================================
--- trunk/templates/Identity/Login-facebook.tmpl	2010-08-16 07:32:35 UTC (rev 9340)
+++ trunk/templates/Identity/Login-facebook.tmpl	2010-08-16 08:10:36 UTC (rev 9341)
@@ -1,10 +1,3 @@
-<TMPL_IF errors>
-    <TMPL_LOOP errors>
-        <?errorbar <TMPL_VAR error> errorbar?>
-    </TMPL_LOOP>
-</TMPL_IF>
-
-<TMPL_IF 0>
-    See http://wiki.developers.facebook.com/index.php/Facebook_Connect_Login_Buttons for information about how to customize this button.
-</TMPL_IF>
-<button type="submit"><TMPL_VAR expr="ml('.facebook.btn.connect')"></button>
+<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>

Modified: trunk/templates/Settings/FacebookConnect.tmpl
===================================================================
--- trunk/templates/Settings/FacebookConnect.tmpl	2010-08-16 07:32:35 UTC (rev 9340)
+++ trunk/templates/Settings/FacebookConnect.tmpl	2010-08-16 08:10:36 UTC (rev 9341)
@@ -1,6 +1,6 @@
 <TMPL_IF connected>
     <p>
-        <img src="<TMPL_VAR lj_imgprefix>/facebook-profile.gif">
+        <img src="<TMPL_VAR lj_imgprefix>/facebook-profile.gif" class="i-setting-fbconnect-icon" />
         <strong><TMPL_VAR facebook_name></strong>
         <TMPL_UNLESS is_fb_identity>
             (<a href="<TMPL_VAR disconnect_link>"><TMPL_VAR expr="ml('setting.facebookconnect.link.remove')"></a>)