From d49737998840d44ea7df1b847c72090cc2e56fe1 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 9 Sep 2020 16:52:43 -0400 Subject: [PATCH] [qcomment] Restore feature - Move settings HTML to template - Move Javascript to addon file - Remove obsolete custom CSS --- qcomment/qcomment.css | 19 ----------------- qcomment/qcomment.js | 18 ++++++++++++++++ qcomment/qcomment.php | 38 ++++++++++++++++----------------- qcomment/templates/settings.tpl | 21 ++++++++++++++++++ 4 files changed, 57 insertions(+), 39 deletions(-) delete mode 100644 qcomment/qcomment.css create mode 100644 qcomment/qcomment.js create mode 100644 qcomment/templates/settings.tpl diff --git a/qcomment/qcomment.css b/qcomment/qcomment.css deleted file mode 100644 index 3e5513bbc..000000000 --- a/qcomment/qcomment.css +++ /dev/null @@ -1,19 +0,0 @@ - -#qcomment-label { - float: left; - width: 300px; - margin-top: 10px; -} - -#qcomment-words { - float: left; - margin-top: 10px; - width: 100px; - height: 150px; - -} - -#qcomment-submit { - margin-top: 15px; -} - diff --git a/qcomment/qcomment.js b/qcomment/qcomment.js new file mode 100644 index 000000000..1f5c3496f --- /dev/null +++ b/qcomment/qcomment.js @@ -0,0 +1,18 @@ +function qCommentInsert(obj, id) +{ + let $textarea = $('#comment-edit-text-' + id); + + if ($textarea.val() === '') { + $textarea.addClass('comment-edit-text-full'); + $textarea.removeClass('comment-edit-text-empty'); + openMenu('comment-edit-submit-wrapper-' + id); + } + + var ins = $(obj).val(); + ins = ins.replace('<', '<'); + ins = ins.replace('>', '>'); + ins = ins.replace('&', '&'); + ins = ins.replace('"', '"'); + $textarea.val($textarea.val() + ins); + $(obj).val(''); +} diff --git a/qcomment/qcomment.php b/qcomment/qcomment.php index 4c78b8224..ed110f667 100644 --- a/qcomment/qcomment.php +++ b/qcomment/qcomment.php @@ -21,10 +21,16 @@ use Friendica\Core\Hook; use Friendica\DI; use Friendica\Util\XML; -function qcomment_install() { - Hook::register('addon_settings', 'addon/qcomment/qcomment.php', 'qcomment_addon_settings'); - Hook::register('addon_settings_post', 'addon/qcomment/qcomment.php', 'qcomment_addon_settings_post'); +function qcomment_install() +{ + Hook::register('addon_settings' , __FILE__, 'qcomment_addon_settings'); + Hook::register('addon_settings_post', __FILE__, 'qcomment_addon_settings_post'); + Hook::register('footer' , __FILE__, 'qcomment_footer'); +} +function qcomment_footer(\Friendica\App $a, &$b) +{ + DI::page()->registerFooterScript(__DIR__ . '/qcomment.js'); } function qcomment_addon_settings(&$a, &$s) @@ -33,24 +39,16 @@ function qcomment_addon_settings(&$a, &$s) return; } - /* Add our stylesheet to the page so we can make our settings look nice */ - - DI::page()['htmlhead'] .= '' . "\r\n"; - $words = DI::pConfig()->get(local_user(), 'qcomment', 'words', DI::l10n()->t(':-)') . "\n" . DI::l10n()->t(':-(') . "\n" . DI::l10n()->t('lol')); - $s .= '
'; - $s .= '

' . DI::l10n()->t('Quick Comment Settings') . '

'; - $s .= '
'; - $s .= '
' . DI::l10n()->t("Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies.") . '
'; - $s .= ''; - $s .= ''; - $s .= '
'; - - $s .= '
'; - $s .= '
'; - - return; + $t = \Friendica\Core\Renderer::getMarkupTemplate('settings.tpl', 'addon/qcomment/'); + $s .= \Friendica\Core\Renderer::replaceMacros($t, [ + '$postpost' => isset($_POST['qcomment-words']), + '$header' => DI::l10n()->t('Quick Comment Settings'), + '$description' => DI::l10n()->t("Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."), + '$save' => DI::l10n()->t('Save Settings'), + '$words' => ['qcomment-words', DI::l10n()->t('Enter quick comments, one per line'), $words, null, ' rows="10"'], + ]); } function qcomment_addon_settings_post(&$a, &$b) @@ -59,7 +57,7 @@ function qcomment_addon_settings_post(&$a, &$b) return; } - if ($_POST['qcomment-submit']) { + if (isset($_POST['qcomment-words'])) { DI::pConfig()->set(local_user(), 'qcomment', 'words', XML::escape($_POST['qcomment-words'])); } } diff --git a/qcomment/templates/settings.tpl b/qcomment/templates/settings.tpl new file mode 100644 index 000000000..31ccea86d --- /dev/null +++ b/qcomment/templates/settings.tpl @@ -0,0 +1,21 @@ + +

{{$header}}

+
+
+ +

{{$header}}

+
+ +
+

{{$description}}

+ + {{include file="field_textarea.tpl" field=$words}} + +
+ +
+
+