From ac541a7d3246e1c5c60ae752326c1b9ba5ccd78f Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 14 Aug 2013 20:09:02 -0700 Subject: most of expire is now ported from friendica, but the protocol bits to push out the delete notifications for the entire batch to all recipients of the original post are not complete and will take quite a bit more work. As a consequence, expire has been completely disabled until it is fully implmented since it could result in completely un-removable posts reminiscent of the infamous "Bonnie Nadri" incident at Diaspora which we do not wish to re-live. --- view/tpl/settings.tpl | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 9a3a1ce8b..194b90e80 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -50,6 +50,9 @@ {{include file="field_input.tpl" field=$cntunkmail}} + +{{if $expireisfixed}} +{{* Remove above line when expire is working *}} {{include file="field_input.tpl" field=$expire.days}} @@ -65,6 +68,7 @@ +{{/if}}
{{$permissions}} {{$permdesc}} -- cgit v1.2.3 From d0951777c0c13e9e554595f91d01f78424b1b45a Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 15 Aug 2013 19:21:22 -0700 Subject: fix import from file --- view/tpl/channel_import.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/channel_import.tpl b/view/tpl/channel_import.tpl index 4804e34d6..f7635ea52 100755 --- a/view/tpl/channel_import.tpl +++ b/view/tpl/channel_import.tpl @@ -1,6 +1,6 @@

{{$title}}

-
+
{{$desc}}
-- cgit v1.2.3 From b5efa1a63a621856f4f12fbd938aa3230aa0d1a9 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 17 Aug 2013 06:30:09 -0700 Subject: issue #82, posted order not working - also doc update --- view/tpl/build_query.tpl | 1 + 1 file changed, 1 insertion(+) (limited to 'view/tpl') diff --git a/view/tpl/build_query.tpl b/view/tpl/build_query.tpl index 06da526f1..e5bf3acce 100755 --- a/view/tpl/build_query.tpl +++ b/view/tpl/build_query.tpl @@ -39,6 +39,7 @@ if(bParam_new != 0) bCmd = bCmd + "&new=" + bParam_new; if(bParam_wall != 0) bCmd = bCmd + "&wall=" + bParam_wall; if(bParam_search != "") bCmd = bCmd + "&search=" + bParam_search; + if(bParam_order != "") bCmd = bCmd + "&order=" + bParam_order; if(bParam_file != "") bCmd = bCmd + "&file=" + bParam_file; if(bParam_cats != "") bCmd = bCmd + "&cats=" + bParam_cats; if(bParam_dend != "") bCmd = bCmd + "&dend=" + bParam_dend; -- cgit v1.2.3 From cd5fdbcb48a2e05198bb9daaf0753e8218ea4285 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 19 Aug 2013 21:19:39 -0700 Subject: email attachments (and fix email photos) --- view/tpl/msg-header.tpl | 29 ++++++++++++++++++++++++++--- view/tpl/prv_message.tpl | 6 ++++++ 2 files changed, 32 insertions(+), 3 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl index 0be288709..5e2597605 100755 --- a/view/tpl/msg-header.tpl +++ b/view/tpl/msg-header.tpl @@ -54,7 +54,19 @@ else name: 'userfile', onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); }, onComplete: function(file,response) { - tinyMCE.execCommand('mceInsertRawHTML',false,response); + addeditortext(response); + $('#profile-rotator').spin(false); + } + } + ); + + var file_uploader = new window.AjaxUpload( + 'prvmail-attach', + { action: 'wall_attach/{{$nickname}}', + name: 'userfile', + onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); }, + onComplete: function(file,response) { + addeditortext(response); $('#profile-rotator').spin(false); } } @@ -67,7 +79,7 @@ else if(reply && reply.length) { $('#profile-rotator').spin('tiny'); $.get('parse_url?url=' + reply, function(data) { - tinyMCE.execCommand('mceInsertRawHTML',false,data); + addeditortext(response); $('#profile-rotator').spin(false); }); } @@ -86,11 +98,22 @@ else if(reply && reply.length) { $('#profile-rotator').spin('tiny'); $.get('parse_url?url=' + reply, function(data) { - tinyMCE.execCommand('mceInsertRawHTML',false,data); + addeditortext(response); $('#profile-rotator').spin(false); }); } } + function addeditortext(data) { + if(plaintext == 'none') { + var currentText = $("#prvmail-text").val(); + $("#prvmail-text").val(currentText + data); + } + else + tinyMCE.execCommand('mceInsertRawHTML',false,data); + } + + + diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl index 2ddf75544..164ba0c6d 100755 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -26,6 +26,12 @@
+ +
+
+
+ + -- cgit v1.2.3 From 6cea04eb440c2bb08bcb81ae13749c08d09b755c Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 21 Aug 2013 20:05:55 -0700 Subject: progress on generic sellpage - is not yet linked from existing connect buttons and editing has not been completed --- view/tpl/sellpage_submit.tpl | 3 +++ view/tpl/sellpage_view.tpl | 9 +++++++++ 2 files changed, 12 insertions(+) create mode 100644 view/tpl/sellpage_submit.tpl create mode 100644 view/tpl/sellpage_view.tpl (limited to 'view/tpl') diff --git a/view/tpl/sellpage_submit.tpl b/view/tpl/sellpage_submit.tpl new file mode 100644 index 000000000..2bd735ea4 --- /dev/null +++ b/view/tpl/sellpage_submit.tpl @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/view/tpl/sellpage_view.tpl b/view/tpl/sellpage_view.tpl new file mode 100644 index 000000000..414445039 --- /dev/null +++ b/view/tpl/sellpage_view.tpl @@ -0,0 +1,9 @@ +

{{$header}}

+ +
{{$desc}}
+ +
{{$text}}
+ +
{{$desc2}}
+ +{{$submit}} -- cgit v1.2.3 From 925b046794b77345c1321a3c74e4561d5c10ec95 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 21 Aug 2013 22:10:08 -0700 Subject: premium/restricted channel connections implemented, configure at yoursite/channel/nickname - this basically redirects "follow" requests to a premium channel's sell page if it has one configured. You can still click through and create a connection request (introduction), but this provides a means for the channel owner to state their terms. If you don't abide by the terms, you will likely be blocked or the channel deleted. This facility is extensible in a number of ways. --- view/tpl/sellpage_edit.tpl | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 view/tpl/sellpage_edit.tpl (limited to 'view/tpl') diff --git a/view/tpl/sellpage_edit.tpl b/view/tpl/sellpage_edit.tpl new file mode 100644 index 000000000..0a4726fb2 --- /dev/null +++ b/view/tpl/sellpage_edit.tpl @@ -0,0 +1,23 @@ +

{{$header}}

+
+ +{{include file="field_checkbox.tpl" field=$premium}} + +
{{$desc}}
+ +
+

+{{$lbl_about}} +

+ + + +
+
+ + +
{{$lbl2}}
+
{{$desc2}}
+ + +
-- cgit v1.2.3