diff --git a/mod/profile.php b/mod/profile.php index ab11b4d5fe..d6cbd276ff 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -191,7 +191,7 @@ function profile_content(App $a, $update = 0) $o .= Widget::commonFriendsVisitor($a->profile['profile_uid']); if (x($_SESSION, 'new_member') && $is_owner) { - $o .= '' . L10n::t('Tips for New Members') . '' . EOL; + $o .= '
' . L10n::t('Tips for New Members') . '
'; } $commpage = $a->profile['page-flags'] == PAGE_COMMUNITY; diff --git a/src/Content/Widget.php b/src/Content/Widget.php index 058a7a1fb5..04dfbb8e03 100644 --- a/src/Content/Widget.php +++ b/src/Content/Widget.php @@ -55,19 +55,24 @@ class Widget } } - return replace_macros(get_markup_template('peoplefind.tpl'), array( - '$findpeople' => L10n::t('Find People'), - '$desc' => L10n::t('Enter name or interest'), - '$label' => L10n::t('Connect/Follow'), - '$hint' => L10n::t('Examples: Robert Morgenstein, Fishing'), - '$findthem' => L10n::t('Find'), - '$suggest' => L10n::t('Friend Suggestions'), - '$similar' => L10n::t('Similar Interests'), - '$random' => L10n::t('Random Profile'), - '$inv' => L10n::t('Invite Friends'), - '$directory' => L10n::t('View Global Directory'), - '$global_dir' => $global_dir - )); + $nv = []; + $nv['findpeople'] = L10n::t('Find People'); + $nv['desc'] = L10n::t('Enter name or interest'); + $nv['label'] = L10n::t('Connect/Follow'); + $nv['hint'] = L10n::t('Examples: Robert Morgenstein, Fishing'); + $nv['findthem'] = L10n::t('Find'); + $nv['suggest'] = L10n::t('Friend Suggestions'); + $nv['similar'] = L10n::t('Similar Interests'); + $nv['random'] = L10n::t('Random Profile'); + $nv['inv'] = L10n::t('Invite Friends'); + $nv['directory'] = L10n::t('Global Directory'); + $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); } /** diff --git a/util/credits.txt b/util/credits.txt index c6a5c3f319..e24f45f8a5 100644 --- a/util/credits.txt +++ b/util/credits.txt @@ -12,6 +12,7 @@ Alexandre Alapetite AlfredSK Andi Stadler Andreas H. +Andreas Neustifter Andrej Stieben André Alves André Lohan @@ -209,4 +210,4 @@ zotlabs zottel Zvi ben Yaakov (a.k.a rdc) Михаил -朱陈锬 \ No newline at end of file +朱陈锬 diff --git a/view/global.css b/view/global.css index 30dbeeff09..9d62cf0306 100644 --- a/view/global.css +++ b/view/global.css @@ -202,9 +202,17 @@ blockquote.shared_content { } #profile-photo-wrapper { + clear: both; overflow: hidden; } +#newmember-tips { + font-size: 1.2em; + float: right; + margin-top: -32px; + padding-right: 10px; +} + /* headers */ h1, h2, h3, h4, h5, h6 { margin: 5px 0px 5px 0px; diff --git a/view/templates/paginate.tpl b/view/templates/paginate.tpl index fcd580b071..ee9a1cc330 100644 --- a/view/templates/paginate.tpl +++ b/view/templates/paginate.tpl @@ -1,5 +1,5 @@ +{{if $pager && ($pager.prev || $pager.next)}}
- {{if $pager}} {{if $pager.prev}}{{$pager.prev.text}}{{/if}} {{if $pager.first}}{{$pager.first.text}}{{/if}} @@ -9,5 +9,5 @@ {{if $pager.last}} {{$pager.last.text}}{{/if}} {{if $pager.next}}{{$pager.next.text}}{{/if}} - {{/if}}
+{{/if}} diff --git a/view/templates/peoplefind.tpl b/view/templates/peoplefind.tpl index 481bdd71e0..67f7a8086b 100644 --- a/view/templates/peoplefind.tpl +++ b/view/templates/peoplefind.tpl @@ -1,16 +1,17 @@
-

{{$findpeople}}

-
{{$desc}}
+

{{$nv.findpeople}}

+
{{$nv.desc}}
- +
- - - - - {{if $inv}} - + + + + + + {{if $nv.inv}} + {{/if}}
diff --git a/view/theme/frio/templates/peoplefind.tpl b/view/theme/frio/templates/peoplefind.tpl index 5a84f26c8f..f5bf57c02d 100644 --- a/view/theme/frio/templates/peoplefind.tpl +++ b/view/theme/frio/templates/peoplefind.tpl @@ -1,22 +1,23 @@ -
-

{{$findpeople}}

+

{{$nv.findpeople}}

{{* The search field *}} - +
- - + +
+ {{* Directory links *}} + + {{* Additional links *}} - - + + - {{if $inv}} - + {{if $nv.inv}} + {{/if}}
- diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index 507b4b5709..710c76f6af 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -1153,9 +1153,9 @@ aside #profiles-menu { left: 10px; } -aside #search-text, aside #side-follow-url, aside #side-peoplefind-url, right_aside input { - width: 140px; - height: 17px; +aside #search-text, aside #side-follow-url, aside #side-peoplefind-url, right_aside #side-peoplefind-url { + width: 65%; + float: left; padding-left: 10px; /*border-top-left-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;*/ } +aside #side-peoplefind-submit, right_aside #side-peoplefind-submit { + width: 25%; + float: right; +} + +#side-match-link { + clear: both; +} + aside h4, right_aside h4 { margin-bottom: 0px; margin-top: 0px; diff --git a/view/theme/vier/templates/communityhome.tpl b/view/theme/vier/templates/communityhome.tpl index a85b4419f8..b32b638042 100644 --- a/view/theme/vier/templates/communityhome.tpl +++ b/view/theme/vier/templates/communityhome.tpl @@ -39,17 +39,7 @@ {{/if}} {{if $nv}} -
-

{{$nv.title.1}}

- -{{$nv.search}} -
+{{include file='peoplefind.tpl' nv=$nv}} {{/if}} {{if $lastusers_title}} diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php index e758cb6515..c752594653 100644 --- a/view/theme/vier/theme.php +++ b/view/theme/vier/theme.php @@ -196,19 +196,18 @@ function vier_community_info() //right_aside FIND FRIENDS if ($show_friends && local_user()) { $nv = []; - $nv['title'] = ["", L10n::t('Find Friends'), "", ""]; - $nv['directory'] = ['directory', L10n::t('Local Directory'), "", ""]; - $nv['global_directory'] = [get_server(), L10n::t('Global Directory'), "", ""]; - $nv['match'] = ['match', L10n::t('Similar Interests'), "", ""]; - $nv['suggest'] = ['suggest', L10n::t('Friend Suggestions'), "", ""]; - $nv['invite'] = ['invite', L10n::t('Invite Friends'), "", ""]; - - $nv['search'] = '
- - - - - '; + $nv['findpeople'] = L10n::t('Find People'); + $nv['desc'] = L10n::t('Enter name or interest'); + $nv['label'] = L10n::t('Connect/Follow'); + $nv['hint'] = L10n::t('Examples: Robert Morgenstein, Fishing'); + $nv['findthem'] = L10n::t('Find'); + $nv['suggest'] = L10n::t('Friend Suggestions'); + $nv['similar'] = L10n::t('Similar Interests'); + $nv['random'] = L10n::t('Random Profile'); + $nv['inv'] = L10n::t('Invite Friends'); + $nv['directory'] = L10n::t('Global Directory'); + $nv['global_dir'] = get_server(); + $nv['local_directory'] = L10n::t('Local Directory'); $aside['$nv'] = $nv; }