keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #12218 from MrPetovan/bug/frion-search-items

Browse source 
[frio] Improve search list display for web and mobile
This commit is contained in:
Tobias Diekershoff 2022-11-20 08:14:42 +01:00 committed by GitHub
commit 70ea419fcc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 295 additions and 268 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Content/Conversation.php
View file

@ -526,7 +526,7 @@ class Conversation
$live_update_div = '<div id="live-search"></div>' . "\r\n";
}
$page_dropping = $this->session->getLocalUserId() && $this->session->getLocalUserId() == $uid;
$page_dropping = $this->session->getLocalUserId() && $this->session->getLocalUserId() == $uid && $mode != 'search';
if (!$update) {
$_SESSION['return_path'] = $this->args->getQueryString();

30
view/theme/frio/templates/conversation.tpl Normal file
View file

@ -0,0 +1,30 @@
{{$live_update nofilter}}
{{foreach $threads as $thread}}
<div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper panel toplevel_item">
{{foreach $thread.items as $item}}
{{if $item.comment_firstcollapsed}}
<div class="hide-comments-outer">
<span id="hide-comments-total-{{$thread.id}}" class="hide-comments-total">{{$thread.num_comments}}</span>
<span id="hide-comments-{{$thread.id}}" class="hide-comments fakelink" onclick="showHideComments({{$thread.id}});">{{$thread.hide_text}}</span>
</div>
<div id="collapsed-comments-{{$thread.id}}" class="collapsed-comments" style="display: none;">
{{/if}}
{{if $item.comment_lastcollapsed}}</div>{{/if}}
{{include file="{{$item.template}}"}}
{{/foreach}}
</div>
{{/foreach}}
{{if !$update}}
<div id="conversation-end"></div>
{{if $dropping}}
<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
<div id="item-delete-selected-icon" class="icon drophide" title="{{$dropping}}"
onmouseover="imgbright(this);" onmouseout="imgdull(this);"></div>
<div id="item-delete-selected-desc">{{$dropping}}</div>
</div>
<div id="item-delete-selected-end"></div>
{{/if}}
{{/if}}

57
view/theme/frio/templates/search_item.tpl
View file

@ -1,33 +1,7 @@
<!-- TODO => Unknow block -->
<div class="wall-item-decor" style="display:none;">
{{if $item.star}}<span class="icon s22 star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred}}">{{$item.star.starred}}</span>{{/if}}
{{if $item.lock}}<span class="navicon lock fakelink" onclick="lockview(event, 'item', {{$item.id}});" title="{{$item.lock}}"></span><span class="fa fa-lock" aria-hidden="true"></span>{{/if}}
</div>
<!-- ./TODO => Unknow block -->
<div class="panel item-{{$item.id}}" id="item-{{$item.guid}}">
<span class="commented" style="display: none;">{{$item.commented}}</span>
<span class="received" style="display: none;">{{$item.received}}</span>
<span class="created" style="display: none;">{{$item.created_date}}</span>
<span class="uriid" style="display: none;">{{$item.uriid}}</span>
<div class="wall-item-container panel-body{{$item.indent}} {{$item.shiny}} {{$item.previewing}}">
<div id="item-{{$item.guid}}" class="item-{{$item.id}} wall-item-container panel-body{{$item.indent}} {{$item.shiny}} {{$item.previewing}}">
<div class="media">
{{* Put additional actions in a top-right dropdown menu *}}
<div class="preferences">
{{if $item.network_icon != ""}}
<span class="wall-item-network"><i class="fa fa-{{$item.network_icon}}" title="{{$item.network_name}}" aria-hidden="true"></i></span>
{{else}}
<span class="wall-item-network" title="{{$item.app}}">{{$item.network_name}}</span>
{{/if}}
{{if $item.plink}} {{*link to the original source of the item *}}
<a href="{{$item.plink.href}}" class="plink u-url" aria-label="{{$item.plink.title}}" title="{{$item.plink.title}}">
<i class="fa fa-external-link"></i>
</a>
{{/if}}
</div>
{{* The avatar picture and the photo-menu *}}
<div class="dropdown pull-left"><!-- Dropdown -->
<div class="hidden-sm hidden-xs contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}">
@ -49,6 +23,18 @@
{{* contact info header*}}
<div role="heading" class="contact-info hidden-sm hidden-xs media-body"><!-- <= For computer -->
<div class="preferences">
{{if $item.network_icon != ""}}
<span class="wall-item-network"><i class="fa fa-{{$item.network_icon}}" title="{{$item.network_name}}" aria-hidden="true"></i></span>
{{else}}
<span class="wall-item-network" title="{{$item.app}}">{{$item.network_name}}</span>
{{/if}}
{{if $item.plink}} {{*link to the original source of the item *}}
<a href="{{$item.plink.href}}" class="plink u-url" aria-label="{{$item.plink.title}}" title="{{$item.plink.title}}">
<i class="fa fa-external-link"></i>
</a>
{{/if}}
</div>
<h4 class="media-heading">
<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo hover-card">
<span class="wall-item-name {{$item.sparkle}}">{{$item.name}}</span>
@ -90,7 +76,19 @@
</div>
{{* contact info header for smartphones *}}
<div role="heading " class="contact-info-xs hidden-lg hidden-md">
<div role="heading" class="contact-info-xs hidden-lg hidden-md">
<div class="preferences">
{{if $item.network_icon != ""}}
<span class="wall-item-network"><i class="fa fa-{{$item.network_icon}}" title="{{$item.network_name}}" aria-hidden="true"></i></span>
{{else}}
<span class="wall-item-network" title="{{$item.app}}">{{$item.network_name}}</span>
{{/if}}
{{if $item.plink}} {{*link to the original source of the item *}}
<a href="{{$item.plink.href}}" class="plink u-url" aria-label="{{$item.plink.title}}" title="{{$item.plink.title}}">
<i class="fa fa-external-link"></i>
</a>
{{/if}}
</div>
<h5 class="media-heading">
<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo hover-card"><span>{{$item.name}}</span></a>
<p class="text-muted"><small>
@ -298,5 +296,4 @@
{{/if}}
</div>
</div><!--./media>-->
</div><!-- ./panel-body -->
</div><!--./panel-->
</div><!-- ./panel-body -->