Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-19 21:15:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

usability and logic improvement with author menu search

Browse source
This commit is contained in:
Mike Macgirvin 2023-01-27 01:05:24 -08:00
parent 44e6465a26
commit 884b464c5d
4 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
include/conversation.php
View file

@ -779,7 +779,7 @@ function thread_author_menu($item, $mode = '')
if (their_perms_contains($local_channel, $contact['xchan_hash'], 'search_stream')) {
$collections = XConfig::Get($contact['xchan_hash'],'activitypub','collections');
if ($collections && $collections['searchContent']) {
$search_url = zid(str_replace('{}', '', $collections['searchContent']));
$search_url = zid($collections['searchContent']);
}
}
if (! (isset($contact['abook_self']) && intval($contact['abook_self']))) {
@ -802,6 +802,19 @@ function thread_author_menu($item, $mode = '')
. urlencode($item['author_xchan']);
}
if (isset($search_url) && $search_url) {
$menu[] = [
'menu' => 'search_posts',
'title' => t('Remote Search'),
'icon' => 'fw',
'action' => '',
'href' => $search_url,
'input' => true,
'id' => new_uuid(),
];
}
if ($profile_link) {
$menu[] = [
'menu' => 'view_profile',
@ -831,16 +844,6 @@ function thread_author_menu($item, $mode = '')
'href' => $posts_link
];
}
if (isset($search_url) && $search_url) {
$menu[] = [
'menu' => 'search_posts',
'title' => t('Remote Search'),
'icon' => 'fw',
'action' => '',
'href' => $search_url
];
}
if (isset($follow_url) && $follow_url) {
$menu[] = [

4
view/tpl/connection_template.tpl
View file

@ -29,7 +29,11 @@
<div style="margin-top: 20px;">
<hr>
{{foreach $contact.author_menu as $mitem}}
{{if $mitem.input}}
<input style="margin-left: 5px; width: 75%;" id="cti-{{$mitem.id}}" class="pull-left" type="text" ><button style="margin-left: 3px;" class="btn btn-sm pull-left" onclick="window.location.href='{{$mitem.href}}'.replace('{}',encodeURIComponent($('#cti-{{$mitem.id}}').val()));"><i class="fa fa-fw fa-search" ></i></button>
{{else}}
<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a>
{{/if}}
{{/foreach}}
</div>
</div>

4
view/tpl/conv_item.tpl
View file

@ -52,7 +52,11 @@
<div style="margin-top: 20px;">
<hr>
{{foreach $item.thread_author_menu as $mitem}}
{{if $mitem.input}}
<input style="margin-left: 5px; width: 75%;" id="cti-{{$mitem.id}}" class="pull-left" type="text" ><button style="margin-left: 3px;" class="btn btn-sm pull-left" onclick="window.location.href='{{$mitem.href}}'.replace('{}',encodeURIComponent($('#cti-{{$mitem.id}}').val()));"><i class="fa fa-fw fa-search" ></i></button>
{{else}}
<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a>
{{/if}}
{{/foreach}}
</div>
</div>

6
view/tpl/search_item.tpl
View file

@ -34,7 +34,11 @@
<div style="margin-top: 20px;">
<hr>
{{foreach $item.thread_author_menu as $mitem}}
<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a>
{{if $mitem.input}}
<input style="margin-left: 5px; width: 75%;" id="cti-{{$mitem.id}}" class="pull-left" type="text" ><button style="margin-left: 3px;" class="btn btn-sm pull-left" onclick="window.location.href='{{$mitem.href}}'.replace('{}',encodeURIComponent($('#cti-{{$mitem.id}}').val()));"><i class="fa fa-fw fa-search" ></i></button>
{{else}}
<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a>
{{/if}}
{{/foreach}}
</div>
</div>