Issue 12771: Fix interrupted video playback

diff --git a/src/App/Page.php b/src/App/Page.php
index 6937a6924059936e4fe5c1660d5e62177c809edd..c4efb197cc470a4164f31ec6a750642f29ecc66d 100644 (file)
--- a/src/App/Page.php
+++ b/src/App/Page.php
@@ -196,17 +196,6 @@ class Page implements ArrayAccess
                IManagePersonalConfigValues $pConfig,
                int $localUID
        ) {
-               $interval = ($localUID ? $pConfig->get($localUID, 'system', 'update_interval') : 40000);
-
-               // If the update is 'deactivated' set it to the highest integer number (~24 days)
-               if ($interval < 0) {
-                       $interval = 2147483647;
-               }
-
-               if ($interval < 10000) {
-                       $interval = 40000;
-               }
-
                // Default title: current module called
                if (empty($this->page['title']) && $args->getModuleName()) {
                        $this->page['title'] = ucfirst($args->getModuleName());
@@ -274,7 +263,7 @@ class Page implements ArrayAccess
 
                        '$local_user'      => $localUID,
                        '$generator'       => 'Friendica' . ' ' . App::VERSION,
-                       '$update_interval' => $interval,
+                       '$update_content'  => (int)$pConfig->get($localUID, 'system', 'update_content'),
                        '$shortcut_icon'   => $shortcut_icon,
                        '$touch_icon'      => $touch_icon,
                        '$block_public'    => intval($config->get('system', 'block_public')),

diff --git a/src/Module/Settings/Display.php b/src/Module/Settings/Display.php
index 9a936c3d92056f59f40b60298d9c19afec77842c..97c163cea681c983fd279ece3cf48681a8056180 100644 (file)
--- a/src/Module/Settings/Display.php
+++ b/src/Module/Settings/Display.php
@@ -103,13 +103,7 @@ class Display extends BaseSettings
                $show_page_drop          = (bool)$request['show_page_drop'];
                $display_eventlist       = (bool)$request['display_eventlist'];
                $preview_mode            = (int)$request['preview_mode'];
-               $browser_update          = (int)$request['browser_update'];
-               if ($browser_update != -1) {
-                       $browser_update = $browser_update * 1000;
-                       if ($browser_update < 10000) {
-                               $browser_update = 10000;
-                       }
-               }
+               $update_content          = (int)$request['update_content'];
 
                $enabled_timelines = [];
                foreach ($enable as $code => $enabled) {
@@ -144,7 +138,7 @@ class Display extends BaseSettings
 
                $this->pConfig->set($uid, 'system', 'itemspage_network', $itemspage_network);
                $this->pConfig->set($uid, 'system', 'itemspage_mobile_network', $itemspage_mobile_network);
-               $this->pConfig->set($uid, 'system', 'update_interval', $browser_update);
+               $this->pConfig->set($uid, 'system', 'update_content', $update_content);
                $this->pConfig->set($uid, 'system', 'no_smilies', !$enable_smile);
                $this->pConfig->set($uid, 'system', 'infinite_scroll', $infinite_scroll);
                $this->pConfig->set($uid, 'system', 'no_smart_threading', !$enable_smart_threading);
@@ -238,11 +232,7 @@ class Display extends BaseSettings
                $itemspage_mobile_network = intval($this->pConfig->get($uid, 'system', 'itemspage_mobile_network'));
                $itemspage_mobile_network = (($itemspage_mobile_network > 0 && $itemspage_mobile_network < 101) ? $itemspage_mobile_network : $this->config->get('system', 'itemspage_network_mobile'));
 
-               $browser_update = intval($this->pConfig->get($uid, 'system', 'update_interval'));
-               if ($browser_update != -1) {
-                       $browser_update = (($browser_update == 0) ? 40 : $browser_update / 1000); // default if not set: 40 seconds
-               }
-
+               $update_content         = $this->pConfig->get($uid, 'system', 'update_content') ?? false;
                $enable_smile           = !$this->pConfig->get($uid, 'system', 'no_smilies', false);
                $infinite_scroll        = $this->pConfig->get($uid, 'system', 'infinite_scroll', false);
                $enable_smart_threading = !$this->pConfig->get($uid, 'system', 'no_smart_threading', false);
@@ -332,7 +322,7 @@ class Display extends BaseSettings
 
                        '$itemspage_network'        => ['itemspage_network', $this->t('Number of items to display per page:'), $itemspage_network, $this->t('Maximum of 100 items')],
                        '$itemspage_mobile_network' => ['itemspage_mobile_network', $this->t('Number of items to display per page when viewed from mobile device:'), $itemspage_mobile_network, $this->t('Maximum of 100 items')],
-                       '$ajaxint'                  => ['browser_update', $this->t('Update browser every xx seconds'), $browser_update, $this->t('Minimum of 10 seconds. Enter -1 to disable it.')],
+                       '$update_content'           => ['update_content', $this->t('Regularly update the page content'), $update_content, $this->t('When enabled, new content on network, community and channels are added on top.')],
                        '$enable_smile'             => ['enable_smile', $this->t('Display emoticons'), $enable_smile, $this->t('When enabled, emoticons are replaced with matching symbols.')],
                        '$infinite_scroll'          => ['infinite_scroll', $this->t('Infinite scroll'), $infinite_scroll, $this->t('Automatic fetch new items when reaching the page end.')],
                        '$enable_smart_threading'   => ['enable_smart_threading', $this->t('Enable Smart Threading'), $enable_smart_threading, $this->t('Enable the automatic suppression of extraneous thread indentation.')],

diff --git a/src/Module/Update/Display.php b/src/Module/Update/Display.php
index 657a70ac13183003fa2b0aef586f14536ecb4963..90e057c0f817e172f0d47197a636ce3a62f407c5 100644 (file)
--- a/src/Module/Update/Display.php
+++ b/src/Module/Update/Display.php
@@ -45,9 +45,8 @@ class Display extends DisplayModule
                $parentUriId = $item['parent-uri-id'];
 
                if (empty($force)) {
-                       $browserUpdate = intval($this->pConfig->get($profileUid, 'system', 'update_interval') ?? 40000);
-                       if ($browserUpdate >= 1000) {
-                               $updateDate = date(DateTimeFormat::MYSQL, time() - ($browserUpdate * 2 / 1000));
+                       if ($this->pConfig->get($profileUid, 'system', 'update_content')) {
+                               $updateDate = date(DateTimeFormat::MYSQL, time() - 120);
                                if (!Post::exists([
                                        "`parent-uri-id` = ? AND `uid` IN (?, ?) AND `received` > ?",
                                        $parentUriId, 0,

diff --git a/view/js/main.js b/view/js/main.js
index 76c105a005637d344c0f55098700ffcc9062ac17..3d488b4029f324eed9abc1a032c1149a90439fae 100644 (file)
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -501,12 +501,14 @@ function NavUpdate() {
 
                                // start live update
                                ['network', 'profile', 'channel', 'community', 'notes', 'display', 'contact'].forEach(function (src) {
-                                       if ($('#live-' + src).length) {
+                                       if ($('#live-' + src).length && (force_update || (updateContent && ['network', 'channel', 'community'].includes(src)))) {
                                                liveUpdate(src);
                                        }
                                });
 
-                               if (!$('#live-network').length) {
+                               if ($('#live-network').length) {
+                                       networkUpdate();
+                               } else {
                                        var update_url = 'ping_network?ping=1';
                                        $.get(update_url, function(net) {
                                                updateCounter('net', net);
@@ -522,7 +524,7 @@ function NavUpdate() {
                        }
                });
        }
-       timer = setTimeout(NavUpdate, updateInterval);
+       timer = setTimeout(NavUpdate, 30000);
 }
 
 function updateConvItems(data) {
@@ -568,38 +570,14 @@ function updateConvItems(data) {
        }
 }
 
-function liveUpdate(src) {
-       if ((src == null) || stopped || !profile_uid) {
-               $('.like-rotator').hide(); return;
-       }
-
-       if (($('.comment-edit-text-full').length) || in_progress) {
-               if (livetime) {
-                       clearTimeout(livetime);
-               }
-               livetime = setTimeout(function() {liveUpdate(src)}, 5000);
-               return;
-       }
-
-       if (livetime != null) {
-               livetime = null;
-       }
-       prev = 'live-' + src;
-
-       in_progress = true;
-
+function getUpdateUrl(src)
+{
        let force = force_update || $(document).scrollTop() === 0;
 
-       var orgHeight = $("section").height();
-
        var udargs = ((netargs.length) ? '/' + netargs : '');
 
        var update_url = src + udargs + '&p=' + profile_uid + '&force=' + (force ? 1 : 0) + '&item=' + update_item;
 
-       if (force_update) {
-               force_update = false;
-       }
-
        if (getUrlParameter('page')) {
                update_url += '&page=' + getUrlParameter('page');
        }
@@ -629,8 +607,36 @@ function liveUpdate(src) {
        if (match.length > 0) {
                update_url += '&first_uriid=' + match[0].innerHTML;
        }
+       return update_url;
+}
 
-       $.get('update_' + update_url, function(data) {
+function liveUpdate(src) {
+       if ((src == null) || stopped || !profile_uid) {
+               $('.like-rotator').hide(); return;
+       }
+
+       if (($('.comment-edit-text-full').length) || in_progress) {
+               if (livetime) {
+                       clearTimeout(livetime);
+               }
+               livetime = setTimeout(function() {liveUpdate(src)}, 5000);
+               return;
+       }
+
+       if (livetime != null) {
+               livetime = null;
+       }
+       prev = 'live-' + src;
+
+       in_progress = true;
+
+       var orgHeight = $("section").height();
+
+       if (force_update) {
+               force_update = false;
+       }
+
+       $.get('update_' + getUpdateUrl(src), function(data) {
                in_progress = false;
                update_item = 0;
 
@@ -647,12 +653,12 @@ function liveUpdate(src) {
                        $(window).scrollTop($(window).scrollTop() + $("section").height() - orgHeight);
                });
        });
+}
 
-       if (src == 'network') {
-               $.get('ping_' + update_url, function(net) {
-                       updateCounter('net', net);
-               });
-       }
+function networkUpdate() {
+       $.get('ping_' + getUpdateUrl('network'), function(net) {
+               updateCounter('net', net);
+       });
 }
 
 function updateCounter(type, counter) {

diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po
index 3cfb90c7310426485fd31c5e3f7653a370426bad..b89c94b99358b6cbed4d378eb7a60c9a9a888f03 100644 (file)
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2025.02-dev\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-02-05 22:44+0000\n"
+"POT-Creation-Date: 2025-02-09 20:13+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -70,7 +70,7 @@ msgstr ""
 #: src/Module/Settings/ContactImport.php:49
 #: src/Module/Settings/ContactImport.php:96
 #: src/Module/Settings/Delegation.php:76 src/Module/Settings/Display.php:80
-#: src/Module/Settings/Display.php:194
+#: src/Module/Settings/Display.php:188
 #: src/Module/Settings/Profile/Photo/Crop.php:148
 #: src/Module/Settings/Profile/Photo/Index.php:96
 #: src/Module/Settings/RemoveMe.php:103 src/Module/Settings/UserExport.php:64
@@ -285,7 +285,7 @@ msgstr ""
 #: mod/message.php:188 mod/message.php:344 mod/photos.php:1252
 #: src/Content/Conversation.php:389 src/Content/Conversation.php:1565
 #: src/Module/Item/Compose.php:202 src/Module/Post/Edit.php:136
-#: src/Object/Post.php:607
+#: src/Object/Post.php:608
 msgid "Please wait"
 msgstr ""
 
@@ -307,7 +307,7 @@ msgstr ""
 #: src/Module/Moderation/Report/Create.php:249
 #: src/Module/Profile/Profile.php:265 src/Module/Settings/Profile/Index.php:248
 #: src/Module/Settings/Server/Action.php:65 src/Module/User/Delegation.php:177
-#: src/Object/Post.php:1148 view/theme/duepuntozero/config.php:73
+#: src/Object/Post.php:1149 view/theme/duepuntozero/config.php:73
 #: view/theme/frio/config.php:155 view/theme/quattro/config.php:75
 #: view/theme/vier/config.php:123
 msgid "Submit"
@@ -590,25 +590,25 @@ msgstr ""
 
 #: mod/photos.php:1090 mod/photos.php:1146 mod/photos.php:1226
 #: src/Module/Contact.php:599 src/Module/Item/Compose.php:184
-#: src/Object/Post.php:1145
+#: src/Object/Post.php:1146
 msgid "This is you"
 msgstr ""
 
 #: mod/photos.php:1092 mod/photos.php:1148 mod/photos.php:1228
-#: src/Module/Moderation/Reports.php:105 src/Object/Post.php:601
-#: src/Object/Post.php:1147
+#: src/Module/Moderation/Reports.php:105 src/Object/Post.php:602
+#: src/Object/Post.php:1148
 msgid "Comment"
 msgstr ""
 
 #: mod/photos.php:1094 mod/photos.php:1150 mod/photos.php:1230
 #: src/Content/Conversation.php:403 src/Module/Calendar/Event/Form.php:234
 #: src/Module/Item/Compose.php:197 src/Module/Post/Edit.php:156
-#: src/Object/Post.php:1161
+#: src/Object/Post.php:1162
 msgid "Preview"
 msgstr ""
 
 #: mod/photos.php:1095 src/Content/Conversation.php:357
-#: src/Module/Post/Edit.php:121 src/Object/Post.php:1149
+#: src/Module/Post/Edit.php:121 src/Object/Post.php:1150
 msgid "Loading..."
 msgstr ""
 
@@ -650,104 +650,104 @@ msgstr ""
 msgid "Apologies but the website is unavailable at the moment."
 msgstr ""
 
-#: src/App/Page.php:247
+#: src/App/Page.php:236
 msgid "Delete this item?"
 msgstr ""
 
-#: src/App/Page.php:248
+#: src/App/Page.php:237
 msgid "Block this author? They won't be able to follow you nor see your public posts, and you won't be able to see their posts and their notifications."
 msgstr ""
 
-#: src/App/Page.php:249
+#: src/App/Page.php:238
 msgid "Ignore this author? You won't be able to see their posts and their notifications."
 msgstr ""
 
-#: src/App/Page.php:250
+#: src/App/Page.php:239
 msgid "Collapse this author's posts?"
 msgstr ""
 
-#: src/App/Page.php:251
+#: src/App/Page.php:240
 msgid "Ignore this author's server?"
 msgstr ""
 
-#: src/App/Page.php:252 src/Module/Settings/Server/Action.php:47
+#: src/App/Page.php:241 src/Module/Settings/Server/Action.php:47
 #: src/Module/Settings/Server/Index.php:94
 msgid "You won't see any content from this server including reshares in your Network page, the community pages and individual conversations."
 msgstr ""
 
-#: src/App/Page.php:254
+#: src/App/Page.php:243
 msgid "Like not successful"
 msgstr ""
 
-#: src/App/Page.php:255
+#: src/App/Page.php:244
 msgid "Dislike not successful"
 msgstr ""
 
-#: src/App/Page.php:256
+#: src/App/Page.php:245
 msgid "Sharing not successful"
 msgstr ""
 
-#: src/App/Page.php:257
+#: src/App/Page.php:246
 msgid "Attendance unsuccessful"
 msgstr ""
 
-#: src/App/Page.php:258
+#: src/App/Page.php:247
 msgid "Backend error"
 msgstr ""
 
-#: src/App/Page.php:259
+#: src/App/Page.php:248
 msgid "Network error"
 msgstr ""
 
-#: src/App/Page.php:262
+#: src/App/Page.php:251
 msgid "Drop files here to upload"
 msgstr ""
 
-#: src/App/Page.php:263
+#: src/App/Page.php:252
 msgid "Your browser does not support drag and drop file uploads."
 msgstr ""
 
-#: src/App/Page.php:264
+#: src/App/Page.php:253
 msgid "Please use the fallback form below to upload your files like in the olden days."
 msgstr ""
 
-#: src/App/Page.php:265
+#: src/App/Page.php:254
 msgid "File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB."
 msgstr ""
 
-#: src/App/Page.php:266
+#: src/App/Page.php:255
 msgid "You can't upload files of this type."
 msgstr ""
 
-#: src/App/Page.php:267
+#: src/App/Page.php:256
 msgid "Server responded with {{statusCode}} code."
 msgstr ""
 
-#: src/App/Page.php:268
+#: src/App/Page.php:257
 msgid "Cancel upload"
 msgstr ""
 
-#: src/App/Page.php:269
+#: src/App/Page.php:258
 msgid "Upload canceled."
 msgstr ""
 
-#: src/App/Page.php:270
+#: src/App/Page.php:259
 msgid "Are you sure you want to cancel this upload?"
 msgstr ""
 
-#: src/App/Page.php:271
+#: src/App/Page.php:260
 msgid "Remove file"
 msgstr ""
 
-#: src/App/Page.php:272
+#: src/App/Page.php:261
 msgid "You can't upload any more files."
 msgstr ""
 
-#: src/App/Page.php:356
+#: src/App/Page.php:345
 msgid "toggle mobile"
 msgstr ""
 
-#: src/App/Page.php:367 src/Module/Admin/Logs/View.php:92
+#: src/App/Page.php:356 src/Module/Admin/Logs/View.php:92
 #: view/theme/frio/php/minimal.php:39 view/theme/frio/php/standard.php:138
 msgid "Close"
 msgstr ""
@@ -1235,7 +1235,7 @@ msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
 #: src/Content/Conversation.php:327 src/Module/Item/Compose.php:196
-#: src/Object/Post.php:1160
+#: src/Object/Post.php:1161
 msgid "Please enter a image/video/audio/webpage URL:"
 msgstr ""
 
@@ -1280,52 +1280,52 @@ msgid "attach file"
 msgstr ""
 
 #: src/Content/Conversation.php:362 src/Module/Item/Compose.php:186
-#: src/Module/Post/Edit.php:162 src/Object/Post.php:1150
+#: src/Module/Post/Edit.php:162 src/Object/Post.php:1151
 msgid "Bold"
 msgstr ""
 
 #: src/Content/Conversation.php:363 src/Module/Item/Compose.php:187
-#: src/Module/Post/Edit.php:163 src/Object/Post.php:1151
+#: src/Module/Post/Edit.php:163 src/Object/Post.php:1152
 msgid "Italic"
 msgstr ""
 
 #: src/Content/Conversation.php:364 src/Module/Item/Compose.php:188
-#: src/Module/Post/Edit.php:164 src/Object/Post.php:1152
+#: src/Module/Post/Edit.php:164 src/Object/Post.php:1153
 msgid "Underline"
 msgstr ""
 
 #: src/Content/Conversation.php:365 src/Module/Item/Compose.php:189
-#: src/Module/Post/Edit.php:165 src/Object/Post.php:1154
+#: src/Module/Post/Edit.php:165 src/Object/Post.php:1155
 msgid "Quote"
 msgstr ""
 
 #: src/Content/Conversation.php:366 src/Module/Item/Compose.php:190
-#: src/Module/Post/Edit.php:166 src/Object/Post.php:1155
+#: src/Module/Post/Edit.php:166 src/Object/Post.php:1156
 msgid "Add emojis"
 msgstr ""
 
 #: src/Content/Conversation.php:367 src/Module/Item/Compose.php:191
-#: src/Object/Post.php:1153
+#: src/Object/Post.php:1154
 msgid "Content Warning"
 msgstr ""
 
 #: src/Content/Conversation.php:368 src/Module/Item/Compose.php:192
-#: src/Module/Post/Edit.php:167 src/Object/Post.php:1156
+#: src/Module/Post/Edit.php:167 src/Object/Post.php:1157
 msgid "Code"
 msgstr ""
 
 #: src/Content/Conversation.php:369 src/Module/Item/Compose.php:193
-#: src/Object/Post.php:1157
+#: src/Object/Post.php:1158
 msgid "Image"
 msgstr ""
 
 #: src/Content/Conversation.php:370 src/Module/Item/Compose.php:194
-#: src/Module/Post/Edit.php:168 src/Object/Post.php:1158
+#: src/Module/Post/Edit.php:168 src/Object/Post.php:1159
 msgid "Link"
 msgstr ""
 
 #: src/Content/Conversation.php:371 src/Module/Item/Compose.php:195
-#: src/Module/Post/Edit.php:169 src/Object/Post.php:1159
+#: src/Module/Post/Edit.php:169 src/Object/Post.php:1160
 msgid "Link or Media"
 msgstr ""
 
@@ -1499,7 +1499,7 @@ msgstr ""
 msgid "Filed under:"
 msgstr ""
 
-#: src/Content/Conversation.php:1547 src/Object/Post.php:558
+#: src/Content/Conversation.php:1547 src/Object/Post.php:559
 #, php-format
 msgid "%s from %s"
 msgstr ""
@@ -1748,7 +1748,7 @@ msgstr ""
 
 #: src/Content/Feature.php:131 src/Content/Widget.php:610
 #: src/Module/Admin/Site.php:463 src/Module/BaseSettings.php:113
-#: src/Module/Settings/Channels.php:211 src/Module/Settings/Display.php:323
+#: src/Module/Settings/Channels.php:211 src/Module/Settings/Display.php:313
 msgid "Channels"
 msgstr ""
 
@@ -1918,7 +1918,7 @@ msgstr ""
 msgid "Languages"
 msgstr ""
 
-#: src/Content/Item.php:435 src/Object/Post.php:585
+#: src/Content/Item.php:435 src/Object/Post.php:586
 msgid "Search Text"
 msgstr ""
 
@@ -2011,7 +2011,7 @@ msgstr ""
 #: src/Content/Nav.php:229 src/Content/Nav.php:289
 #: src/Module/BaseProfile.php:70 src/Module/BaseProfile.php:73
 #: src/Module/BaseProfile.php:81 src/Module/BaseProfile.php:84
-#: src/Module/Settings/Display.php:324 view/theme/frio/theme.php:225
+#: src/Module/Settings/Display.php:314 view/theme/frio/theme.php:225
 #: view/theme/frio/theme.php:229
 msgid "Calendar"
 msgstr ""
@@ -2846,37 +2846,37 @@ msgid "%s (%s)"
 msgstr ""
 
 #: src/Core/L10n.php:481 src/Model/Event.php:416
-#: src/Module/Settings/Display.php:292
+#: src/Module/Settings/Display.php:282
 msgid "Monday"
 msgstr ""
 
 #: src/Core/L10n.php:481 src/Model/Event.php:417
-#: src/Module/Settings/Display.php:293
+#: src/Module/Settings/Display.php:283
 msgid "Tuesday"
 msgstr ""
 
 #: src/Core/L10n.php:481 src/Model/Event.php:418
-#: src/Module/Settings/Display.php:294
+#: src/Module/Settings/Display.php:284
 msgid "Wednesday"
 msgstr ""
 
 #: src/Core/L10n.php:481 src/Model/Event.php:419
-#: src/Module/Settings/Display.php:295
+#: src/Module/Settings/Display.php:285
 msgid "Thursday"
 msgstr ""
 
 #: src/Core/L10n.php:481 src/Model/Event.php:420
-#: src/Module/Settings/Display.php:296
+#: src/Module/Settings/Display.php:286
 msgid "Friday"
 msgstr ""
 
 #: src/Core/L10n.php:481 src/Model/Event.php:421
-#: src/Module/Settings/Display.php:297
+#: src/Module/Settings/Display.php:287
 msgid "Saturday"
 msgstr ""
 
 #: src/Core/L10n.php:481 src/Model/Event.php:415
-#: src/Module/Settings/Display.php:291
+#: src/Module/Settings/Display.php:281
 msgid "Sunday"
 msgstr ""
 
@@ -3305,17 +3305,17 @@ msgid "today"
 msgstr ""
 
 #: src/Model/Event.php:449 src/Module/Calendar/Show.php:117
-#: src/Module/Settings/Display.php:302 src/Util/Temporal.php:343
+#: src/Module/Settings/Display.php:292 src/Util/Temporal.php:343
 msgid "month"
 msgstr ""
 
 #: src/Model/Event.php:450 src/Module/Calendar/Show.php:118
-#: src/Module/Settings/Display.php:303 src/Util/Temporal.php:344
+#: src/Module/Settings/Display.php:293 src/Util/Temporal.php:344
 msgid "week"
 msgstr ""
 
 #: src/Model/Event.php:451 src/Module/Calendar/Show.php:119
-#: src/Module/Settings/Display.php:304 src/Util/Temporal.php:345
+#: src/Module/Settings/Display.php:294 src/Util/Temporal.php:345
 msgid "day"
 msgstr ""
 
@@ -3880,7 +3880,7 @@ msgid "Disable"
 msgstr ""
 
 #: src/Module/Admin/Addons/Details.php:75
-#: src/Module/Admin/Themes/Details.php:41 src/Module/Settings/Display.php:351
+#: src/Module/Admin/Themes/Details.php:41 src/Module/Settings/Display.php:341
 msgid "Enable"
 msgstr ""
 
@@ -3931,7 +3931,7 @@ msgstr ""
 #: src/Module/Settings/Connectors.php:143
 #: src/Module/Settings/Connectors.php:228
 #: src/Module/Settings/ContactImport.php:110
-#: src/Module/Settings/Delegation.php:179 src/Module/Settings/Display.php:317
+#: src/Module/Settings/Delegation.php:179 src/Module/Settings/Display.php:307
 #: src/Module/Settings/Features.php:61
 msgid "Save Settings"
 msgstr ""
@@ -4282,11 +4282,11 @@ msgstr ""
 msgid "%s is no valid input for maximum image size"
 msgstr ""
 
-#: src/Module/Admin/Site.php:361 src/Module/Settings/Display.php:212
+#: src/Module/Admin/Site.php:361 src/Module/Settings/Display.php:206
 msgid "No special theme for mobile devices"
 msgstr ""
 
-#: src/Module/Admin/Site.php:378 src/Module/Settings/Display.php:222
+#: src/Module/Admin/Site.php:378 src/Module/Settings/Display.php:216
 #, php-format
 msgid "%s - (Experimental)"
 msgstr ""
@@ -5189,7 +5189,7 @@ msgid "Can be \"all\" or \"tags\". \"all\" means that every public post should b
 msgstr ""
 
 #: src/Module/Admin/Site.php:584 src/Module/Contact/Profile.php:315
-#: src/Module/Settings/Display.php:259
+#: src/Module/Settings/Display.php:249
 #: src/Module/Settings/TwoFactor/Index.php:132
 msgid "Disabled"
 msgstr ""
@@ -5745,7 +5745,7 @@ msgstr ""
 #: src/Module/Contact.php:537 src/Module/Conversation/Channel.php:98
 #: src/Module/Conversation/Community.php:91
 #: src/Module/Conversation/Network.php:295
-#: src/Module/Moderation/BaseUsers.php:102 src/Object/Post.php:605
+#: src/Module/Moderation/BaseUsers.php:102 src/Object/Post.php:606
 msgid "More"
 msgstr ""
 
@@ -5928,7 +5928,7 @@ msgstr ""
 msgid "Create New Event"
 msgstr ""
 
-#: src/Module/Calendar/Show.php:120 src/Module/Settings/Display.php:305
+#: src/Module/Calendar/Show.php:120 src/Module/Settings/Display.php:295
 msgid "list"
 msgstr ""
 
@@ -9556,12 +9556,12 @@ msgid "When selected, the channel results are reshared. This only works for publ
 msgstr ""
 
 #: src/Module/Settings/Channels.php:176 src/Module/Settings/Channels.php:197
-#: src/Module/Settings/Display.php:349
+#: src/Module/Settings/Display.php:339
 msgid "Label"
 msgstr ""
 
 #: src/Module/Settings/Channels.php:177 src/Module/Settings/Channels.php:198
-#: src/Module/Settings/Display.php:350
+#: src/Module/Settings/Display.php:340
 #: src/Module/Settings/TwoFactor/AppSpecific.php:123
 msgid "Description"
 msgstr ""
@@ -9940,218 +9940,218 @@ msgstr ""
 msgid "No entries."
 msgstr ""
 
-#: src/Module/Settings/Display.php:180
+#: src/Module/Settings/Display.php:174
 msgid "The theme you chose isn't available."
 msgstr ""
 
-#: src/Module/Settings/Display.php:220
+#: src/Module/Settings/Display.php:214
 #, php-format
 msgid "%s - (Unsupported)"
 msgstr ""
 
-#: src/Module/Settings/Display.php:260
+#: src/Module/Settings/Display.php:250
 msgid "Color/Black"
 msgstr ""
 
-#: src/Module/Settings/Display.php:261 view/theme/frio/php/scheme.php:95
+#: src/Module/Settings/Display.php:251 view/theme/frio/php/scheme.php:95
 msgid "Black"
 msgstr ""
 
-#: src/Module/Settings/Display.php:262
+#: src/Module/Settings/Display.php:252
 msgid "Color/White"
 msgstr ""
 
-#: src/Module/Settings/Display.php:263
+#: src/Module/Settings/Display.php:253
 msgid "White"
 msgstr ""
 
-#: src/Module/Settings/Display.php:268
+#: src/Module/Settings/Display.php:258
 msgid "No preview"
 msgstr ""
 
-#: src/Module/Settings/Display.php:269
+#: src/Module/Settings/Display.php:259
 msgid "No image"
 msgstr ""
 
-#: src/Module/Settings/Display.php:270
+#: src/Module/Settings/Display.php:260
 msgid "Small Image"
 msgstr ""
 
-#: src/Module/Settings/Display.php:271
+#: src/Module/Settings/Display.php:261
 msgid "Large Image"
 msgstr ""
 
-#: src/Module/Settings/Display.php:316
+#: src/Module/Settings/Display.php:306
 msgid "Display Settings"
 msgstr ""
 
-#: src/Module/Settings/Display.php:318
+#: src/Module/Settings/Display.php:308
 msgid "General Theme Settings"
 msgstr ""
 
-#: src/Module/Settings/Display.php:319
+#: src/Module/Settings/Display.php:309
 msgid "Custom Theme Settings"
 msgstr ""
 
-#: src/Module/Settings/Display.php:320
+#: src/Module/Settings/Display.php:310
 msgid "Content Settings"
 msgstr ""
 
-#: src/Module/Settings/Display.php:321 view/theme/duepuntozero/config.php:74
+#: src/Module/Settings/Display.php:311 view/theme/duepuntozero/config.php:74
 #: view/theme/frio/config.php:156 view/theme/quattro/config.php:76
 #: view/theme/vier/config.php:124
 msgid "Theme settings"
 msgstr ""
 
-#: src/Module/Settings/Display.php:322
+#: src/Module/Settings/Display.php:312
 msgid "Timelines"
 msgstr ""
 
-#: src/Module/Settings/Display.php:329
+#: src/Module/Settings/Display.php:319
 msgid "Display Theme:"
 msgstr ""
 
-#: src/Module/Settings/Display.php:330
+#: src/Module/Settings/Display.php:320
 msgid "Mobile Theme:"
 msgstr ""
 
-#: src/Module/Settings/Display.php:333
+#: src/Module/Settings/Display.php:323
 msgid "Number of items to display per page:"
 msgstr ""
 
-#: src/Module/Settings/Display.php:333 src/Module/Settings/Display.php:334
+#: src/Module/Settings/Display.php:323 src/Module/Settings/Display.php:324
 msgid "Maximum of 100 items"
 msgstr ""
 
-#: src/Module/Settings/Display.php:334
+#: src/Module/Settings/Display.php:324
 msgid "Number of items to display per page when viewed from mobile device:"
 msgstr ""
 
-#: src/Module/Settings/Display.php:335
-msgid "Update browser every xx seconds"
+#: src/Module/Settings/Display.php:325
+msgid "Regularly update the page content"
 msgstr ""
 
-#: src/Module/Settings/Display.php:335
-msgid "Minimum of 10 seconds. Enter -1 to disable it."
+#: src/Module/Settings/Display.php:325
+msgid "When enabled, new content on network, community and channels are added on top."
 msgstr ""
 
-#: src/Module/Settings/Display.php:336
+#: src/Module/Settings/Display.php:326
 msgid "Display emoticons"
 msgstr ""
 
-#: src/Module/Settings/Display.php:336
+#: src/Module/Settings/Display.php:326
 msgid "When enabled, emoticons are replaced with matching symbols."
 msgstr ""
 
-#: src/Module/Settings/Display.php:337
+#: src/Module/Settings/Display.php:327
 msgid "Infinite scroll"
 msgstr ""
 
-#: src/Module/Settings/Display.php:337
+#: src/Module/Settings/Display.php:327
 msgid "Automatic fetch new items when reaching the page end."
 msgstr ""
 
-#: src/Module/Settings/Display.php:338
+#: src/Module/Settings/Display.php:328
 msgid "Enable Smart Threading"
 msgstr ""
 
-#: src/Module/Settings/Display.php:338
+#: src/Module/Settings/Display.php:328
 msgid "Enable the automatic suppression of extraneous thread indentation."
 msgstr ""
 
-#: src/Module/Settings/Display.php:339
+#: src/Module/Settings/Display.php:329
 msgid "Display the Dislike feature"
 msgstr ""
 
-#: src/Module/Settings/Display.php:339
+#: src/Module/Settings/Display.php:329
 msgid "Display the Dislike button and dislike reactions on posts and comments."
 msgstr ""
 
-#: src/Module/Settings/Display.php:340
+#: src/Module/Settings/Display.php:330
 msgid "Display the resharer"
 msgstr ""
 
-#: src/Module/Settings/Display.php:340
+#: src/Module/Settings/Display.php:330
 msgid "Display the first resharer as icon and text on a reshared item."
 msgstr ""
 
-#: src/Module/Settings/Display.php:341
+#: src/Module/Settings/Display.php:331
 msgid "Stay local"
 msgstr ""
 
-#: src/Module/Settings/Display.php:341
+#: src/Module/Settings/Display.php:331
 msgid "Don't go to a remote system when following a contact link."
 msgstr ""
 
-#: src/Module/Settings/Display.php:342
+#: src/Module/Settings/Display.php:332
 msgid "Show the post deletion checkbox"
 msgstr ""
 
-#: src/Module/Settings/Display.php:342
+#: src/Module/Settings/Display.php:332
 msgid "Display the checkbox for the post deletion on the network page."
 msgstr ""
 
-#: src/Module/Settings/Display.php:343
+#: src/Module/Settings/Display.php:333
 msgid "DIsplay the event list"
 msgstr ""
 
-#: src/Module/Settings/Display.php:343
+#: src/Module/Settings/Display.php:333
 msgid "Display the birthday reminder and event list on the network page."
 msgstr ""
 
-#: src/Module/Settings/Display.php:344
+#: src/Module/Settings/Display.php:334
 msgid "Link preview mode"
 msgstr ""
 
-#: src/Module/Settings/Display.php:344
+#: src/Module/Settings/Display.php:334
 msgid "Appearance of the link preview that is added to each post with a link."
 msgstr ""
 
-#: src/Module/Settings/Display.php:345
+#: src/Module/Settings/Display.php:335
 msgid "Hide pictures with empty alternative text"
 msgstr ""
 
-#: src/Module/Settings/Display.php:345
+#: src/Module/Settings/Display.php:335
 msgid "Don't display pictures that are missing the alternative text."
 msgstr ""
 
-#: src/Module/Settings/Display.php:346
+#: src/Module/Settings/Display.php:336
 msgid "Hide custom emojis"
 msgstr ""
 
-#: src/Module/Settings/Display.php:346
+#: src/Module/Settings/Display.php:336
 msgid "Don't display custom emojis."
 msgstr ""
 
-#: src/Module/Settings/Display.php:347
+#: src/Module/Settings/Display.php:337
 msgid "Platform icons style"
 msgstr ""
 
-#: src/Module/Settings/Display.php:347
+#: src/Module/Settings/Display.php:337
 msgid "Style of the platform icons"
 msgstr ""
 
-#: src/Module/Settings/Display.php:352
+#: src/Module/Settings/Display.php:342
 msgid "Bookmark"
 msgstr ""
 
-#: src/Module/Settings/Display.php:354
+#: src/Module/Settings/Display.php:344
 msgid "Enable timelines that you want to see in the channels widget. Bookmark timelines that you want to see in the top menu."
 msgstr ""
 
-#: src/Module/Settings/Display.php:356
+#: src/Module/Settings/Display.php:346
 msgid "Channel languages:"
 msgstr ""
 
-#: src/Module/Settings/Display.php:356
+#: src/Module/Settings/Display.php:346
 msgid "Select all the languages you want to see in your channels. \"Unspecified\" describes all posts for which no language information was detected (e.g. posts with just an image or too little text to be sure of the language). If you want to see all languages, you will need to select all items in the list."
 msgstr ""
 
-#: src/Module/Settings/Display.php:358
+#: src/Module/Settings/Display.php:348
 msgid "Beginning of week:"
 msgstr ""
 
-#: src/Module/Settings/Display.php:359
+#: src/Module/Settings/Display.php:349
 msgid "Default calendar view:"
 msgstr ""
 
@@ -11655,97 +11655,97 @@ msgstr ""
 msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: src/Object/Post.php:602
+#: src/Object/Post.php:603
 #, php-format
 msgid "Reply to %s"
 msgstr ""
 
-#: src/Object/Post.php:624
+#: src/Object/Post.php:625
 msgid "Notifier task is pending"
 msgstr ""
 
-#: src/Object/Post.php:625
+#: src/Object/Post.php:626
 msgid "Delivery to remote servers is pending"
 msgstr ""
 
-#: src/Object/Post.php:626
+#: src/Object/Post.php:627
 msgid "Delivery to remote servers is underway"
 msgstr ""
 
-#: src/Object/Post.php:627
+#: src/Object/Post.php:628
 msgid "Delivery to remote servers is mostly done"
 msgstr ""
 
-#: src/Object/Post.php:628
+#: src/Object/Post.php:629
 msgid "Delivery to remote servers is done"
 msgstr ""
 
-#: src/Object/Post.php:650
+#: src/Object/Post.php:651
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Object/Post.php:651
+#: src/Object/Post.php:652
 msgid "Show more"
 msgstr ""
 
-#: src/Object/Post.php:652
+#: src/Object/Post.php:653
 msgid "Show fewer"
 msgstr ""
 
-#: src/Object/Post.php:689
+#: src/Object/Post.php:690
 #, php-format
 msgid "Reshared by: %s"
 msgstr ""
 
-#: src/Object/Post.php:694
+#: src/Object/Post.php:695
 #, php-format
 msgid "Viewed by: %s"
 msgstr ""
 
-#: src/Object/Post.php:699
+#: src/Object/Post.php:700
 #, php-format
 msgid "Read by: %s"
 msgstr ""
 
-#: src/Object/Post.php:704
+#: src/Object/Post.php:705
 #, php-format
 msgid "Liked by: %s"
 msgstr ""
 
-#: src/Object/Post.php:709
+#: src/Object/Post.php:710
 #, php-format
 msgid "Disliked by: %s"
 msgstr ""
 
-#: src/Object/Post.php:714
+#: src/Object/Post.php:715
 #, php-format
 msgid "Attended by: %s"
 msgstr ""
 
-#: src/Object/Post.php:719
+#: src/Object/Post.php:720
 #, php-format
 msgid "Maybe attended by: %s"
 msgstr ""
 
-#: src/Object/Post.php:724
+#: src/Object/Post.php:725
 #, php-format
 msgid "Not attended by: %s"
 msgstr ""
 
-#: src/Object/Post.php:729
+#: src/Object/Post.php:730
 #, php-format
 msgid "Commented by: %s"
 msgstr ""
 
-#: src/Object/Post.php:734
+#: src/Object/Post.php:735
 #, php-format
 msgid "Reacted with %s by: %s"
 msgstr ""
 
-#: src/Object/Post.php:757
+#: src/Object/Post.php:758
 #, php-format
 msgid "Quote shared by: %s"
 msgstr ""

diff --git a/view/templates/head.tpl b/view/templates/head.tpl
index f110963d0a652e215d2092978032e2ec714ad3cf..f89806ceaeb4f366b233356761130c609d15dd81 100644 (file)
--- a/view/templates/head.tpl
+++ b/view/templates/head.tpl
@@ -71,7 +71,7 @@ window.onload = function(){
 };
 </script>
 <script type="text/javascript">
-       const updateInterval = {{$update_interval}};
+       const updateContent = {{$update_content}};
        const localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}};
 </script>
 <script type="text/javascript" src="view/js/main.js?v={{$VERSION}}"></script>

diff --git a/view/templates/settings/display.tpl b/view/templates/settings/display.tpl
index 683740c35f53e44e5762e17bb524171c683317f0..500300dde0fb59dd7b50cd86fab3f4c2ce352a38 100644 (file)
--- a/view/templates/settings/display.tpl
+++ b/view/templates/settings/display.tpl
@@ -18,8 +18,8 @@
        {{/if}}
 
        {{include file="field_input.tpl" field=$itemspage_mobile_network}}
-       {{include file="field_input.tpl" field=$ajaxint}}
        {{include file="field_checkbox.tpl" field=$enable_smile}}
+       {{include file="field_checkbox.tpl" field=$update_content}}
        {{include file="field_checkbox.tpl" field=$infinite_scroll}}
        {{include file="field_checkbox.tpl" field=$enable_smart_threading}}
        {{include file="field_checkbox.tpl" field=$enable_dislike}}

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index af73b8b9fee0840f84c8d9f8a18a8495619531f6..7bd9a165ea498d394672285839061840fded79de 100644 (file)
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -1813,6 +1813,10 @@ blockquote.shared_content {
        font-weight: 500;
        color: $font_color_darker;
 }
+.contact-info h1.media-heading {
+       font-size: 15px;
+       font-weight: 700;
+}
 .media .contact-info-comment {
        display: table-cell;
 }

diff --git a/view/theme/frio/templates/head.tpl b/view/theme/frio/templates/head.tpl
index 6da0baaed2925c63a1ea7de1babe89fb588a77c6..9a6c219ec0f3ff4ad7c09223a4fb4883a7c26ada 100644 (file)
--- a/view/theme/frio/templates/head.tpl
+++ b/view/theme/frio/templates/head.tpl
@@ -112,7 +112,7 @@
        <script type="text/javascript" src="view/asset/dompurify/dist/purify.min.js?v={{$VERSION}}">
        </script>
        <script type="text/javascript">
-               const updateInterval = {{$update_interval}};
+               const updateContent = {{$update_content}};
                const localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}};
        </script>
        <script type="text/javascript" src="view/js/main.js?v={{$VERSION}}"></script>

diff --git a/view/theme/frio/templates/settings/display.tpl b/view/theme/frio/templates/settings/display.tpl
index cfd29f84cb84d3a02292ada9be4b26b984d863a0..7fdbd892601a13e0a2224a3d146bae11fcd7dd2c 100644 (file)
--- a/view/theme/frio/templates/settings/display.tpl
+++ b/view/theme/frio/templates/settings/display.tpl
@@ -65,8 +65,8 @@
                                        <div class="panel-body">
                                                {{include file="field_input.tpl" field=$itemspage_network}}
                                                {{include file="field_input.tpl" field=$itemspage_mobile_network}}
-                                               {{include file="field_input.tpl" field=$ajaxint}}
                                                {{include file="field_checkbox.tpl" field=$enable_smile}}
+                                               {{include file="field_checkbox.tpl" field=$update_content}}
                                                {{include file="field_checkbox.tpl" field=$infinite_scroll}}
                                                {{include file="field_checkbox.tpl" field=$enable_smart_threading}}
                                                {{include file="field_checkbox.tpl" field=$enable_dislike}}

diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl
index 60bea3f9cfabc0ce2ec45f952401ca1d78eef888..f9c74518386d05e6dfeb383038bd4dea8f3c1389 100644 (file)
--- a/view/theme/frio/templates/wall_thread.tpl
+++ b/view/theme/frio/templates/wall_thread.tpl
@@ -187,7 +187,7 @@ as the value of $top_child_total (this is done at the end of this file)
 
                        {{* contact info header for smartphones *}}
                        <div class="contact-info-xs hidden-lg hidden-md"><!-- <= For smartphone (responsive) -->
-                               <h2 class="media-heading">
+                               <h1 class="media-heading">
                                        <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo hover-card"><span>{{$item.name}}</span></a>
                                        <p class="text-muted">
                                                <small>
@@ -214,7 +214,7 @@ as the value of $top_child_total (this is done at the end of this file)
                                                        {{/if}}
                                                </small>
                                        </p>
-                               </h2>
+                               </h1>
                        </div>
                {{else}} {{* End of if $item.thread_level == 1 *}}
                        {{* contact info header for comments *}}