Friendica/friendica-github
1
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2025-02-14 15:34:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #14749 from MarekBenjamin/bugfix/14748-frio-filer-dialog-colors

Browse source 
Fix filer dialog colors
This commit is contained in:
Hypolite Petovan 2025-02-04 13:22:09 -05:00 • committed by GitHub
commit df17de7ea7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 33 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Content/Conversation.php
View file

@ -326,7 +326,7 @@ class Conversation
'$ispublic' => $this->l10n->t('Visible to <strong>everybody</strong>'),
'$linkurl' => $this->l10n->t('Please enter a image/video/audio/webpage URL:'),
'$term' => $this->l10n->t('Tag term:'),
'$fileas' => $this->l10n->t('Save to Folder:'),
'$fileas' => $this->l10n->t('Save to Folder'),
'$whereareu' => $this->l10n->t('Where are you right now?'),
'$delitems' => $this->l10n->t("Delete item\x28s\x29?"),
'$is_mobile' => $this->mode->isMobile(),

2
src/Module/Filer/SaveTag.php
View file

@ -56,7 +56,7 @@ class SaveTag extends BaseModule
$tpl = Renderer::getMarkupTemplate("filer_dialog.tpl");
echo Renderer::replaceMacros($tpl, [
'$field' => ['term', $this->t("Save to Folder:"), '', '', $filetags, $this->t('- select -')],
'$field' => ['term', $this->t("Folder:"), '', '', $filetags, $this->t('- select -')],
'$submit' => $this->t('Save'),
]);

18
view/lang/C/messages.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2025.02-dev\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-02-04 04:54+0000\n"
"POT-Creation-Date: 2025-02-04 13:20-0500\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"
@ -1243,8 +1243,8 @@ msgstr ""
msgid "Tag term:"
msgstr ""
#: src/Content/Conversation.php:329 src/Module/Filer/SaveTag.php:59
msgid "Save to Folder:"
#: src/Content/Conversation.php:329
msgid "Save to Folder"
msgstr ""
#: src/Content/Conversation.php:330
@ -7024,6 +7024,10 @@ msgstr ""
msgid "Item was not removed"
msgstr ""
#: src/Module/Filer/SaveTag.php:59
msgid "Folder:"
msgstr ""
#: src/Module/Filer/SaveTag.php:59
msgid "- select -"
msgstr ""
@ -8179,8 +8183,8 @@ msgstr ""
msgid "User \"%s\" deleted"
msgstr ""
#: src/Module/Moderation/Users/Active.php:156
#: src/Module/Moderation/Users/Index.php:167
#: src/Module/Moderation/Users/Active.php:157
#: src/Module/Moderation/Users/Index.php:168
#, php-format
msgid "User \"%s\" blocked"
msgstr ""
@ -8197,8 +8201,8 @@ msgstr[1] ""
msgid "Blocked Users"
msgstr ""
#: src/Module/Moderation/Users/Blocked.php:154
#: src/Module/Moderation/Users/Index.php:172
#: src/Module/Moderation/Users/Blocked.php:155
#: src/Module/Moderation/Users/Index.php:174
#, php-format
msgid "User \"%s\" unblocked"
msgstr ""

4
view/templates/filer_dialog.tpl
View file

@ -7,5 +7,5 @@
{{include file="field_combobox.tpl"}}
<div class="settings-submit-wrapper">
<input id="filer_save" type="button" class="settings-submit" value="{{$submit}}" />
</div>
<input id="filer_save" type="button" class="btn btn-primary" value="{{$submit}}" />
</div>

30
view/theme/frio/templates/jot-header.tpl
View file

@ -296,27 +296,33 @@
}
function itemFiler(id) {
const bordercolor = $("input").css("border-color");
var modal = $('#modal').modal();
$.get('filer/', function (data) {
$.colorbox({html: data});
$("#id_term").keypress(function () {
$(this).css("border-color", bordercolor);
})
$("#select_term").change(function () {
$("#id_term").css("border-color", bordercolor);
})
modal
.find('#modal-body')
.append(data);
modal
.find('#modal-header h4')
.append("{{$fileas}}");
// Ensure focus after the modal is fully visible
modal.on('shown.bs.modal', function () {
$('#id_term').trigger('focus');
});
$("#filer_save").click(function (e) {
e.preventDefault();
const reply = $("#id_term").val();
if (reply && reply.length) {
const term = $("#id_term").val();
if (term && term.length) {
commentBusy = true;
formModified = true;
$('body').css('cursor', 'wait');
$.get('filer/' + id + '?term=' + reply)
$.get('filer/' + id + '?term=' + term)
.done(function () {
$.colorbox.close();
$('#modal-body').empty();
$('#modal').modal('hide');
resetFormModifiedFlag();
})
.always(function () {