From 51dbb966de66fea4409f0b750f24fb337054d6bf Mon Sep 17 00:00:00 2001
From: James Kiesel <james.kiesel@gmail.com>
Date: Thu, 26 May 2016 09:33:49 -0700
Subject: [PATCH] Don't display activity summary in two places (#4239)

* Don't display activity summary in two places

* Re-add tl0 user digest option
---
 .../discourse/templates/user/preferences.hbs          | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/user/preferences.hbs b/app/assets/javascripts/discourse/templates/user/preferences.hbs
index 9c14f6b4570..cb9b9e6c1f7 100644
--- a/app/assets/javascripts/discourse/templates/user/preferences.hbs
+++ b/app/assets/javascripts/discourse/templates/user/preferences.hbs
@@ -168,16 +168,6 @@
 
     <div class="control-group pref-email-settings">
       <label class="control-label">{{i18n 'user.email_settings'}}</label>
-      {{#if canReceiveDigest}}
-        {{preference-checkbox labelKey="user.email_digests.title" checked=model.user_option.email_digests}}
-        {{#if model.user_option.email_digests}}
-          <div class='controls controls-dropdown'>
-            {{combo-box valueAttribute="value" content=digestFrequencies value=model.user_option.digest_after_minutes}}
-          </div>
-          {{preference-checkbox labelKey="user.include_tl0_in_digests" checked=model.user_option.include_tl0_in_digests}}
-        {{/if}}
-      {{/if}}
-      <br/>
       <div class='controls controls-dropdown'>
         <label>{{i18n 'user.email_previous_replies.title'}}</label>
         {{combo-box valueAttribute="value" content=previousRepliesOptions value=model.user_option.email_previous_replies}}
@@ -205,6 +195,7 @@
           <div class='controls controls-dropdown'>
             {{combo-box valueAttribute="value" content=digestFrequencies value=model.user_option.digest_after_minutes}}
           </div>
+          {{preference-checkbox labelKey="user.include_tl0_in_digests" disabled=model.user_option.mailing_list_mode checked=model.user_option.include_tl0_in_digests}}
         {{/if}}
       {{/if}}
     </div>