diff options
Diffstat (limited to 'view/tpl')
27 files changed, 284 insertions, 23 deletions
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index c6c15cec4..2a7742a3e 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -65,6 +65,7 @@ <h3>{{$corporate}}</h3> {{include file="field_checkbox.tpl" field=$block_public}} + {{include file="field_checkbox.tpl" field=$feed_contacts}} {{include file="field_checkbox.tpl" field=$force_publish}} {{include file="field_checkbox.tpl" field=$disable_discover_tab}} diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index d7ed7d0f4..bfa62f1b7 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -26,7 +26,7 @@ <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.via}} <a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}} </div> <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}"> - {{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i> {{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}, </span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}</span> {{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}} + {{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i> {{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}, </span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}} <i class="icon-pencil"></i>{{/if}} {{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}} </div> <div class="wall-item-content" id="wall-item-content-{{$item.id}}"> <div class="wall-item-title-end"></div> diff --git a/view/tpl/diaspora_comment.tpl b/view/tpl/diaspora_comment.tpl new file mode 100644 index 000000000..27ec3dffc --- /dev/null +++ b/view/tpl/diaspora_comment.tpl @@ -0,0 +1,11 @@ +<XML> + <post> + <comment> + <guid>{{$guid}}</guid> + <parent_guid>{{$parent_guid}}</parent_guid> + <author_signature>{{$authorsig}}</author_signature> + <text>{{$body}}</text> + <diaspora_handle>{{$handle}}</diaspora_handle> + </comment> + </post> +</XML>
\ No newline at end of file diff --git a/view/tpl/diaspora_comment_relay.tpl b/view/tpl/diaspora_comment_relay.tpl new file mode 100644 index 000000000..37a9e88b3 --- /dev/null +++ b/view/tpl/diaspora_comment_relay.tpl @@ -0,0 +1,12 @@ +<XML> + <post> + <comment> + <guid>{{$guid}}</guid> + <parent_guid>{{$parent_guid}}</parent_guid> + <parent_author_signature>{{$parentsig}}</parent_author_signature> + <author_signature>{{$authorsig}}</author_signature> + <text>{{$body}}</text> + <diaspora_handle>{{$handle}}</diaspora_handle> + </comment> + </post> +</XML>
\ No newline at end of file diff --git a/view/tpl/diaspora_conversation.tpl b/view/tpl/diaspora_conversation.tpl new file mode 100644 index 000000000..dc4482e4b --- /dev/null +++ b/view/tpl/diaspora_conversation.tpl @@ -0,0 +1,29 @@ +<XML> + <post> + <conversation> + <guid>{{$conv.guid}}</guid> + <subject>{{$conv.subject}}</subject> + <created_at>{{$conv.created_at}}</created_at> + + {{foreach $conv.messages as $msg}} + + <message> + <guid>{{$msg.guid}}</guid> + <parent_guid>{{$msg.parent_guid}}</parent_guid> + {{if $msg.parent_author_signature}} + <parent_author_signature>{{$msg.parent_author_signature}}</parent_author_signature> + {{/if}} + <author_signature>{{$msg.author_signature}}</author_signature> + <text>{{$msg.text}}</text> + <created_at>{{$msg.created_at}}</created_at> + <diaspora_handle>{{$msg.diaspora_handle}}</diaspora_handle> + <conversation_guid>{{$msg.conversation_guid}}</conversation_guid> + </message> + + {{/foreach}} + + <diaspora_handle>{{$conv.diaspora_handle}}</diaspora_handle> + <participant_handles>{{$conv.participant_handles}}</participant_handles> + </conversation> + </post> +</XML> diff --git a/view/tpl/diaspora_like.tpl b/view/tpl/diaspora_like.tpl new file mode 100644 index 000000000..a27e92240 --- /dev/null +++ b/view/tpl/diaspora_like.tpl @@ -0,0 +1,12 @@ +<XML> + <post> + <like> + <positive>{{$positive}}</positive> + <guid>{{$guid}}</guid> + <target_type>{{$target_type}}</target_type> + <parent_guid>{{$parent_guid}}</parent_guid> + <author_signature>{{$authorsig}}</author_signature> + <diaspora_handle>{{$handle}}</diaspora_handle> + </like> + </post> +</XML> diff --git a/view/tpl/diaspora_like_relay.tpl b/view/tpl/diaspora_like_relay.tpl new file mode 100644 index 000000000..8209540c5 --- /dev/null +++ b/view/tpl/diaspora_like_relay.tpl @@ -0,0 +1,13 @@ +<XML> + <post> + <like> + <positive>{{$positive}}</positive> + <guid>{{$guid}}</guid> + <target_type>{{$target_type}}</target_type> + <parent_guid>{{$parent_guid}}</parent_guid> + <parent_author_signature>{{$parentsig}}</parent_author_signature> + <author_signature>{{$authorsig}}</author_signature> + <diaspora_handle>{{$handle}}</diaspora_handle> + </like> + </post> +</XML> diff --git a/view/tpl/diaspora_message.tpl b/view/tpl/diaspora_message.tpl new file mode 100644 index 000000000..3413d79b0 --- /dev/null +++ b/view/tpl/diaspora_message.tpl @@ -0,0 +1,13 @@ +<XML> + <post> + <message> + <guid>{{$msg.guid}}</guid> + <parent_guid>{{$msg.parent_guid}}</parent_guid> + <author_signature>{{$msg.author_signature}}</author_signature> + <text>{{$msg.text}}</text> + <created_at>{{$msg.created_at}}</created_at> + <diaspora_handle>{{$msg.diaspora_handle}}</diaspora_handle> + <conversation_guid>{{$msg.conversation_guid}}</conversation_guid> + </message> + </post> +</XML> diff --git a/view/tpl/diaspora_photo.tpl b/view/tpl/diaspora_photo.tpl new file mode 100644 index 000000000..256459d8d --- /dev/null +++ b/view/tpl/diaspora_photo.tpl @@ -0,0 +1,13 @@ +<XML> + <post> + <photo> + <guid>{{$guid}}</guid> + <diaspora_handle>{{$handle}}</diaspora_handle> + <public>{{$public}}</public> + <created_at>{{$created_at}}</created_at> + <remote_photo_path>{{$path}}</remote_photo_path> + <remote_photo_name>{{$filename}}</remote_photo_name> + <status_message_guid>{{$msg_guid}}</status_message_guid> + </photo> + </post> +</XML> diff --git a/view/tpl/diaspora_post.tpl b/view/tpl/diaspora_post.tpl new file mode 100644 index 000000000..2fe916e00 --- /dev/null +++ b/view/tpl/diaspora_post.tpl @@ -0,0 +1,12 @@ +<XML> + <post> + <status_message> + <raw_message>{{$body}}</raw_message> + <guid>{{$guid}}</guid> + <diaspora_handle>{{$handle}}</diaspora_handle> + <public>{{$public}}</public> + <created_at>{{$created}}</created_at> + <provider_display_name>{{$provider}}</provider_display_name> + </status_message> + </post> +</XML> diff --git a/view/tpl/diaspora_profile.tpl b/view/tpl/diaspora_profile.tpl new file mode 100644 index 000000000..cf53f51c0 --- /dev/null +++ b/view/tpl/diaspora_profile.tpl @@ -0,0 +1,16 @@ +<XML> + <post><profile> + <diaspora_handle>{{$handle}}</diaspora_handle> + <first_name>{{$first}}</first_name> + <last_name>{{$last}}</last_name> + <image_url>{{$large}}</image_url> + <image_url_medium>{{$medium}}</image_url_medium> + <image_url_small>{{$small}}</image_url_small> + <birthday>{{$dob}}</birthday> + <gender>{{$gender}}</gender> + <bio>{{$about}}</bio> + <location>{{$location}}</location> + <searchable>{{$searchable}}</searchable> + <tag_string>{{$tags}}</tag_string> + </profile></post> +</XML> diff --git a/view/tpl/diaspora_relay_retraction.tpl b/view/tpl/diaspora_relay_retraction.tpl new file mode 100644 index 000000000..5e7aed41f --- /dev/null +++ b/view/tpl/diaspora_relay_retraction.tpl @@ -0,0 +1,10 @@ +<XML> + <post> + <relayable_retraction> + <target_type>{{$type}}</target_type> + <target_guid>{{$guid}}</target_guid> + <target_author_signature>{{$signature}}</target_author_signature> + <sender_handle>{{$handle}}</sender_handle> + </relayable_retraction> + </post> +</XML> diff --git a/view/tpl/diaspora_relayable_retraction.tpl b/view/tpl/diaspora_relayable_retraction.tpl new file mode 100644 index 000000000..4e3ff3243 --- /dev/null +++ b/view/tpl/diaspora_relayable_retraction.tpl @@ -0,0 +1,11 @@ +<XML> + <post> + <relayable_retraction> + <parent_author_signature>{{$parentsig}}</parent_author_signature> + <target_guid>{{$guid}}</target_guid> + <target_type>{{$target_type}}</target_type> + <sender_handle>{{$handle}}</sender_handle> + <target_author_signature>{{$authorsig}}</target_author_signature> + </relayable_retraction> + </post> +</XML> diff --git a/view/tpl/diaspora_reshare.tpl b/view/tpl/diaspora_reshare.tpl new file mode 100644 index 000000000..963bb9e12 --- /dev/null +++ b/view/tpl/diaspora_reshare.tpl @@ -0,0 +1,13 @@ +<XML> + <post> + <reshare> + <root_diaspora_id>{{$root_handle}}</root_diaspora_id> + <root_guid>{{$root_guid}}</root_guid> + <guid>{{$guid}}</guid> + <diaspora_handle>{{$handle}}</diaspora_handle> + <public>{{$public}}</public> + <created_at>{{$created}}</created_at> + <provider_display_name>{{$provider}}</provider_display_name> + </reshare> + </post> +</XML> diff --git a/view/tpl/diaspora_retract.tpl b/view/tpl/diaspora_retract.tpl new file mode 100644 index 000000000..9df066d38 --- /dev/null +++ b/view/tpl/diaspora_retract.tpl @@ -0,0 +1,9 @@ +<XML> + <post> + <retraction> + <post_guid>{{$guid}}</post_guid> + <diaspora_handle>{{$handle}}</diaspora_handle> + <type>{{$type}}</type> + </retraction> + </post> +</XML> diff --git a/view/tpl/diaspora_share.tpl b/view/tpl/diaspora_share.tpl new file mode 100644 index 000000000..59eb06124 --- /dev/null +++ b/view/tpl/diaspora_share.tpl @@ -0,0 +1,8 @@ +<XML> + <post> + <request> + <sender_handle>{{$sender}}</sender_handle> + <recipient_handle>{{$recipient}}</recipient_handle> + </request> + </post> +</XML>
\ No newline at end of file diff --git a/view/tpl/diaspora_signed_retract.tpl b/view/tpl/diaspora_signed_retract.tpl new file mode 100644 index 000000000..f0f346da8 --- /dev/null +++ b/view/tpl/diaspora_signed_retract.tpl @@ -0,0 +1,10 @@ +<XML> + <post> + <signed_retraction> + <target_guid>{{$guid}}</target_guid> + <target_type>{{$type}}</target_type> + <sender_handle>{{$handle}}</sender_handle> + <target_author_signature>{{$signature}}</target_author_signature> + </signed_retraction> + </post> +</XML> diff --git a/view/tpl/diaspora_vcard.tpl b/view/tpl/diaspora_vcard.tpl new file mode 100644 index 000000000..9d234a398 --- /dev/null +++ b/view/tpl/diaspora_vcard.tpl @@ -0,0 +1,57 @@ +<div style="display:none;"> + <dl class='entity_nickname'> + <dt>Nickname</dt> + <dd> + <a class="nickname url uid" href="{{$diaspora.podloc}}/" rel="me">{{$diaspora.nickname}}</a> + </dd> + </dl> + <dl class='entity_fn'> + <dt>Full name</dt> + <dd> + <span class='fn'>{{$diaspora.fullname}}</span> + </dd> + </dl> + + <dl class='entity_given_name'> + <dt>First name</dt> + <dd> + <span class='given_name'>{{$diaspora.firstname}}</span> + </dd> + </dl> + <dl class='entity_family_name'> + <dt>Family name</dt> + <dd> + <span class='family_name'>{{$diaspora.lastname}}</span> + </dd> + </dl> + <dl class="entity_url"> + <dt>URL</dt> + <dd> + <a class="url" href="{{$diaspora.podloc}}/" id="pod_location" rel="me">{{$diaspora.podloc}}/</a> + </dd> + </dl> + <dl class="entity_photo"> + <dt>Photo</dt> + <dd> + <img class="photo avatar" height="300" width="300" src="{{$diaspora.photo300}}"> + </dd> + </dl> + <dl class="entity_photo_medium"> + <dt>Photo</dt> + <dd> + <img class="photo avatar" height="100" width="100" src="{{$diaspora.photo100}}"> + </dd> + </dl> + <dl class="entity_photo_small"> + <dt>Photo</dt> + <dd> + <img class="photo avatar" height="50" width="50" src="{{$diaspora.photo50}}"> + </dd> + </dl> + <dl class="entity_searchable"> + <dt>Searchable</dt> + <dd> + <span class="searchable">{{$diaspora.searchable}}</span> + </dd> + </dl> +</div> diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl index 342491ded..89de170b7 100755 --- a/view/tpl/field_acheckbox.tpl +++ b/view/tpl/field_acheckbox.tpl @@ -6,7 +6,7 @@ <input type="checkbox" name='them_{{$field.0}}' id='them_id_{{$field.0}}' value="1" disabled="disabled" {{if $field.2}}checked="checked"{{/if}} /> </td> <td class="abook-me"> - <input type="checkbox" name='{{$field.0}}' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} /> + <input type="checkbox" name='{{$field.0}}' class='abook-edit-me' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} /> </td> <td> {{if $field.5}}<span class="permission-inherited">{{$inherited}}</span> {{/if}} diff --git a/view/tpl/frphotos.tpl b/view/tpl/frphotos.tpl deleted file mode 100644 index b8e978825..000000000 --- a/view/tpl/frphotos.tpl +++ /dev/null @@ -1,13 +0,0 @@ -<h3>{{$header}}</h3> - -<p class="descriptive-text">{{$desc}}</p> - -<form action="frphotos" method="post" autocomplete="off" > - -{{include file="field_input.tpl" field=$fr_server}} -{{include file="field_input.tpl" field=$fr_username}} -{{include file="field_password.tpl" field=$fr_password}} - -<input type="submit" name="submit" value="{{$submit}}" /> -</form> - diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 0602c72af..2953f3b41 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -20,8 +20,13 @@ {{/foreach}} <li role="presentation" class="divider"></li> {{if $nav.profiles}}<li role="presentation"><a href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" role="menuitem">{{$nav.profiles.1}}</a></li>{{/if}} - {{if $nav.manage}}<li role="presentation"><a href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem">{{$nav.manage.1}}</a></li>{{/if}} {{if $nav.settings}}<li role="presentation"><a href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem">{{$nav.settings.1}}</a></li>{{/if}} + {{if $nav.manage}}<li role="presentation"><a href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem">{{$nav.manage.1}}</a></li>{{/if}} + {{if $nav.channels}} + {{foreach $nav.channels as $chan}} + <li role="presentation" class="nav-channel-select"><a href="manage/{{$chan.channel_id}}" title="{{$chan.channel_name}}" role="menuitem">{{$chan.channel_name}}</a></li> + {{/foreach}} + {{/if}} {{if $nav.admin}} <li role="presentation" class="divider"></li> <li role="presentation"><a href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem">{{$nav.admin.1}}</a></li> diff --git a/view/tpl/notifications.tpl b/view/tpl/notifications.tpl index ae87c8ec8..285efbae0 100755 --- a/view/tpl/notifications.tpl +++ b/view/tpl/notifications.tpl @@ -1,6 +1,6 @@ <h1>{{$notif_header}}</h1> {{if $notifications_available}} -<a href="#" onclick="markRead('notify');">{{$notif_link_mark_seen}}</a> +<a href="#" onclick="markRead('notify'); setTimeout(function() { window.location.href=window.location.href; },1500); return false;">{{$notif_link_mark_seen}}</a> {{/if}} <div class="notif-network-wrapper"> {{$notif_content}} diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index 0e902e9e2..b453b1cfa 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -9,12 +9,12 @@ <div id="profile-edit-links"> <span class="btn btn-default"><a href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}">{{$profpic}}</a></span> <span class="btn btn-default"><a href="profile/{{$profile_id}}/view" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></span> -{{if ! $default}}<span class="btn btn-default"><a href="profperm/{{$profile_id}}" id="profile-edit-view-link" title="{{$editvis}}">{{$editvis}}</a></span>{{/if}} +{{if ! $is_default}}<span class="btn btn-default"><a href="profperm/{{$profile_id}}" id="profile-edit-view-link" title="{{$editvis}}">{{$editvis}}</a></span>{{/if}} {{if $profile_clone_link}}<span class="btn btn-default"><a href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a></span>{{/if}} {{if $exportable}}<br /><span class="btn btn-default"><a href="profiles/export/{{$profile_id}}" target="_blank">{{$lbl_export}}</a></span> <span class="btn btn-default profile-import"><b>{{$lbl_import}}</b> <input type="file" name="userfile" class="profile-import" ></span> {{/if}} -{{if ! $default}}<span class="btn btn-danger"><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" onclick="return confirmDelete();" {{$disabled}} >{{$del_prof}}</a></span>{{/if}} +{{if ! $is_default}}<span class="btn btn-danger"><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" onclick="return confirmDelete();" {{$disabled}} >{{$del_prof}}</a></span>{{/if}} </div> @@ -349,6 +349,11 @@ <div id="education-jot-end"></div> {{/if}} +{{if $extra_fields}} +{{foreach $extra_fields as $field }} +{{include file="field_input.tpl" field=$field}} +{{/foreach}} +{{/if}} <div class="profile-edit-submit-wrapper" > <input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" /> diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index a653dca7d..3c83cd685 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -2,7 +2,7 @@ {{if $profile.edit}} <div class="dropdown"> - <a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil btn btn-default btn-xs" title="{{$profile.edit.1}}" ></i></a> + <a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil" title="{{$profile.edit.1}}" ></i></a> <ul class="dropdown-menu" role="menu"> {{foreach $profile.menu.entries as $e}} <li> @@ -15,7 +15,7 @@ </div> {{/if}} - <div class="fn label">{{$profile.name}}{{if $profile.online}} <i class="icon-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div> + <div class="fn">{{$profile.name}}{{if $profile.online}} <i class="icon-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div> {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}} <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div> @@ -43,6 +43,9 @@ {{if $homepage}}<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a href="{{$profile.homepage}}" >{{$profile.homepage}}</a></dd></dl>{{/if}} + {{if $diaspora}} + {{include file="diaspora_vcard.tpl"}} + {{/if}} {{if $connect}} <a href="{{$connect_url}}" class="rconnect"><i class="icon-plus connect-icon"></i> {{$connect}}</a> diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index f86ee0202..6719f2e75 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -20,7 +20,7 @@ <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.via}} <a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}} </div> <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}"> - {{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i> {{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}, </span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}} + {{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i> {{/if}}{{if $item.location}}<span class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}, </span>{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}</span>{{if $item.editedtime}} <i class="icon-pencil"></i>{{/if}} {{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}} </div> <div class="wall-item-content" id="wall-item-content-{{$item.id}}"> <div class="wall-item-title-end"></div> diff --git a/view/tpl/xrd_diaspora.tpl b/view/tpl/xrd_diaspora.tpl new file mode 100644 index 000000000..aa0d8c740 --- /dev/null +++ b/view/tpl/xrd_diaspora.tpl @@ -0,0 +1,3 @@ + <Link rel="http://joindiaspora.com/seed_location" type="text/html" href="{{$baseurl}}/" /> + <Link rel="http://joindiaspora.com/guid" type="text/html" href="{{$dspr_guid}}" /> + <Link rel="diaspora-public-key" type="RSA" href="{{$dspr_key}}" /> diff --git a/view/tpl/xrd_person.tpl b/view/tpl/xrd_person.tpl index 20d438dd5..631ed3f18 100755 --- a/view/tpl/xrd_person.tpl +++ b/view/tpl/xrd_person.tpl @@ -14,5 +14,13 @@ <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="magic-public-key" + href="{{$modexp}}" /> + + {{$dspr}} + </XRD> |