diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-09-28 09:27:59 +0200 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-09-28 09:27:59 +0200 |
| commit | dccd2da3563389a37ccddbb166bbb3b5ed3a0124 (patch) | |
| tree | 31b646818c906339f01bd4538aee7364f5ef8c9d /view | |
| parent | e986fc3e301f2a0cfb3b975fe60974fc5dcfd76b (diff) | |
| parent | 44d7c6aac3548e94e35aed87ba7c06b04f374fc2 (diff) | |
| download | volse-hubzilla-dccd2da3563389a37ccddbb166bbb3b5ed3a0124.tar.gz volse-hubzilla-dccd2da3563389a37ccddbb166bbb3b5ed3a0124.tar.bz2 volse-hubzilla-dccd2da3563389a37ccddbb166bbb3b5ed3a0124.zip | |
Merge remote-tracking branch 'friendika/master'
Diffstat (limited to 'view')
| -rw-r--r-- | view/theme/duepuntozero/style.css | 4 | ||||
| -rw-r--r-- | view/theme/duepuntozero/wall_item.tpl | 2 | ||||
| -rw-r--r-- | view/theme/duepuntozero/wallwall_item.tpl | 2 | ||||
| -rw-r--r-- | view/theme/loozah/style.css | 1 | ||||
| -rw-r--r-- | view/xrd_host.tpl | 4 | ||||
| -rw-r--r-- | view/xrd_person.tpl | 6 |
6 files changed, 16 insertions, 3 deletions
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index b0aa99a97..1bdd4a99f 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -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; diff --git a/view/theme/duepuntozero/wall_item.tpl b/view/theme/duepuntozero/wall_item.tpl index a81eda765..876f1fc72 100644 --- a/view/theme/duepuntozero/wall_item.tpl +++ b/view/theme/duepuntozero/wall_item.tpl @@ -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> diff --git a/view/theme/duepuntozero/wallwall_item.tpl b/view/theme/duepuntozero/wallwall_item.tpl index a958ba65a..6403b5201 100644 --- a/view/theme/duepuntozero/wallwall_item.tpl +++ b/view/theme/duepuntozero/wallwall_item.tpl @@ -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> diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css index 9289c9354..962d08fc0 100644 --- a/view/theme/loozah/style.css +++ b/view/theme/loozah/style.css @@ -406,6 +406,7 @@ nav { } #profile-extra-links { + clear: both; margin-top: 20px; margin-bottom: 20px; margin-left: 20px; diff --git a/view/xrd_host.tpl b/view/xrd_host.tpl index ee687ffa9..d27f948ac 100644 --- a/view/xrd_host.tpl +++ b/view/xrd_host.tpl @@ -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> diff --git a/view/xrd_person.tpl b/view/xrd_person.tpl index 7373499bf..2b5af3d0d 100644 --- a/view/xrd_person.tpl +++ b/view/xrd_person.tpl @@ -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> |