bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

transfer some stuff from "follow" to the "notifications" to reduce the differences in the two dialogues.

Browse source
This commit is contained in:
Michael Vogel 2015-10-04 15:55:24 +02:00
parent ba41336099
commit 83ea4f7253
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mod/follow.php
View file

@ -99,9 +99,9 @@ function follow_content(&$a) {
'$request' => $request, '$request' => $request,
'$location' => bbcode($r[0]["location"]), '$location' => bbcode($r[0]["location"]),
'$location_label' => t("Location:"), '$location_label' => t("Location:"),
'$about' => bbcode($r[0]["about"]), '$about' => proxy_parse_html(bbcode($r[0]["about"], false, false)),
'$about_label' => t("About:"), '$about_label' => t("About:"),
'$keywords' => bbcode($r[0]["keywords"]), '$keywords' => $r[0]["keywords"],
'$keywords_label' => t("Tags:") '$keywords_label' => t("Tags:")
)); ));
return $o; return $o;

3
mod/notifications.php
View file

@ -216,7 +216,7 @@ function notifications_content(&$a) {
'$contact_id' => $rr['contact-id'], '$contact_id' => $rr['contact-id'],
'$photo' => ((x($rr,'photo')) ? proxy_url($rr['photo']) : "images/person-175.jpg"), '$photo' => ((x($rr,'photo')) ? proxy_url($rr['photo']) : "images/person-175.jpg"),
'$fullname' => $rr['name'], '$fullname' => $rr['name'],
'$location' => $rr['glocation'], '$location' => bbcode($rr['glocation'], false, false),
'$location_label' => t('Location:'), '$location_label' => t('Location:'),
'$about' => proxy_parse_html(bbcode($rr['gabout'], false, false)), '$about' => proxy_parse_html(bbcode($rr['gabout'], false, false)),
'$about_label' => t('About:'), '$about_label' => t('About:'),
@ -227,6 +227,7 @@ function notifications_content(&$a) {
'$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''), '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''),
'$activity' => array('activity', t('Post a new friend activity'), (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), t('if applicable')), '$activity' => array('activity', t('Post a new friend activity'), (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), t('if applicable')),
'$url' => zrl($rr['url']), '$url' => zrl($rr['url']),
'$url_label' => t('Profile URL'),
'$knowyou' => $knowyou, '$knowyou' => $knowyou,
'$approve' => t('Approve'), '$approve' => t('Approve'),
'$note' => $rr['note'], '$note' => $rr['note'],

1
view/templates/intros.tpl
View file

@ -5,6 +5,7 @@
<p class="intro-desc">{{$str_notifytype}} {{$notify_type}}</p> <p class="intro-desc">{{$str_notifytype}} {{$notify_type}}</p>
<a class="intro-url-link" id="intro-url-link-{{$contact_id}}" href="{{$url}}" ><div class="intro-fullname" id="intro-fullname-{{$contact_id}}" >{{$fullname}}</div></a> <a class="intro-url-link" id="intro-url-link-{{$contact_id}}" href="{{$url}}" ><div class="intro-fullname" id="intro-fullname-{{$contact_id}}" >{{$fullname}}</div></a>
<img id="photo-{{$contact_id}}" class="intro-photo" src="{{$photo}}" width="175" height=175" title="{{$fullname|escape:'html'}}" alt="{{$fullname|escape:'html'}}" /> <img id="photo-{{$contact_id}}" class="intro-photo" src="{{$photo}}" width="175" height=175" title="{{$fullname|escape:'html'}}" alt="{{$fullname|escape:'html'}}" />
<dl><dt>{{$url_label}}</dt><dd><a target="blank" href="{{$url}}">{{$url}}</a></dd></dl>
{{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}} {{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}}
{{if $gender}}<dl><dt>{{$gender_label}}</dt><dd>{{$gender}}</dd></dl>{{/if}} {{if $gender}}<dl><dt>{{$gender_label}}</dt><dd>{{$gender}}</dd></dl>{{/if}}
{{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}} {{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}