friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'friendika/master'

Browse source
This commit is contained in:
Fabio Comuni 2011-09-28 09:27:59 +02:00
commit dccd2da356
15 changed files with 40 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
view/theme/duepuntozero/style.css
View file

@ -507,6 +507,10 @@ input#dfrn-url {
margin-bottom: 30px;
}
#profile-extra-links {
clear: both;
}
#profile-extra-links ul {
list-style-type: none;
padding: 0px;

2
view/theme/duepuntozero/wall_item.tpl
View file

@ -16,7 +16,7 @@
</div>
<div class="wall-item-photo-end"></div>
<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
$lock
{{ if $lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$id);" title="$lock"></span>{{ endif }}
<div class="wall-item-location" id="wall-item-location-$id">$location</div>
</div>
</div>

2
view/theme/duepuntozero/wallwall_item.tpl
View file

@ -21,7 +21,7 @@
</div>
<div class="wall-item-photo-end"></div>
<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
$lock
{{ if $lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$id);" title="$lock"></span>{{ endif }}
<div class="wall-item-location" id="wall-item-location-$id">$location</div>
</div>
</div>

1
view/theme/loozah/style.css
View file

@ -406,6 +406,7 @@ nav {
}
#profile-extra-links {
clear: both;
margin-top: 20px;
margin-bottom: 20px;
margin-left: 20px;

4
view/xrd_host.tpl
View file

@ -21,5 +21,9 @@
type="http://purl.org/zot/1.0/accept"
zot:accept="application/atom+xml" />
<Property xmlns:mk="http://salmon-protocol.org/ns/magic-key"
type="http://salmon-protocol.org/ns/magic-key"
mk:key_id="1">$bigkey</Property>
</XRD>

6
view/xrd_person.tpl
View file

@ -5,7 +5,7 @@
<Alias>$accturi</Alias>
<Alias>$profile_url</Alias>
<Link rel="http://purl.org/zot/1.0/post"
<Link rel="http://purl.org/zot/1.0/post/$nick"
href="$zot_post" />
<Property xmlns:zot="http://purl.og/zot/1.0"
@ -40,4 +40,8 @@
<Link rel="magic-public-key"
href="$modexp" />
<Property xmlns:mk="http://salmon-protocol.org/ns/magic-key"
type="http://salmon-protocol.org/ns/magic-key"
mk:key_id="1">$bigkey</Property>
</XRD>