friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #4873 from astifter/develop 

Remove pagination when empty, move new Member Tips and use common widget to find people.
This commit is contained in:
Hypolite Petovan 2018-04-23 10:23:21 -04:00 committed by GitHub
parent 2f024a3a6d da24e282c6
commit a66e9b81ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 77 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/profile.php
View File

@ -191,7 +191,7 @@ function profile_content(App $a, $update = 0)
$o .= Widget::commonFriendsVisitor($a->profile['profile_uid']); $o .= Widget::commonFriendsVisitor($a->profile['profile_uid']);
if (x($_SESSION, 'new_member') && $is_owner) { if (x($_SESSION, 'new_member') && $is_owner) {
$o .= '<a href="newmember" id="newmember-tips" style="font-size: 1.2em;"><b>' . L10n::t('Tips for New Members') . '</b></a>' . EOL; $o .= '<div id="newmember-tips"><a href="newmember"><b>' . L10n::t('Tips for New Members') . '</b></a></div>';
} }
$commpage = $a->profile['page-flags'] == PAGE_COMMUNITY; $commpage = $a->profile['page-flags'] == PAGE_COMMUNITY;

31
src/Content/Widget.php
View File

@ -55,19 +55,24 @@ class Widget
} }
} }
return replace_macros(get_markup_template('peoplefind.tpl'), array( $nv = [];
'$findpeople' => L10n::t('Find People'), $nv['findpeople'] = L10n::t('Find People');
'$desc' => L10n::t('Enter name or interest'), $nv['desc'] = L10n::t('Enter name or interest');
'$label' => L10n::t('Connect/Follow'), $nv['label'] = L10n::t('Connect/Follow');
'$hint' => L10n::t('Examples: Robert Morgenstein, Fishing'), $nv['hint'] = L10n::t('Examples: Robert Morgenstein, Fishing');
'$findthem' => L10n::t('Find'), $nv['findthem'] = L10n::t('Find');
'$suggest' => L10n::t('Friend Suggestions'), $nv['suggest'] = L10n::t('Friend Suggestions');
'$similar' => L10n::t('Similar Interests'), $nv['similar'] = L10n::t('Similar Interests');
'$random' => L10n::t('Random Profile'), $nv['random'] = L10n::t('Random Profile');
'$inv' => L10n::t('Invite Friends'), $nv['inv'] = L10n::t('Invite Friends');
'$directory' => L10n::t('View Global Directory'), $nv['directory'] = L10n::t('Global Directory');
'$global_dir' => $global_dir $nv['global_dir'] = $global_dir;
)); $nv['local_directory'] = L10n::t('Local Directory');
$aside = [];
$aside['$nv'] = $nv;
return replace_macros(get_markup_template('peoplefind.tpl'), $aside);
} }
/** /**

3
util/credits.txt
View File

@ -12,6 +12,7 @@ Alexandre Alapetite
AlfredSK AlfredSK
Andi Stadler Andi Stadler
Andreas H. Andreas H.
Andreas Neustifter
Andrej Stieben Andrej Stieben
André Alves André Alves
André Lohan André Lohan
@ -209,4 +210,4 @@ zotlabs
zottel zottel
Zvi ben Yaakov (a.k.a rdc) Zvi ben Yaakov (a.k.a rdc)
Михаил Михаил
朱陈锬 朱陈锬

8
view/global.css
View File

@ -202,9 +202,17 @@ blockquote.shared_content {
} }
#profile-photo-wrapper { #profile-photo-wrapper {
clear: both;
overflow: hidden; overflow: hidden;
} }
#newmember-tips {
font-size: 1.2em;
float: right;
margin-top: -32px;
padding-right: 10px;
}
/* headers */ /* headers */
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
margin: 5px 0px 5px 0px; margin: 5px 0px 5px 0px;

4
view/templates/paginate.tpl
View File

@ -1,5 +1,5 @@
{{if $pager && ($pager.prev || $pager.next)}}
<div class="pager"> <div class="pager">
{{if $pager}}
{{if $pager.prev}}<span class="pager_prev {{$pager.prev.class}}"><a href="{{$pager.prev.url}}">{{$pager.prev.text}}</a></span>{{/if}} {{if $pager.prev}}<span class="pager_prev {{$pager.prev.class}}"><a href="{{$pager.prev.url}}">{{$pager.prev.text}}</a></span>{{/if}}
{{if $pager.first}}<span class="pager_first {{$pager.first.class}}"><a href="{{$pager.first.url}}">{{$pager.first.text}}</a></span>{{/if}} {{if $pager.first}}<span class="pager_first {{$pager.first.class}}"><a href="{{$pager.first.url}}">{{$pager.first.text}}</a></span>{{/if}}
@ -9,5 +9,5 @@
{{if $pager.last}}&nbsp;<span class="pager_last {{$pager.last.class}}"><a href="{{$pager.last.url}}">{{$pager.last.text}}</a></span>{{/if}} {{if $pager.last}}&nbsp;<span class="pager_last {{$pager.last.class}}"><a href="{{$pager.last.url}}">{{$pager.last.text}}</a></span>{{/if}}
{{if $pager.next}}<span class="pager_next {{$pager.next.class}}"><a href="{{$pager.next.url}}">{{$pager.next.text}}</a></span>{{/if}} {{if $pager.next}}<span class="pager_next {{$pager.next.class}}"><a href="{{$pager.next.url}}">{{$pager.next.text}}</a></span>{{/if}}
{{/if}}
</div> </div>
{{/if}}

19
view/templates/peoplefind.tpl
View File

@ -1,16 +1,17 @@
<div id="peoplefind-sidebar" class="widget"> <div id="peoplefind-sidebar" class="widget">
<h3>{{$findpeople}}</h3> <h3>{{$nv.findpeople}}</h3>
<div id="peoplefind-desc">{{$desc}}</div> <div id="peoplefind-desc">{{$nv.desc}}</div>
<form action="dirfind" method="get" /> <form action="dirfind" method="get" />
<input id="side-peoplefind-url" type="text" name="search" size="24" title="{{$hint|escape:'html'}}" /><input id="side-peoplefind-submit" type="submit" name="submit" value="{{$findthem|escape:'html'}}" /> <input id="side-peoplefind-url" type="text" name="search" size="24" title="{{$nv.hint|escape:'html'}}" /><input id="side-peoplefind-submit" type="submit" name="submit" value="{{$nv.findthem|escape:'html'}}" />
</form> </form>
<div class="side-link" id="side-match-link"><a href="match" >{{$similar}}</a></div> <div class="side-link" id="side-match-link"><a href="match" >{{$nv.similar}}</a></div>
<div class="side-link" id="side-suggest-link"><a href="suggest" >{{$suggest}}</a></div> <div class="side-link" id="side-suggest-link"><a href="suggest" >{{$nv.suggest}}</a></div>
<div class="side-link" id="side-directory-link"><a href="{{$global_dir}}" target="extlink" >{{$directory}}</a></div> <div class="side-link" id="side-directory-link"><a href="directory" >{{$nv.local_directory}}</a></div>
<div class="side-link" id="side-random-profile-link" ><a href="randprof" target="extlink" >{{$random}}</a></div> <div class="side-link" id="side-directory-link"><a href="{{$nv.global_dir}}" target="extlink" >{{$nv.directory}}</a></div>
{{if $inv}} <div class="side-link" id="side-random-profile-link" ><a href="randprof" target="extlink" >{{$nv.random}}</a></div>
<div class="side-link" id="side-invite-link" ><a href="invite" >{{$inv}}</a></div> {{if $nv.inv}}
<div class="side-link" id="side-invite-link" ><a href="invite" >{{$nv.inv}}</a></div>
{{/if}} {{/if}}
</div> </div>

21
view/theme/frio/templates/peoplefind.tpl
View File

@ -1,22 +1,23 @@
<div id="peoplefind-sidebar" class="widget"> <div id="peoplefind-sidebar" class="widget">
<h3>{{$findpeople}}</h3> <h3>{{$nv.findpeople}}</h3>
<form action="dirfind" method="get"> <form action="dirfind" method="get">
{{* The search field *}} {{* The search field *}}
<label for="side-peoplefind-url" id="peoplefind-desc">{{$desc}}</label> <label for="side-peoplefind-url" id="peoplefind-desc">{{$nv.desc}}</label>
<div class="form-group form-group-search"> <div class="form-group form-group-search">
<input id="side-peoplefind-url" class="search-input form-control form-search" type="text" name="search" data-toggle="tooltip" title="{{$hint|escape:'html'}}" /> <input id="side-peoplefind-url" class="search-input form-control form-search" type="text" name="search" data-toggle="tooltip" title="{{$nv.hint|escape:'html'}}" />
<button id="side-peoplefind-submit" class="btn btn-default btn-sm form-button-search" type="submit">{{$findthem}}</button> <button id="side-peoplefind-submit" class="btn btn-default btn-sm form-button-search" type="submit">{{$nv.findthem|escape: 'html'}}</button>
</div> </div>
</form> </form>
{{* Directory links *}}
<div class="side-link" id="side-directory-link"><a href="directory" >{{$nv.local_directory}}</a></div>
<div class="side-link" id="side-directory-link"><a href="{{$nv.global_dir}}" target="extlink" >{{$nv.directory}}</a></div>
{{* Additional links *}} {{* Additional links *}}
<div class="side-link" id="side-match-link"><a href="match" >{{$similar}}</a></div> <div class="side-link" id="side-match-link"><a href="match" >{{$nv.similar}}</a></div>
<div class="side-link" id="side-suggest-link"><a href="suggest" >{{$suggest}}</a></div> <div class="side-link" id="side-suggest-link"><a href="suggest" >{{$nv.suggest}}</a></div>
{{if $inv}} {{if $nv.inv}}
<div class="side-link" id="side-invite-link" ><a href="invite" >{{$inv}}</a></div> <div class="side-link" id="side-invite-link" ><a href="invite" >{{$nv.inv}}</a></div>
{{/if}} {{/if}}
</div> </div>

15
view/theme/vier/style.css
View File

@ -1153,9 +1153,9 @@ aside #profiles-menu {
left: 10px; left: 10px;
} }
aside #search-text, aside #side-follow-url, aside #side-peoplefind-url, right_aside input { aside #search-text, aside #side-follow-url, aside #side-peoplefind-url, right_aside #side-peoplefind-url {
width: 140px; width: 65%;
height: 17px; float: left;
padding-left: 10px; padding-left: 10px;
/*border-top-left-radius: 15px; /*border-top-left-radius: 15px;
border-top-right-radius: 15px; border-top-right-radius: 15px;
@ -1167,6 +1167,15 @@ aside #search-text, aside #side-follow-url, aside #side-peoplefind-url, right_as
-moz-border-right-colors: #dbdbdb;*/ -moz-border-right-colors: #dbdbdb;*/
} }
aside #side-peoplefind-submit, right_aside #side-peoplefind-submit {
width: 25%;
float: right;
}
#side-match-link {
clear: both;
}
aside h4, right_aside h4 { aside h4, right_aside h4 {
margin-bottom: 0px; margin-bottom: 0px;
margin-top: 0px; margin-top: 0px;

12
view/theme/vier/templates/communityhome.tpl
View File

@ -39,17 +39,7 @@
{{/if}} {{/if}}
{{if $nv}} {{if $nv}}
<div id="right_friends" class="widget"> {{include file='peoplefind.tpl' nv=$nv}}
<h3>{{$nv.title.1}}</h3>
<ul role="menu">
<li class="tool" role="menuitem"><a class="{{$nv.directory.2}}" href="{{$nv.directory.0}}" title="{{$nv.directory.3}}" >{{$nv.directory.1}}</a></li>
<li class="tool" role="menuitem"><a class="{{$nv.global_directory.2}}" href="{{$nv.global_directory.0}}" target="blank" title="{{$nv.global_directory.3}}" >{{$nv.global_directory.1}}</a></li>
<li class="tool" role="menuitem"><a class="{{$nv.match.2}}" href="{{$nv.match.0}}" title="{{$nv.match.3}}" >{{$nv.match.1}}</a></li>
<li class="tool" role="menuitem"><a class="{{$nv.suggest.2}}" href="{{$nv.suggest.0}}" title="{{$nv.suggest.3}}" >{{$nv.suggest.1}}</a></li>
<li class="tool" role="menuitem"><a class="{{$nv.invite.2}}" href="{{$nv.invite.0}}" title="{{$nv.invite.3}}" >{{$nv.invite.1}}</a></li>
</ul>
{{$nv.search}}
</div>
{{/if}} {{/if}}
{{if $lastusers_title}} {{if $lastusers_title}}

25
view/theme/vier/theme.php
View File

@ -196,19 +196,18 @@ function vier_community_info()
//right_aside FIND FRIENDS //right_aside FIND FRIENDS
if ($show_friends && local_user()) { if ($show_friends && local_user()) {
$nv = []; $nv = [];
$nv['title'] = ["", L10n::t('Find Friends'), "", ""]; $nv['findpeople'] = L10n::t('Find People');
$nv['directory'] = ['directory', L10n::t('Local Directory'), "", ""]; $nv['desc'] = L10n::t('Enter name or interest');
$nv['global_directory'] = [get_server(), L10n::t('Global Directory'), "", ""]; $nv['label'] = L10n::t('Connect/Follow');
$nv['match'] = ['match', L10n::t('Similar Interests'), "", ""]; $nv['hint'] = L10n::t('Examples: Robert Morgenstein, Fishing');
$nv['suggest'] = ['suggest', L10n::t('Friend Suggestions'), "", ""]; $nv['findthem'] = L10n::t('Find');
$nv['invite'] = ['invite', L10n::t('Invite Friends'), "", ""]; $nv['suggest'] = L10n::t('Friend Suggestions');
$nv['similar'] = L10n::t('Similar Interests');
$nv['search'] = '<form name="simple_bar" method="get" action="dirfind"> $nv['random'] = L10n::t('Random Profile');
<span class="sbox_l"></span> $nv['inv'] = L10n::t('Invite Friends');
<span class="sbox"> $nv['directory'] = L10n::t('Global Directory');
<input type="text" name="search" size="13" maxlength="50"> $nv['global_dir'] = get_server();
</span> $nv['local_directory'] = L10n::t('Local Directory');
<span class="sbox_r" id="srch_clear"></span>';
$aside['$nv'] = $nv; $aside['$nv'] = $nv;
} }