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

Merge remote-tracking branch 'upstream/develop' into 1507-new-poco

This commit is contained in:
Michael Vogel 2015-07-18 22:37:39 +02:00
parent cf3214c904 40d3a2f0ef
commit a0734ceede
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/contacts.php
View File

@ -605,6 +605,8 @@ function contacts_content(&$a) {
'$alt_text' => $alt_text,
'$sparkle' => $sparkle,
'$url' => $url,
'$profileurllabel' => t('Profile URL'),
'$profileurl' => $contact['url'],
));

1
view/templates/contact_edit.tpl
View File

@ -20,6 +20,7 @@
<li><div id="contact-edit-rel">{{$relation_text}}</div></li>
{{/if}}
<li><div id="contact-edit-nettype">{{$nettype}}</div></li>
<li><div id="contact-edit-profileurl">{{$profileurllabel}}: <a href="{{$url}}">{{$profileurl}}</a></div></li>
{{if $lost_contact}}
<li><div id="lost-contact-message">{{$lost_contact}}</div></li>
{{/if}}

2
view/templates/photos_upload.tpl
View File

@ -20,7 +20,7 @@
<div id="photos-upload-exist-end"></div>
<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" />
<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" checked/>
<label id="photos-upload-noshare-text" for="photos-upload-noshare" >{{$nosharetext}}</label>
</div>