diff options
| -rw-r--r-- | view/tpl/xrd_host.tpl | 13 | ||||
| -rw-r--r-- | view/tpl/xrd_person.tpl | 38 |
2 files changed, 17 insertions, 34 deletions
diff --git a/view/tpl/xrd_host.tpl b/view/tpl/xrd_host.tpl index 2a40dcf47..43bd94664 100644 --- a/view/tpl/xrd_host.tpl +++ b/view/tpl/xrd_host.tpl @@ -1,11 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> -<XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0' - xmlns:hm='http://host-meta.net/xrd/1.0'> - - <hm:Host>{{$zhost}}</hm:Host> - - <Link rel='lrdd' type="application/xrd+xml" template='{{$zroot}}/xrd/?uri={uri}' /> - <Link rel="http://oexchange.org/spec/0.8/rel/resident-target" type="application/xrd+xml" - href="{{$zroot}}/oexchange/xrd" /> - +<XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0' xmlns:hm='http://host-meta.net/xrd/1.0'> + <hm:Host>{{$zhost}}</hm:Host> + <Link rel='lrdd' type="application/xrd+xml" template='{{$zroot}}/xrd/?uri={uri}' /> + <Link rel="http://oexchange.org/spec/0.8/rel/resident-target" type="application/xrd+xml" href="{{$zroot}}/oexchange/xrd" /> </XRD> diff --git a/view/tpl/xrd_person.tpl b/view/tpl/xrd_person.tpl index 52adb54e3..63f8e0846 100644 --- a/view/tpl/xrd_person.tpl +++ b/view/tpl/xrd_person.tpl @@ -1,28 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0"> - - <Subject>{{$subject}}</Subject> - {{if $aliases}}{{foreach $aliases as $a}} - <Alias>{{$a}}</Alias> - {{/foreach}}{{/if}} - - <Link rel="http://schemas.google.com/g/2010#updates-from" - type="application/atom+xml" - href="{{$atom}}" /> - <Link rel="http://webfinger.net/rel/profile-page" - type="text/html" - href="{{$profile_url}}" /> - <Link rel="http://portablecontacts.net/spec/1.0" - href="{{$poco_url}}" /> - <Link rel="http://webfinger.net/rel/avatar" - type="image/jpeg" - href="{{$photo}}" /> - <Link rel="http://microformats.org/profile/hcard" - type="text/html" - href="{{$hcard_url}}" /> - <Link rel="http://ostatus.org/schema/1.0/subscribe" - template="{{$subscribe}}" /> - <Link rel="magic-public-key" - href="{{$modexp}}" /> - + <Subject>{{$subject}}</Subject> +{{if $aliases}} +{{foreach $aliases as $a}} + <Alias>{{$a}}</Alias> +{{/foreach}} +{{/if}} + <Link rel="http://schemas.google.com/g/2010#updates-from" type="application/atom+xml" href="{{$atom}}" /> + <Link rel="http://webfinger.net/rel/profile-page" type="text/html" href="{{$profile_url}}" /> + <Link rel="http://portablecontacts.net/spec/1.0" href="{{$poco_url}}" /> + <Link rel="http://webfinger.net/rel/avatar" type="image/jpeg" href="{{$photo}}" /> + <Link rel="http://microformats.org/profile/hcard" type="text/html" href="{{$hcard_url}}" /> + <Link rel="http://ostatus.org/schema/1.0/subscribe" template="{{$subscribe}}" /> + <Link rel="magic-public-key" href="{{$modexp}}" /> </XRD> |