From b522ab13cbf7653dcc5e0f91b10eed0a63560ecb Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 18 Aug 2014 20:03:48 -0700 Subject: nav channel selection --- view/tpl/nav.tpl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'view/tpl') 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}} {{if $nav.profiles}}
  • {{$nav.profiles.1}}
    • {{/if}} - {{if $nav.manage}}
  • {{$nav.manage.1}}
    • {{/if}} {{if $nav.settings}}
  • {{$nav.settings.1}}
    • {{/if}} + {{if $nav.manage}}
  • {{$nav.manage.1}}
    • {{/if}} + {{if $nav.channels}} + {{foreach $nav.channels as $chan}} + + {{/foreach}} + {{/if}} {{if $nav.admin}}
  • {{$nav.admin.1}}
    • -- cgit v1.2.3 From b3d450626e830f648c4c2e596e449d6817a8b324 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 18 Aug 2014 22:44:03 -0700 Subject: provide an overt indication that a post/comment was edited. --- view/tpl/conv_item.tpl | 2 +- view/tpl/search_item.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'view/tpl') 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 @@ {{$item.name}}{{if $item.owner_url}} {{$item.via}} {{$item.owner_name}}{{/if}}
    - {{if $item.verified}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}} {{if $item.app}}{{$item.str_app}}{{/if}} + {{if $item.verified}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}{{if $item.editedtime}} {{/if}} {{if $item.app}}{{$item.str_app}}{{/if}}
    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 @@ {{$item.name}}{{if $item.owner_url}} {{$item.via}} {{$item.owner_name}}{{/if}}
    - {{if $item.verified}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}{{if $item.app}}{{$item.str_app}}{{/if}} + {{if $item.verified}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}{{if $item.editedtime}} {{/if}} {{if $item.app}}{{$item.str_app}}{{/if}}
    -- cgit v1.2.3 From f7895d322e30ce3d69689c1646fd0056d195e5a8 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 20 Aug 2014 16:10:57 -0700 Subject: provide admin option for allowing rss/atom feed connections. Need to do this now before the feature is complete so that public sites don't get borked. We also will need a service class for this. --- view/tpl/admin_site.tpl | 1 + 1 file changed, 1 insertion(+) (limited to 'view/tpl') 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 @@

    {{$corporate}}

    {{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}} -- cgit v1.2.3 From a6829f7dcb6735ee0b2f003647cc168e55002a5f Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 20 Aug 2014 17:15:13 -0700 Subject: move Friendica photo migrator to addons, bring back a few XML scraping functions that we're going to require (unfortunately) --- view/tpl/frphotos.tpl | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 view/tpl/frphotos.tpl (limited to 'view/tpl') 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 @@ -

    {{$header}}

    - -

    {{$desc}}

    - -
    - -{{include file="field_input.tpl" field=$fr_server}} -{{include file="field_input.tpl" field=$fr_username}} -{{include file="field_password.tpl" field=$fr_password}} - - -
    - -- cgit v1.2.3 From b4aed1212930e40377665dc45271f2b1f428511f Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 20 Aug 2014 23:01:25 -0700 Subject: extensible profiles - add the input form elements. Still needs styling and we're not yet storing the results. And right now we're ignoring the type and only doing type=string. Oh yeah - and I split off starting the second delivery chain into its own function in tag_deliver since it was largely duplicate code. --- view/tpl/profile_edit.tpl | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index 0e902e9e2..87582da56 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -349,6 +349,11 @@
    {{/if}} +{{if $extra_fields}} +{{foreach $extra_fields as $field }} +{{include file="field_input.tpl" field=$field}} +{{/foreach}} +{{/if}}
    -- cgit v1.2.3 From a59a6fbd90d115cf9e9836c986c81541a88697ee Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 21 Aug 2014 01:41:15 -0700 Subject: abook-edit-me class lost during some edit - we need this to reset the permission fields --- view/tpl/field_acheckbox.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') 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 @@ - + {{if $field.5}}{{$inherited}} {{/if}} -- cgit v1.2.3 From 831714f0f0e5bd9a17c760a2476a12603be5d089 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 21 Aug 2014 16:46:24 -0700 Subject: profile edit - missing visibility and drop link on non-default profiles, re-arrange order of replacing red#matrix smilie so it works correctly, accept a post with body content of '0' which was interpreted by x() as nothing (was treated as integer). --- view/tpl/profile_edit.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index 87582da56..b453b1cfa 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -9,12 +9,12 @@ -- cgit v1.2.3 From 921799b045c376c2ffe80a0c4fe0dc6c2c78e854 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 21 Aug 2014 17:42:19 -0700 Subject: make the old personal xrd interface (old webfinger) work again --- view/tpl/xrd_diaspora.tpl | 8 ++++++++ view/tpl/xrd_person.tpl | 10 +++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 view/tpl/xrd_diaspora.tpl (limited to 'view/tpl') diff --git a/view/tpl/xrd_diaspora.tpl b/view/tpl/xrd_diaspora.tpl new file mode 100644 index 000000000..143980bcc --- /dev/null +++ b/view/tpl/xrd_diaspora.tpl @@ -0,0 +1,8 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}} + + + 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 @@ - + + + + + {{$dspr}} + -- cgit v1.2.3 From e524835463fa0411723d2ec57276d1ac13c3aca6 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 21 Aug 2014 20:31:55 -0700 Subject: the rest of the diaspora local discovery stuff --- view/tpl/profile_vcard.tpl | 3 +++ 1 file changed, 3 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index a653dca7d..7dff8fdeb 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -43,6 +43,9 @@ {{if $homepage}}
    {{$homepage}}
    {{$profile.homepage}}
    {{/if}} + {{if $diaspora}} + {{include file="diaspora_vcard.tpl"}} + {{/if}} {{if $connect}} {{$connect}} -- cgit v1.2.3 From 72a766432d90f6eec44641466e77567808f61aca Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 21 Aug 2014 20:45:15 -0700 Subject: missing template file --- view/tpl/diaspora_vcard.tpl | 57 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 view/tpl/diaspora_vcard.tpl (limited to 'view/tpl') 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 @@ +
    +
    +
    Nickname
    +
    + {{$diaspora.nickname}} +
    +
    +
    +
    Full name
    +
    + {{$diaspora.fullname}} +
    +
    + +
    +
    First name
    +
    + {{$diaspora.firstname}} +
    +
    +
    +
    Family name
    +
    + {{$diaspora.lastname}} +
    +
    +
    +
    URL
    +
    + {{$diaspora.podloc}}/ +
    +
    +
    +
    Photo
    +
    + +
    +
    +
    +
    Photo
    +
    + +
    +
    +
    +
    Photo
    +
    + +
    +
    +
    +
    Searchable
    +
    + {{$diaspora.searchable}} +
    +
    +
    -- cgit v1.2.3 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 From 2df4c44de5601053635e23a7af01a57bdc4fa9fa Mon Sep 17 00:00:00 2001 From: marijus Date: Wed, 27 Aug 2014 00:59:07 +0200 Subject: make vcard and contact block widget look-alike --- view/tpl/profile_vcard.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index 7dff8fdeb..3c83cd685 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -2,7 +2,7 @@ {{if $profile.edit}}
    - +
    {{/if}} -
    {{$profile.name}}{{if $profile.online}} {{/if}}
    +
    {{$profile.name}}{{if $profile.online}} {{/if}}
    {{if $pdesc}}
    {{$profile.pdesc}}
    {{/if}}
    {{$profile.name}}
    -- cgit v1.2.3 From bbcf0be16a2140069fe2826c57bb0c7278f7cb52 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 27 Aug 2014 18:19:56 -0700 Subject: Admin setting for Diaspora Protocol enable. We may want to have this also at a channel level since there are privacy issues and quirks and trade-offs. --- view/tpl/admin_site.tpl | 1 + 1 file changed, 1 insertion(+) (limited to 'view/tpl') diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 2a7742a3e..6736792a8 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -65,6 +65,7 @@

    {{$corporate}}

    {{include file="field_checkbox.tpl" field=$block_public}} + {{include file="field_checkbox.tpl" field=$diaspora_enable}} {{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}} -- cgit v1.2.3 From 2d210db1b85e5893afe285fc7b32f9987f1ae565 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 27 Aug 2014 22:01:02 -0700 Subject: ability to create/edit/delete custom profile field definitions - read the source. Currently the created entries aren't added to the allowed fields arrays, but this can be done by hand until that bit is made available. Only choice for input type at the moment is 'text' or a text input, not a textarea. Multiple choice will be added later. --- view/tpl/profdef_edit.tpl | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 view/tpl/profdef_edit.tpl (limited to 'view/tpl') diff --git a/view/tpl/profdef_edit.tpl b/view/tpl/profdef_edit.tpl new file mode 100644 index 000000000..bfe85314d --- /dev/null +++ b/view/tpl/profdef_edit.tpl @@ -0,0 +1,16 @@ +

    {{$header}}

    + +
    + +{{if $id}} + +{{/if}} + +{{include file="field_input.tpl" field=$field_name}} +{{include file="field_input.tpl" field=$field_type}} +{{include file="field_input.tpl" field=$field_desc}} +{{include file="field_input.tpl" field=$field_help}} + + + +
    -- cgit v1.2.3 From 5e5c6c90002908ed2052659a5fe13319c09883b0 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 28 Aug 2014 03:33:19 -0700 Subject: consistency: the diaspora post plugin uses "diaspora_enable". The protocol driver uses "diaspora_enabled" with a 'd'. They got mixed up in a couple of places. --- view/tpl/admin_site.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 6736792a8..930486b5f 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -65,7 +65,7 @@

    {{$corporate}}

    {{include file="field_checkbox.tpl" field=$block_public}} - {{include file="field_checkbox.tpl" field=$diaspora_enable}} + {{include file="field_checkbox.tpl" field=$diaspora_enabled}} {{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}} -- cgit v1.2.3 From ab031664facfb640a8a6589fb9abe018549ad173 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Tue, 2 Sep 2014 02:34:04 +0100 Subject: Move achievements on, but just a tad. --- view/tpl/achievements.tpl | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 view/tpl/achievements.tpl (limited to 'view/tpl') diff --git a/view/tpl/achievements.tpl b/view/tpl/achievements.tpl new file mode 100644 index 000000000..67fde6211 --- /dev/null +++ b/view/tpl/achievements.tpl @@ -0,0 +1,9 @@ +
    +

    {{$newmembertext}}

    + +
    +
    +
    +
    + +
    -- cgit v1.2.3 From 6d7897a955319d7d83a558258936528d70501a89 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Tue, 2 Sep 2014 02:37:23 +0100 Subject: Don't forget the ifs. Now we just need to write some blurb, find some images, add a link, and decide what to do with non-earned badges...basically all of it. --- view/tpl/achievements.tpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/achievements.tpl b/view/tpl/achievements.tpl index 67fde6211..2b80b9e80 100644 --- a/view/tpl/achievements.tpl +++ b/view/tpl/achievements.tpl @@ -1,9 +1,9 @@

    {{$newmembertext}}

    -
    -
    -
    -
    +{{if $profilebadge}}
    {{/if}} +{{if $contactbadge}}
    {{/if}} +{{if $keywordsbadge}}
    {{/if}} +{{if $channelsbadge}}
    {{/if}}
    -- cgit v1.2.3