diff options
Diffstat (limited to 'view/tpl')
29 files changed, 34 insertions, 221 deletions
diff --git a/view/tpl/admin_aside.tpl b/view/tpl/admin_aside.tpl index 58d645dbf..57ac7f3e1 100755 --- a/view/tpl/admin_aside.tpl +++ b/view/tpl/admin_aside.tpl @@ -26,7 +26,7 @@ {{if $admin.update}} <ul class="nav nav-pills nav-stacked"> <li><a href='{{$admin.update.0}}'>{{$admin.update.1}}</a></li> - <li><a href='https://kakste.com/profile/inthegit'>Important Changes</a></li> + <li><a href=''>Important Changes</a></li> </ul> {{/if}} diff --git a/view/tpl/admin_plugins_details.tpl b/view/tpl/admin_plugins_details.tpl index bdcc82c08..6225ae7bf 100755 --- a/view/tpl/admin_plugins_details.tpl +++ b/view/tpl/admin_plugins_details.tpl @@ -4,17 +4,18 @@ <p><i class='toggleplugin {{if $status==on}}icon-check{{else}}icon-check-empty{{/if}} admin-icons'></i> {{$info.name}} - {{$info.version}} : <a href="{{$baseurl}}/admin/{{$function}}/{{$plugin}}/?a=t&t={{$form_security_token}}">{{$action}}</a></p> <p>{{$info.description}}</p> - <p class="author">{{$str_author}} {{foreach $info.author as $a}} - {{if $a.link}}<a href="{{$a.link}}">{{$a.name}}</a>{{else}}{{$a.name}}{{/if}}, - {{/foreach}} + <p class="author">{{$str_author}} + {{$a.name}}{{if $a.link}} {{$a.link}}{{/if}} </p> + {{/foreach}} + - <p class="maintainer">{{$str_maintainer}} {{foreach $info.maintainer as $a}} - {{if $a.link}}<a href="{{$a.link}}">{{$a.name}}</a>{{else}}{{$a.name}}{{/if}}, - {{/foreach}} + <p class="maintainer">{{$str_maintainer}} + {{$a.name}}{{if $a.link}} {{$a.link}}{{/if}} </p> + {{/foreach}} {{if $screenshot}} <a href="{{$screenshot.0}}" class='screenshot'><img src="{{$screenshot.0}}" alt="{{$screenshot.1}}" /></a> diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 4add59a0d..0e65dfa69 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -58,6 +58,7 @@ <h3>{{$registration}}</h3> {{include file="field_input.tpl" field=$register_text}} {{include file="field_select.tpl" field=$register_policy}} + {{include file="field_checkbox.tpl" field=$invite_only}} {{include file="field_select.tpl" field=$access_policy}} {{include file="field_textarea.tpl" field=$allowed_email}} {{include file="field_textarea.tpl" field=$not_allowed_email}} diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 08f0d4fbe..553bc3146 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -26,7 +26,7 @@ <div class="wall-item-photo-end" style="clear:both"></div> </div> {{if $item.title}} - <div class="wall-item-title" id="wall-item-title-{{$item.id}}"> + <div class="wall-item-title" id="wall-item-title-{{$item.id}}" title="{{$item.title}}"> <h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3> </div> {{/if}} diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index cf1310ea6..e7ce22043 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -26,7 +26,7 @@ <div class="wall-item-photo-end" style="clear:both"></div> </div> {{if $item.title}} - <div class="wall-item-title" id="wall-item-title-{{$item.id}}"> + <div class="wall-item-title" id="wall-item-title-{{$item.id}}" title="{{$item.title}}"> <h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3> </div> {{/if}} diff --git a/view/tpl/diaspora_comment.tpl b/view/tpl/diaspora_comment.tpl deleted file mode 100644 index 27ec3dffc..000000000 --- a/view/tpl/diaspora_comment.tpl +++ /dev/null @@ -1,11 +0,0 @@ -<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 deleted file mode 100644 index 37a9e88b3..000000000 --- a/view/tpl/diaspora_comment_relay.tpl +++ /dev/null @@ -1,12 +0,0 @@ -<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_consensus.tpl b/view/tpl/diaspora_consensus.tpl deleted file mode 100644 index b6b7cf13d..000000000 --- a/view/tpl/diaspora_consensus.tpl +++ /dev/null @@ -1,17 +0,0 @@ -<poll> -<guid>{{$guid_q}}</guid> -<question>{{$question}}</question> -<poll_answer> - <guid>{{$guid_y}}</guid> - <answer>{{$agree}}</answer> -</poll_answer> -<poll_answer> - <guid>{{$guid_n}}</guid> - <answer>{{$disagree}}</answer> -</poll_answer> -<poll_answer> - <guid>{{$guid_a}}</guid> - <answer>{{$abstain}}</answer> -</poll_answer> -</poll> - diff --git a/view/tpl/diaspora_conversation.tpl b/view/tpl/diaspora_conversation.tpl deleted file mode 100644 index dc4482e4b..000000000 --- a/view/tpl/diaspora_conversation.tpl +++ /dev/null @@ -1,29 +0,0 @@ -<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 deleted file mode 100644 index a27e92240..000000000 --- a/view/tpl/diaspora_like.tpl +++ /dev/null @@ -1,12 +0,0 @@ -<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 deleted file mode 100644 index 8209540c5..000000000 --- a/view/tpl/diaspora_like_relay.tpl +++ /dev/null @@ -1,13 +0,0 @@ -<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 deleted file mode 100644 index 3413d79b0..000000000 --- a/view/tpl/diaspora_message.tpl +++ /dev/null @@ -1,13 +0,0 @@ -<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 deleted file mode 100644 index 256459d8d..000000000 --- a/view/tpl/diaspora_photo.tpl +++ /dev/null @@ -1,13 +0,0 @@ -<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 deleted file mode 100644 index ebfe9e5b7..000000000 --- a/view/tpl/diaspora_post.tpl +++ /dev/null @@ -1,13 +0,0 @@ -<XML> - <post> - <status_message> - <raw_message>{{$body}}</raw_message> - <guid>{{$guid}}</guid> - <diaspora_handle>{{$handle}}</diaspora_handle> - {{$poll}} - <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_relay_retraction.tpl b/view/tpl/diaspora_relay_retraction.tpl deleted file mode 100644 index 5e7aed41f..000000000 --- a/view/tpl/diaspora_relay_retraction.tpl +++ /dev/null @@ -1,10 +0,0 @@ -<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 deleted file mode 100644 index 4e3ff3243..000000000 --- a/view/tpl/diaspora_relayable_retraction.tpl +++ /dev/null @@ -1,11 +0,0 @@ -<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 deleted file mode 100644 index 963bb9e12..000000000 --- a/view/tpl/diaspora_reshare.tpl +++ /dev/null @@ -1,13 +0,0 @@ -<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 deleted file mode 100644 index 9df066d38..000000000 --- a/view/tpl/diaspora_retract.tpl +++ /dev/null @@ -1,9 +0,0 @@ -<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 deleted file mode 100644 index 59eb06124..000000000 --- a/view/tpl/diaspora_share.tpl +++ /dev/null @@ -1,8 +0,0 @@ -<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 deleted file mode 100644 index f0f346da8..000000000 --- a/view/tpl/diaspora_signed_retract.tpl +++ /dev/null @@ -1,10 +0,0 @@ -<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/direntry.tpl b/view/tpl/direntry.tpl index 6407f1edd..ecc38beb9 100755 --- a/view/tpl/direntry.tpl +++ b/view/tpl/direntry.tpl @@ -14,7 +14,7 @@ </div> <h3>{{if $entry.public_forum}}<i class="icon-comments-alt" title="{{$entry.forum_label}} @{{$entry.nickname}}+"></i> {{/if}}<a href='{{$entry.profile_link}}' >{{$entry.name}}</a>{{if $entry.online}} <i class="icon-asterisk online-now" title="{{$entry.online}}"></i>{{/if}}</h3> </div> - <div class="section-content-wrapper directory-collapse"> + <div class="section-content-tools-wrapper directory-collapse"> <div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.hash}}" > <div class="contact-photo" id="directory-photo-{{$entry.hash}}" > <a href="{{$entry.profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$entry.hash}}" > diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl index e99128bbb..d85c234f1 100755 --- a/view/tpl/field_acheckbox.tpl +++ b/view/tpl/field_acheckbox.tpl @@ -13,6 +13,7 @@ <input type="checkbox" name='{{$field.0}}' class='abook-edit-me' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} /> {{/if}} {{if $notself && $field.5}} + <input type="hidden" name='{{$field.0}}' value="{{if $field.7}}1{{else}}0{{/if}}" /> {{if $field.3}}<i class="icon-check"></i>{{else}}<i class="icon-check-empty"></i>{{/if}} {{/if}} </td> diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index e7edb7e64..32a08a9b3 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -118,8 +118,6 @@ <li class="divider visible-xs"></li> {{if $writefiles}}<li class="visible-xs"><a id="wall-file-upload-sub" href="#" ><i class="icon-paper-clip"></i> {{$attach}}</a></li>{{/if}} <li class="visible-xs"><a href="#" onclick="jotGetLink(); return false;"><i class="icon-link"></i> {{$weblink}}</a></li> - <!--li class="visible-xs"><a href="#" onclick="jotVideoURL(); return false;"><i class="icon-facetime-video"></i> {{$video}}</a></li--> - <!--li class="visible-xs"><a href="#" onclick="jotAudioURL(); return false;"><i class="icon-volume-up"></i> {{$audio}}</a></li--> {{/if}} <li class="divider visible-xs"></li> <li class="visible-xs visible-sm"><a href="#" onclick="jotGetLocation(); return false;"><i class="icon-globe"></i> {{$setloc}}</a></li> diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl index f78a3fc2d..46b32b8a9 100755 --- a/view/tpl/new_channel.tpl +++ b/view/tpl/new_channel.tpl @@ -5,10 +5,13 @@ <div id="newchannel-desc" class="descriptive-paragraph">{{$desc}}</div> - <div id="newchannel-role-help" class="descriptive-paragraph">{{$help_role}}</div> - {{include file="field_select_grouped.tpl" field=$role}} - <div id="newchannel-role-end" class="newchannel-field-end"></div> - + {{if $default_role}} + <input type="hidden" name="permissions_role" value="{{$default_role}}" /> + {{else}} + <div id="newchannel-role-help" class="descriptive-paragraph">{{$help_role}}</div> + {{include file="field_select_grouped.tpl" field=$role}} + <div id="newchannel-role-end" class="newchannel-field-end"></div> + {{/if}} <label for="newchannel-name" id="label-newchannel-name" class="newchannel-label" >{{$label_name}}</label> <input type="text" name="name" id="newchannel-name" class="newchannel-input" value="{{$name}}" /> diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index bbcdcefc1..95169164a 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -21,7 +21,7 @@ {{$upload_form}} {{$album_edit.1}} <div class="section-content-wrapper-np"> - <div id="photo-album-contents"> + <div id="photo-album-contents-{{$album_id}}"> {{foreach $photos as $photo}} {{include file="photo_top.tpl"}} {{/foreach}} @@ -30,5 +30,5 @@ </div> </div> <div class="photos-end"></div> -<script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script> +<script>$(document).ready(function() { loadingPage = false; justifyPhotos('photo-album-contents-{{$album_id}}'); });</script> <div id="page-spinner"></div> diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index 46ac65e87..f3131117c 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -8,7 +8,7 @@ </div> {{$upload_form}} <div class="section-content-wrapper-np"> - <div id="photo-album-contents"> + <div id="photo-album-contents-{{$album_id}}"> {{foreach $photos as $photo}} {{include file="photo_top.tpl"}} {{/foreach}} @@ -17,5 +17,5 @@ </div> </div> <div class="photos-end"></div> -<script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script> +<script>$(document).ready(function() { loadingPage = false; justifyPhotos('photo-album-contents-{{$album_id}}'); });</script> <div id="page-spinner"></div> diff --git a/view/tpl/photosajax.tpl b/view/tpl/photosajax.tpl index 705cb6c75..45191db85 100755 --- a/view/tpl/photosajax.tpl +++ b/view/tpl/photosajax.tpl @@ -1,4 +1,4 @@ {{foreach $photos as $photo}} {{include file="photo_top.tpl"}} {{/foreach}} -<script>justifyPhotosAjax()</script> +<script>justifyPhotosAjax('photo-album-contents-{{$album_id}}')</script> diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index b2689c7ba..872551529 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -20,7 +20,7 @@ <div class="wall-item-photo-end" style="clear:both"></div> </div> {{if $item.title}} - <div class="wall-item-title" id="wall-item-title-{{$item.id}}"> + <div class="wall-item-title" id="wall-item-title-{{$item.id}}" title="{{$item.title}}"> <h3>{{if $item.title_tosource}}{{if $item.plink}}<a href="{{$item.plink.href}}" title="{{$item.title}} ({{$item.plink.title}})">{{/if}}{{/if}}{{$item.title}}{{if $item.title_tosource}}{{if $item.plink}}</a>{{/if}}{{/if}}</h3> </div> {{/if}} @@ -65,11 +65,6 @@ <span class="tag">{{$item.folders}}</span> </div> {{/if}} - {{if $item.attachments}} - <div class="body-tags" id="item-attachments"> - <span class='tag'>{{$item.attachments}}</span> - </div> - {{/if}} <div class="clear"></div> </div> {{/if}} @@ -88,6 +83,12 @@ {{/if}} </ul> </div> + {{if $item.attachments}} + <div class="wall-item-tools-left btn-group"> + <button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="icon-paperclip"></i></button> + <ul class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$item.attachments}}</ul> + </div> + {{/if}} <div class="clear"></div> </div> <div class="clear"></div> diff --git a/view/tpl/xrd_person.tpl b/view/tpl/xrd_person.tpl index 631ed3f18..754eb3944 100755 --- a/view/tpl/xrd_person.tpl +++ b/view/tpl/xrd_person.tpl @@ -17,6 +17,8 @@ <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}}" /> |