andy wrote in changelog

[ljcom] r9546: LJSUP-6880 (Checkbox "Publish my tweets ...

Committer: ailyin
LJSUP-6880 (Checkbox "Publish my tweets to my journal" should be disabled if the account is identity.)
U   trunk/templates/Settings/TwitterConnect.tmpl

Modified: trunk/templates/Settings/TwitterConnect.tmpl
===================================================================
--- trunk/templates/Settings/TwitterConnect.tmpl	2010-09-24 05:36:29 UTC (rev 9545)
+++ trunk/templates/Settings/TwitterConnect.tmpl	2010-09-24 06:15:14 UTC (rev 9546)
@@ -5,19 +5,12 @@
         (<a href="<TMPL_VAR disconnect_link>"><TMPL_VAR expr="ml('setting.twitterconnect.link.remove')"></a>)
     </p>
     <ul class="b-manage-connectopt">
+    <li <TMPL_UNLESS has_journal>class="disabled"</TMPL_UNLESS>>
+        <input type="checkbox" name="<TMPL_VAR form_field_prefix>digest" value="1" id="<TMPL_VAR form_field_prefix>digest"<TMPL_IF digest> checked="checked"</TMPL_IF> <TMPL_UNLESS has_journal>disabled="disabled"</TMPL_UNLESS> />
+        <label for="<TMPL_VAR form_field_prefix>digest"><TMPL_VAR expr="ml('setting.twitterconnect.option.digest2')"></label>
+    </li>
     <TMPL_IF is_identity>
         <li class="disabled">
-            <input type="checkbox" name="<TMPL_VAR form_field_prefix>digest" value="1" id="<TMPL_VAR form_field_prefix>digest" disabled="disabled" />
-            <label for="<TMPL_VAR form_field_prefix>digest"><TMPL_VAR expr="ml('setting.twitterconnect.option.digest2')"></label>
-        </li>
-    <TMPL_ELSE>
-        <li>
-            <input type="checkbox" name="<TMPL_VAR form_field_prefix>digest" value="1" id="<TMPL_VAR form_field_prefix>digest"<TMPL_IF digest> checked="checked"</TMPL_IF> />
-            <label for="<TMPL_VAR form_field_prefix>digest"><TMPL_VAR expr="ml('setting.twitterconnect.option.digest2')"></label>
-        </li>
-    </TMPL_IF>
-    <TMPL_IF is_identity>
-        <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" />
             <label for="<TMPL_VAR form_field_prefix>repost_entries"><TMPL_VAR expr="ml('setting.twitterconnect.option.entries_twitter')"></label>
         </li>
@@ -36,9 +29,7 @@
 <TMPL_ELSE>
     <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">
-        <TMPL_IF has_journal>
-            <li class="disabled"><input type="checkbox" name="<TMPL_VAR form_field_prefix>digest" value="1" id="<TMPL_VAR form_field_prefix>digest" disabled="disabled"<TMPL_IF digest> checked="checked"</TMPL_IF>>&nbsp;<label for="<TMPL_VAR form_field_prefix>digest"><TMPL_VAR expr="ml('setting.twitterconnect.option.digest2')"></label></li>
-        </TMPL_IF>
+        <li class="disabled"><input type="checkbox" name="<TMPL_VAR form_field_prefix>digest" value="1" id="<TMPL_VAR form_field_prefix>digest" disabled="disabled"<TMPL_IF digest> checked="checked"</TMPL_IF>>&nbsp;<label for="<TMPL_VAR form_field_prefix>digest"><TMPL_VAR expr="ml('setting.twitterconnect.option.digest2')"></label></li>
         <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>>&nbsp;<label for="<TMPL_VAR form_field_prefix>repost_entries"><TMPL_VAR expr="ml('setting.twitterconnect.option.entries_twitter')"></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>>&nbsp;<label for="<TMPL_VAR form_field_prefix>repost_comments"><TMPL_VAR expr="ml('setting.twitterconnect.option.comments_twitter')"></label></li>
     </ul>
andyljcomtmpl

LJ Video