From 241cd32b14cbfddd7375cb3d3a237609f76f2c38 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 23 Dec 2020 03:25:55 -0500 Subject: [PATCH] Replace obsolete calls to $APP->is_mobile in templates --- include/conversation.php | 3 ++- mod/editpost.php | 3 ++- src/Module/Notifications/Introductions.php | 2 ++ view/templates/jot-header.tpl | 2 +- .../frio/templates/notifications/intros.tpl | 24 +++++++++---------- 5 files changed, 19 insertions(+), 15 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index c87c8cb588..f681155a4e 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1177,7 +1177,8 @@ function status_editor(App $a, $x, $notes_cid = 0, $popup = false) '$term' => DI::l10n()->t('Tag term:'), '$fileas' => DI::l10n()->t('Save to Folder:'), '$whereareu' => DI::l10n()->t('Where are you right now?'), - '$delitems' => DI::l10n()->t("Delete item\x28s\x29?") + '$delitems' => DI::l10n()->t("Delete item\x28s\x29?"), + '$is_mobile' => DI::mode()->isMobile(), ]); $jotplugins = ''; diff --git a/mod/editpost.php b/mod/editpost.php index 209fbcf5ab..ff2d0f5552 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -66,7 +66,8 @@ function editpost_content(App $a) DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [ '$ispublic' => ' ', // DI::l10n()->t('Visible to everybody'), '$geotag' => $geotag, - '$nickname' => $a->user['nickname'] + '$nickname' => $a->user['nickname'], + '$is_mobile' => DI::mode()->isMobile(), ]); if (strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])) { diff --git a/src/Module/Notifications/Introductions.php b/src/Module/Notifications/Introductions.php index 2a8a6ef44a..ccd5963877 100644 --- a/src/Module/Notifications/Introductions.php +++ b/src/Module/Notifications/Introductions.php @@ -112,6 +112,7 @@ class Introductions extends BaseNotifications '$note' => $notification->getNote(), '$ignore' => DI::l10n()->t('Ignore'), '$discard' => DI::l10n()->t('Discard'), + '$is_mobile' => DI::mode()->isMobile(), ]); break; @@ -190,6 +191,7 @@ class Introductions extends BaseNotifications '$ignore' => DI::l10n()->t('Ignore'), '$discard' => $discard, '$action' => $action, + '$is_mobile' => DI::mode()->isMobile(), ]); break; } diff --git a/view/templates/jot-header.tpl b/view/templates/jot-header.tpl index aa00c5d989..8f9d59d985 100644 --- a/view/templates/jot-header.tpl +++ b/view/templates/jot-header.tpl @@ -8,7 +8,7 @@ var textlen = 0; function initEditor(callback) { if (editor == false) { var colorbox_options = { - {{if $APP->is_mobile}} + {{if $is_mobile}} 'width' : '100%', 'height' : '100%', {{/if}} diff --git a/view/theme/frio/templates/notifications/intros.tpl b/view/theme/frio/templates/notifications/intros.tpl index f46082915f..710cd4a38c 100644 --- a/view/theme/frio/templates/notifications/intros.tpl +++ b/view/theme/frio/templates/notifications/intros.tpl @@ -36,6 +36,17 @@
{{$note}}
+ {{* On mobile touch devices we use buttons for approve, ingnore && discard to have a better UX *}} + {{if $is_mobile}} +
+
+ + {{if $discard}} {{/if}} +
+ +
+
+ {{else}} {{* The intro actions like approve, ignore, discard intro*}} + {{/if}} {{* This sections contains special settings for contact approval. We hide it by default and load this section in a bootstrap modal in the case of approval *}} @@ -74,17 +86,5 @@ - - {{* On mobile touch devices we use buttons for approve, ingnore && discard to have a better UX *}} - {{if $APP->is_mobile}} -
-
- - {{if $discard}} {{/if}} -
- -
-
- {{/if}}