diff options
| author | Mario <mario@mariovavti.com> | 2025-02-14 14:56:17 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2025-02-14 14:56:17 +0000 |
| commit | 453f6a08a3c02a4e4f06aefbb1d34e71074f83bd (patch) | |
| tree | 052c05578252f3c48dcc596ac32fad3b4801e8d9 | |
| parent | b805f48c32b914eaacb2ec8e204215b77a86d132 (diff) | |
| parent | b6560e545634a2092a967e4497212b407ff776f7 (diff) | |
| download | volse-hubzilla-453f6a08a3c02a4e4f06aefbb1d34e71074f83bd.tar.gz volse-hubzilla-453f6a08a3c02a4e4f06aefbb1d34e71074f83bd.tar.bz2 volse-hubzilla-453f6a08a3c02a4e4f06aefbb1d34e71074f83bd.zip | |
Merge branch 'highlight_mark_button3' into 'dev'
Highlight_mark_button3
See merge request hubzilla/core!2185
| -rw-r--r-- | Zotlabs/Lib/ThreadItem.php | 1 | ||||
| -rw-r--r-- | include/conversation.php | 1 | ||||
| -rw-r--r-- | view/tpl/comment_item.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/jot.tpl | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index 4b833f4b4..e0db98eb3 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -799,6 +799,7 @@ class ThreadItem { '$submit' => t('Submit'), '$edbold' => t('Bold'), '$editalic' => t('Italic'), + '$edhighlighter' => t('Highlight selected text'), '$eduline' => t('Underline'), '$edquote' => t('Quote'), '$edcode' => t('Code'), diff --git a/include/conversation.php b/include/conversation.php index ee599c28d..a9dd8373a 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1255,6 +1255,7 @@ function hz_status_editor($x, $popup = false) { '$writefiles' => $writefiles, '$bold' => t('Bold'), '$italic' => t('Italic'), + '$highlighter' => t('Highlight selected text'), '$underline' => t('Underline'), '$quote' => t('Quote'), '$code' => t('Code'), diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index 059e2793a..1dc7ad88b 100644 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -37,7 +37,7 @@ <button class="btn btn-outline-secondary btn-sm border-0" title="{{$edcode}}" onclick="insertbbcomment('{{$comment}}','code', {{$id}}); return false;"> <i class="bi bi-code comment-icon"></i> </button> - <button class="btn btn-outline-secondary btn-sm border-0" title="highlight" onclick="insertbbcomment('{{$comment}}','mark', {{$id}}); return false;"> + <button class="btn btn-outline-secondary btn-sm border-0" title="{{$edhighlighter}}" onclick="insertbbcomment('{{$comment}}','mark', {{$id}}); return false;"> <i class="bi bi-highlighter comment-icon"></i> </button> </div> diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index a6ec453e7..9c9d649aa 100644 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -116,7 +116,7 @@ <button type="button" id="main-editor-code" class="btn btn-outline-secondary btn-sm border-0" title="{{$code}}" onclick="inserteditortag('code', 'profile-jot-text'); return false;"> <i class="bi bi-code jot-icons"></i> </button> - <button type="button" id="main-editor-bold" class="btn btn-outline-secondary btn-sm border-0" title="highlight" onclick="inserteditortag('mark', 'profile-jot-text'); return false;"> + <button type="button" id="main-editor-bold" class="btn btn-outline-secondary btn-sm border-0" title="{{$highlighter}}" onclick="inserteditortag('mark', 'profile-jot-text'); return false;"> <i class="bi bi-highlighter jot-icons"></i> </button> </div> |