New description for the option to reload the page only when on top.

diff --git a/mod/settings.php b/mod/settings.php
index a4145e48c430603cec558774addcf623d65cd8ca..ae4c36e0cc0be0e2df3778daeaff4916a1f51ad9 100644 (file)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -886,7 +886,7 @@ function settings_content(&$a) {
                        '$nosmile'      => array('nosmile', t("Don't show emoticons"), $nosmile, ''),
                        '$noinfo'       => array('noinfo', t("Don't show notices"), $noinfo, ''),
                        '$infinite_scroll'      => array('infinite_scroll', t("Infinite scroll"), $infinite_scroll, ''),
-                       '$no_auto_update'       => array('no_auto_update', t("Disable automatic network update"), $no_auto_update, ''),
+                       '$no_auto_update'       => array('no_auto_update', t("Automatic updates only at the top of the network page"), $no_auto_update, 'When disabled, the network page is updated all the time, which could be confusing while reading.'),
 
                        '$theme_config' => $theme_config,
                ));

diff --git a/view/templates/settings_display.tpl b/view/templates/settings_display.tpl
index ad7feae3cc98afd972f67ca4d78779a1b45dbeb7..baf18aff28d00af1725e13574091cd7c0dc5a1ce 100644 (file)
--- a/view/templates/settings_display.tpl
+++ b/view/templates/settings_display.tpl
@@ -13,10 +13,10 @@
 {{include file="field_themeselect.tpl" field=$mobile_theme}}
 {{include file="field_input.tpl" field=$itemspage_mobile_network}}
 {{include file="field_input.tpl" field=$ajaxint}}
+{{include file="field_checkbox.tpl" field=$no_auto_update}}
 {{include file="field_checkbox.tpl" field=$nosmile}}
 {{include file="field_checkbox.tpl" field=$noinfo}}
 {{include file="field_checkbox.tpl" field=$infinite_scroll}}
-{{include file="field_checkbox.tpl" field=$no_auto_update}}
 
 
 <div class="settings-submit-wrapper" >