Merge remote-tracking branch 'upstream/develop' into 1507-new-poco
This commit is contained in:
commit
a0734ceede
|
@ -605,6 +605,8 @@ function contacts_content(&$a) {
|
||||||
'$alt_text' => $alt_text,
|
'$alt_text' => $alt_text,
|
||||||
'$sparkle' => $sparkle,
|
'$sparkle' => $sparkle,
|
||||||
'$url' => $url,
|
'$url' => $url,
|
||||||
|
'$profileurllabel' => t('Profile URL'),
|
||||||
|
'$profileurl' => $contact['url'],
|
||||||
|
|
||||||
));
|
));
|
||||||
|
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
<li><div id="contact-edit-rel">{{$relation_text}}</div></li>
|
<li><div id="contact-edit-rel">{{$relation_text}}</div></li>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
<li><div id="contact-edit-nettype">{{$nettype}}</div></li>
|
<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}}
|
{{if $lost_contact}}
|
||||||
<li><div id="lost-contact-message">{{$lost_contact}}</div></li>
|
<li><div id="lost-contact-message">{{$lost_contact}}</div></li>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
<div id="photos-upload-exist-end"></div>
|
<div id="photos-upload-exist-end"></div>
|
||||||
|
|
||||||
<div id="photos-upload-noshare-div" class="photos-upload-noshare-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>
|
<label id="photos-upload-noshare-text" for="photos-upload-noshare" >{{$nosharetext}}</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue