Friendica/friendica
Friendica/friendica
1
0
Fork 1
mirror of https://git.friendi.ca/friendica/friendica.git synced 2025-06-07 20:04:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge bd163c7919 into 415e7b5f8b

Browse source
This commit is contained in:
haheute 2025-05-25 10:34:48 +02:00 • committed by GitHub
commit 42fd2b09e6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 679 additions and 706 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Module/Calendar/Event/Form.php
View file

@ -108,8 +108,10 @@ class Form extends BaseModule
$share_disabled = ''; $share_disabled = '';
if (empty($orig_event)) { if (empty($orig_event)) {
$orig_event = User::getById($this->session->getLocalUserId(), $orig_event = User::getById(
['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid']); $this->session->getLocalUserId(),
['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid']
);
} elseif ($orig_event['allow_cid'] !== '<' . $this->session->getLocalUserId() . '>' } elseif ($orig_event['allow_cid'] !== '<' . $this->session->getLocalUserId() . '>'
|| $orig_event['allow_gid'] || $orig_event['allow_gid']
|| $orig_event['deny_cid'] || $orig_event['deny_cid']
@ -224,7 +226,7 @@ class Form extends BaseModule
'$t_orig' => $t_orig, '$t_orig' => $t_orig,
'$d_text' => $this->t('Description (BBCode allowed)'), '$d_text' => $this->t('Description (BBCode allowed)'),
'$d_orig' => $d_orig, '$d_orig' => $d_orig,
'$l_text' => $this->t('Location (BBCode not allowed)'), '$l_text' => $this->t('Location:'),
'$l_orig' => $l_orig, '$l_orig' => $l_orig,
'$summary' => ['summary', $this->t('Title (BBCode not allowed)'), $t_orig, '', '*'], '$summary' => ['summary', $this->t('Title (BBCode not allowed)'), $t_orig, '', '*'],
'$sh_text' => $this->t('Share this event'), '$sh_text' => $this->t('Share this event'),

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

File diff suppressed because it is too large Load diff

30
view/theme/frio/templates/calendar/event_form.tpl
View file

@ -132,34 +132,8 @@
</li> </li>
*}} *}}
<li> <li>
<button type="button" class="btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="loc"> <button type="button" class="btn-link icon map" style="cursor: pointer;" title="{{$edmap}}" data-role="insert-formatting" data-comment=" " data-bbcode="map" data-id="loc">
<i class="fa fa-link"></i> <i class="fa fa-map-marker"></i>
</button>
</li>
<li>
<button type="button" class="btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="loc">
<i class="fa fa-video-camera"></i>
</button>
</li>
<li>
<button type="button" class="btn-link icon underline" style="cursor: pointer;" title="{{$eduline}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="loc">
<i class="fa fa-underline"></i>
</button>
</li>
<li>
<button type="button" class="btn-link icon italic" style="cursor: pointer;" title="{{$editalic}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="loc">
<i class="fa fa-italic"></i>
</button>
</li>
<li>
<button type="button" class="btn-link icon bold" style="cursor: pointer;" title="{{$edbold}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="loc">
<i class="fa fa-bold"></i>
</button>
</li>
<li>
<button type="button" class="btn-link icon quote" style="cursor: pointer;" title="{{$edquote}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="loc">
<i class="fa fa-quote-left"></i>
</button> </button>
</li> </li>
</ul> </ul>