Make expand entries in compact view after jumping to next/previous feed optional with a setting

2 files changed, 12 insertions, 1 deletions

diff --git a/templates/part.content.php b/templates/part.content.php
index c18069cde..3226dc839 100644
--- a/templates/part.content.php
+++ b/templates/part.content.php
@@ -5,7 +5,8 @@
      ng-class="{
         compact: Content.isCompactView(),
         'feed-view': Content.isFeed()
-    }">
+    }"
+    news-compact-expand="{{ Content.isCompactExpand() }}">
     <div class="pull-to-refresh" ng-class="{
         'show-pull-to-refresh': showPullToRefresh
     }">
diff --git a/templates/part.settings.php b/templates/part.settings.php
index ae7cdf772..6e35d944b 100644
--- a/templates/part.settings.php
+++ b/templates/part.settings.php
@@ -19,6 +19,16 @@
         </label>
     </p>
 
+    <p ng-click="Settings.toggleSetting('compactExpand')">
+        <label for="compactExpand">
+            <input type="checkbox"
+                   ng-checked="Settings.getSetting('compactExpand')"
+                   name="compactExpand">
+            <?php p($l->t('Automatically expand articles in compact ' .
+                          'after j/n/left was pressed')); ?>
+        </label>
+    </p>
+
     <p ng-click="Settings.toggleSetting('showAll')">
         <label for="showAll">
             <input type="checkbox" ng-checked="Settings.getSetting('showAll')"