From df634f9853fb18a7c70f5dea80368e3665782f2d Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 25 Aug 2014 20:55:37 -0700 Subject: notifications/system not marking all notifications seen --- view/tpl/notifications.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') 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 @@

{{$notif_header}}

{{if $notifications_available}} -{{$notif_link_mark_seen}} +{{$notif_link_mark_seen}} {{/if}}
{{$notif_content}} -- cgit v1.2.3 From 6e99848043d198af5013c2439e7a2d16d8a32c52 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 25 Aug 2014 22:43:44 -0700 Subject: more diaspora stuff - most of the basic bits are there except queueing and physical delivery (I'm keeping delivery turned off until some of the bugs are fixed so we don't cause inifinite loops or network meltdowns) - now it's just a matter of going through and methodically finding all the bugs --- view/tpl/diaspora_comment.tpl | 16 ++++++++++++++ view/tpl/diaspora_comment_relay.tpl | 17 +++++++++++++++ view/tpl/diaspora_conversation.tpl | 34 ++++++++++++++++++++++++++++++ view/tpl/diaspora_like.tpl | 17 +++++++++++++++ view/tpl/diaspora_like_relay.tpl | 18 ++++++++++++++++ view/tpl/diaspora_message.tpl | 18 ++++++++++++++++ view/tpl/diaspora_photo.tpl | 18 ++++++++++++++++ view/tpl/diaspora_post.tpl | 12 +++++++++++ view/tpl/diaspora_profile.tpl | 21 ++++++++++++++++++ view/tpl/diaspora_relay_retraction.tpl | 15 +++++++++++++ view/tpl/diaspora_relayable_retraction.tpl | 16 ++++++++++++++ view/tpl/diaspora_reshare.tpl | 18 ++++++++++++++++ view/tpl/diaspora_retract.tpl | 14 ++++++++++++ view/tpl/diaspora_share.tpl | 13 ++++++++++++ view/tpl/diaspora_signed_retract.tpl | 15 +++++++++++++ 15 files changed, 262 insertions(+) create mode 100644 view/tpl/diaspora_comment.tpl create mode 100644 view/tpl/diaspora_comment_relay.tpl create mode 100644 view/tpl/diaspora_conversation.tpl create mode 100644 view/tpl/diaspora_like.tpl create mode 100644 view/tpl/diaspora_like_relay.tpl create mode 100644 view/tpl/diaspora_message.tpl create mode 100644 view/tpl/diaspora_photo.tpl create mode 100644 view/tpl/diaspora_post.tpl create mode 100644 view/tpl/diaspora_profile.tpl create mode 100644 view/tpl/diaspora_relay_retraction.tpl create mode 100644 view/tpl/diaspora_relayable_retraction.tpl create mode 100644 view/tpl/diaspora_reshare.tpl create mode 100644 view/tpl/diaspora_retract.tpl create mode 100644 view/tpl/diaspora_share.tpl create mode 100644 view/tpl/diaspora_signed_retract.tpl (limited to 'view/tpl') diff --git a/view/tpl/diaspora_comment.tpl b/view/tpl/diaspora_comment.tpl new file mode 100644 index 000000000..8df3842d0 --- /dev/null +++ b/view/tpl/diaspora_comment.tpl @@ -0,0 +1,16 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} + + + + {{$guid}} + {{$parent_guid}} + {{$authorsig}} + {{$body}} + {{$handle}} + + + \ 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..c01441e3c --- /dev/null +++ b/view/tpl/diaspora_comment_relay.tpl @@ -0,0 +1,17 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} + + + + {{$guid}} + {{$parent_guid}} + {{$parentsig}} + {{$authorsig}} + {{$body}} + {{$handle}} + + + \ 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..fd11b826a --- /dev/null +++ b/view/tpl/diaspora_conversation.tpl @@ -0,0 +1,34 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} + + + + {{$conv.guid}} + {{$conv.subject}} + {{$conv.created_at}} + + {{foreach $conv.messages as $msg}} + + + {{$msg.guid}} + {{$msg.parent_guid}} + {{if $msg.parent_author_signature}} + {{$msg.parent_author_signature}} + {{/if}} + {{$msg.author_signature}} + {{$msg.text}} + {{$msg.created_at}} + {{$msg.diaspora_handle}} + {{$msg.conversation_guid}} + + + {{/foreach}} + + {{$conv.diaspora_handle}} + {{$conv.participant_handles}} + + + diff --git a/view/tpl/diaspora_like.tpl b/view/tpl/diaspora_like.tpl new file mode 100644 index 000000000..b35ec46ad --- /dev/null +++ b/view/tpl/diaspora_like.tpl @@ -0,0 +1,17 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} + + + + {{$positive}} + {{$guid}} + {{$target_type}} + {{$parent_guid}} + {{$authorsig}} + {{$handle}} + + + diff --git a/view/tpl/diaspora_like_relay.tpl b/view/tpl/diaspora_like_relay.tpl new file mode 100644 index 000000000..379bf0f45 --- /dev/null +++ b/view/tpl/diaspora_like_relay.tpl @@ -0,0 +1,18 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} + + + + {{$positive}} + {{$guid}} + {{$target_type}} + {{$parent_guid}} + {{$parentsig}} + {{$authorsig}} + {{$handle}} + + + diff --git a/view/tpl/diaspora_message.tpl b/view/tpl/diaspora_message.tpl new file mode 100644 index 000000000..e1690734f --- /dev/null +++ b/view/tpl/diaspora_message.tpl @@ -0,0 +1,18 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} + + + + {{$msg.guid}} + {{$msg.parent_guid}} + {{$msg.author_signature}} + {{$msg.text}} + {{$msg.created_at}} + {{$msg.diaspora_handle}} + {{$msg.conversation_guid}} + + + diff --git a/view/tpl/diaspora_photo.tpl b/view/tpl/diaspora_photo.tpl new file mode 100644 index 000000000..258a9c2f4 --- /dev/null +++ b/view/tpl/diaspora_photo.tpl @@ -0,0 +1,18 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} + + + + {{$guid}} + {{$handle}} + {{$public}} + {{$created_at}} + {{$path}} + {{$filename}} + {{$msg_guid}} + + + 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 @@ + + + + {{$body}} + {{$guid}} + {{$handle}} + {{$public}} + {{$created}} + {{$provider}} + + + diff --git a/view/tpl/diaspora_profile.tpl b/view/tpl/diaspora_profile.tpl new file mode 100644 index 000000000..e57b82820 --- /dev/null +++ b/view/tpl/diaspora_profile.tpl @@ -0,0 +1,21 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} + + + {{$handle}} + {{$first}} + {{$last}} + {{$large}} + {{$medium}} + {{$small}} + {{$dob}} + {{$gender}} + {{$about}} + {{$location}} + {{$searchable}} + {{$tags}} + + diff --git a/view/tpl/diaspora_relay_retraction.tpl b/view/tpl/diaspora_relay_retraction.tpl new file mode 100644 index 000000000..97a1344c9 --- /dev/null +++ b/view/tpl/diaspora_relay_retraction.tpl @@ -0,0 +1,15 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} + + + + {{$type}} + {{$guid}} + {{$signature}} + {{$handle}} + + + diff --git a/view/tpl/diaspora_relayable_retraction.tpl b/view/tpl/diaspora_relayable_retraction.tpl new file mode 100644 index 000000000..c25e13db1 --- /dev/null +++ b/view/tpl/diaspora_relayable_retraction.tpl @@ -0,0 +1,16 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} + + + + {{$parentsig}} + {{$guid}} + {{$target_type}} + {{$handle}} + {{$authorsig}} + + + diff --git a/view/tpl/diaspora_reshare.tpl b/view/tpl/diaspora_reshare.tpl new file mode 100644 index 000000000..c2b4bf774 --- /dev/null +++ b/view/tpl/diaspora_reshare.tpl @@ -0,0 +1,18 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} + + + + {{$root_handle}} + {{$root_guid}} + {{$guid}} + {{$handle}} + {{$public}} + {{$created}} + {{$provider}} + + + diff --git a/view/tpl/diaspora_retract.tpl b/view/tpl/diaspora_retract.tpl new file mode 100644 index 000000000..345f4bcb6 --- /dev/null +++ b/view/tpl/diaspora_retract.tpl @@ -0,0 +1,14 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} + + + + {{$guid}} + {{$handle}} + {{$type}} + + + diff --git a/view/tpl/diaspora_share.tpl b/view/tpl/diaspora_share.tpl new file mode 100644 index 000000000..5ff04440d --- /dev/null +++ b/view/tpl/diaspora_share.tpl @@ -0,0 +1,13 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} + + + + {{$sender}} + {{$recipient}} + + + \ 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..58c5cc237 --- /dev/null +++ b/view/tpl/diaspora_signed_retract.tpl @@ -0,0 +1,15 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} + + + + {{$guid}} + {{$type}} + {{$handle}} + {{$signature}} + + + -- cgit v1.2.3 From c99d89e441c742ceaaa299c9de9c2fb322b41993 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 25 Aug 2014 22:58:30 -0700 Subject: get rid of template "auto generated" warnings --- view/tpl/diaspora_comment.tpl | 5 ----- view/tpl/diaspora_comment_relay.tpl | 5 ----- view/tpl/diaspora_conversation.tpl | 5 ----- view/tpl/diaspora_like.tpl | 5 ----- view/tpl/diaspora_like_relay.tpl | 5 ----- view/tpl/diaspora_message.tpl | 5 ----- view/tpl/diaspora_photo.tpl | 5 ----- view/tpl/diaspora_profile.tpl | 5 ----- view/tpl/diaspora_relay_retraction.tpl | 5 ----- view/tpl/diaspora_relayable_retraction.tpl | 5 ----- view/tpl/diaspora_reshare.tpl | 5 ----- view/tpl/diaspora_retract.tpl | 5 ----- view/tpl/diaspora_share.tpl | 5 ----- view/tpl/diaspora_signed_retract.tpl | 5 ----- view/tpl/xrd_diaspora.tpl | 5 ----- 15 files changed, 75 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/diaspora_comment.tpl b/view/tpl/diaspora_comment.tpl index 8df3842d0..27ec3dffc 100644 --- a/view/tpl/diaspora_comment.tpl +++ b/view/tpl/diaspora_comment.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} diff --git a/view/tpl/diaspora_comment_relay.tpl b/view/tpl/diaspora_comment_relay.tpl index c01441e3c..37a9e88b3 100644 --- a/view/tpl/diaspora_comment_relay.tpl +++ b/view/tpl/diaspora_comment_relay.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} diff --git a/view/tpl/diaspora_conversation.tpl b/view/tpl/diaspora_conversation.tpl index fd11b826a..dc4482e4b 100644 --- a/view/tpl/diaspora_conversation.tpl +++ b/view/tpl/diaspora_conversation.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} diff --git a/view/tpl/diaspora_like.tpl b/view/tpl/diaspora_like.tpl index b35ec46ad..a27e92240 100644 --- a/view/tpl/diaspora_like.tpl +++ b/view/tpl/diaspora_like.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} diff --git a/view/tpl/diaspora_like_relay.tpl b/view/tpl/diaspora_like_relay.tpl index 379bf0f45..8209540c5 100644 --- a/view/tpl/diaspora_like_relay.tpl +++ b/view/tpl/diaspora_like_relay.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} diff --git a/view/tpl/diaspora_message.tpl b/view/tpl/diaspora_message.tpl index e1690734f..3413d79b0 100644 --- a/view/tpl/diaspora_message.tpl +++ b/view/tpl/diaspora_message.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} diff --git a/view/tpl/diaspora_photo.tpl b/view/tpl/diaspora_photo.tpl index 258a9c2f4..256459d8d 100644 --- a/view/tpl/diaspora_photo.tpl +++ b/view/tpl/diaspora_photo.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} diff --git a/view/tpl/diaspora_profile.tpl b/view/tpl/diaspora_profile.tpl index e57b82820..cf53f51c0 100644 --- a/view/tpl/diaspora_profile.tpl +++ b/view/tpl/diaspora_profile.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} {{$handle}} diff --git a/view/tpl/diaspora_relay_retraction.tpl b/view/tpl/diaspora_relay_retraction.tpl index 97a1344c9..5e7aed41f 100644 --- a/view/tpl/diaspora_relay_retraction.tpl +++ b/view/tpl/diaspora_relay_retraction.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} diff --git a/view/tpl/diaspora_relayable_retraction.tpl b/view/tpl/diaspora_relayable_retraction.tpl index c25e13db1..4e3ff3243 100644 --- a/view/tpl/diaspora_relayable_retraction.tpl +++ b/view/tpl/diaspora_relayable_retraction.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} diff --git a/view/tpl/diaspora_reshare.tpl b/view/tpl/diaspora_reshare.tpl index c2b4bf774..963bb9e12 100644 --- a/view/tpl/diaspora_reshare.tpl +++ b/view/tpl/diaspora_reshare.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} diff --git a/view/tpl/diaspora_retract.tpl b/view/tpl/diaspora_retract.tpl index 345f4bcb6..9df066d38 100644 --- a/view/tpl/diaspora_retract.tpl +++ b/view/tpl/diaspora_retract.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} diff --git a/view/tpl/diaspora_share.tpl b/view/tpl/diaspora_share.tpl index 5ff04440d..59eb06124 100644 --- a/view/tpl/diaspora_share.tpl +++ b/view/tpl/diaspora_share.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} diff --git a/view/tpl/diaspora_signed_retract.tpl b/view/tpl/diaspora_signed_retract.tpl index 58c5cc237..f0f346da8 100644 --- a/view/tpl/diaspora_signed_retract.tpl +++ b/view/tpl/diaspora_signed_retract.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} diff --git a/view/tpl/xrd_diaspora.tpl b/view/tpl/xrd_diaspora.tpl index 143980bcc..aa0d8c740 100644 --- a/view/tpl/xrd_diaspora.tpl +++ b/view/tpl/xrd_diaspora.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} -- cgit v1.2.3