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') 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') 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') 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') 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') 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') 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') 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') 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