From a5693df07fdf6fdf31247bfe0700d4c8096d4fbf Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 30 Oct 2013 17:33:10 -0700 Subject: issue #189 - show post edited time on relative date hovertip --- view/tpl/conv_item.tpl | 2 +- view/tpl/search_item.tpl | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 095bd0df3..6927eb9e4 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -39,7 +39,7 @@
{{$item.name}}{{if $item.owner_url}} {{$item.via}} {{$item.owner_name}}{{/if}}
-
{{if $item.verified}} {{/if}}{{$item.localtime}}{{if $item.app}}{{$item.str_app}}{{/if}}
+
{{if $item.verified}} {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.app}}{{$item.str_app}}{{/if}}
{{$item.title}}
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index 5953522dc..853bbfdcd 100755 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -24,8 +24,7 @@
{{$item.name}}
-
{{if $item.verified}} {{/if}}{{$item.localtime}}{{if $item.app}}{{$item.str_app}}{{/if}}
- +
{{if $item.verified}} {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.app}}{{$item.str_app}}{{/if}}
{{$item.title}}
-- cgit v1.2.3 From 09ca39fd085595f791bec6f8e8c154b4a22d3b1e Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 31 Oct 2013 22:08:10 -0700 Subject: provide an html src converter --- view/tpl/jot-header.tpl | 61 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 810ec866f..527db4e4f 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -284,6 +284,13 @@ function enableOnUser(){ $('#profile-nolocation-wrapper').hide(); } + + function addhtmltext(data) { + data = h2b(data); + addeditortext(data); + } + + function addeditortext(data) { if(plaintext == 'none') { var currentText = $("#profile-jot-text").val(); @@ -293,6 +300,60 @@ function enableOnUser(){ tinyMCE.execCommand('mceInsertRawHTML',false,data); } + function h2b(s) { + var y = s; + function rep(re, str) { + y = y.replace(re,str); + }; + + rep(/(.*?)<\/a>/gi,"[url=$1]$2[/url]"); + rep(/(.*?)<\/span>/gi,"[size=$1]$2[/size]"); + rep(/(.*?)<\/span>/gi,"[color=$1]$2[/color]"); + rep(/(.*?)<\/font>/gi,"$1"); + rep(//gi,"[img=$1x$2]$3[/img]"); + rep(//gi,"[img=$2x$1]$3[/img]"); + rep(//gi,"[img=$3x$2]$1[/img]"); + rep(//gi,"[img=$2x$3]$1[/img]"); + rep(//gi,"[img]$1[/img]"); + + + rep(/
    (.*?)<\/ul>/gi,"[list]$1[/list]"); + rep(/
      (.*?)<\/ul>/gi,"[list=]$1[/list]"); + rep(/
        (.*?)<\/ul>/gi,"[list=1]$1[/list]"); + rep(/
          (.*?)<\/ul>/gi,"[list=i]$1[/list]"); + rep(/
            (.*?)<\/ul>/gi,"[list=I]$1[/list]"); + rep(/
              (.*?)<\/ul>/gi,"[list=a]$1[/list]"); + rep(/
                (.*?)<\/ul>/gi,"[list=A]$1[/list]"); + rep(/
              • (.*?)<\/li>/gi,"[li]$1[/li]"); + + rep(/(.*?)<\/code>/gi,"[code]$1[/code]"); + rep(/<\/(strong|b)>/gi,"[/b]"); + rep(/<(strong|b)>/gi,"[b]"); + rep(/<\/(em|i)>/gi,"[/i]"); + rep(/<(em|i)>/gi,"[i]"); + rep(/<\/u>/gi,"[/u]"); + + + rep(/(.*?)<\/span>/gi,"[u]$1[/u]"); + rep(//gi,"[u]"); + rep(/]*>/gi,"[quote]"); + rep(/<\/blockquote>/gi,"[/quote]"); + rep(/
                /gi,"[hr]"); + rep(/
                /gi,"\n"); + rep(//gi,"\n"); + rep(/
                /gi,"\n"); + rep(/

                /gi,""); + rep(/<\/p>/gi,"\n"); + rep(/ /gi," "); + rep(/"/gi,"\""); + rep(/</gi,"<"); + rep(/>/gi,">"); + rep(/&/gi,"&"); + + return y; + }; + + {{$geotag}} -- cgit v1.2.3 From 4d470f2d7017fcee94d0d5a548ff40018b358542 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 3 Nov 2013 14:57:29 -0800 Subject: add sloppy photo setting and fix default navbar hide setting --- view/tpl/photo_top.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/photo_top.tpl b/view/tpl/photo_top.tpl index 902f74232..944928f85 100755 --- a/view/tpl/photo_top.tpl +++ b/view/tpl/photo_top.tpl @@ -1,6 +1,6 @@ -

                + -- cgit v1.2.3 From cea11c94984f0f824bc5f1da260bd8ee4ea109cd Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 3 Nov 2013 15:20:40 -0800 Subject: make date order the default for the directory --- view/tpl/dir_sort_links.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/dir_sort_links.tpl b/view/tpl/dir_sort_links.tpl index 58498e4d8..d78aec1f5 100644 --- a/view/tpl/dir_sort_links.tpl +++ b/view/tpl/dir_sort_links.tpl @@ -1,6 +1,6 @@ -- cgit v1.2.3 From f4cb145f3c248aab9188900baebaa5659fa4e343 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 5 Nov 2013 16:21:38 -0800 Subject: redbasic - allow changing icon colours --- view/tpl/conv_item.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 6927eb9e4..781746b4b 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -89,7 +89,7 @@
                - {{if $item.drop.dropping}}{{/if}} + {{if $item.drop.dropping}}{{/if}}
                {{if $item.drop.pagedrop}}{{/if}}
                -- cgit v1.2.3 From 6162de142c2765c770f43bf269f0444310551705 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 6 Nov 2013 18:28:36 -0800 Subject: allow private mail sender to set an expiration on their messages. Once expired the message is destroyed at both ends (subject to the granularity of the polling interval) and is gone. Officially it takes some form of language independent string like 2013/11/22, but English speakers can use anything that strtotime() understands, like "+30 minutes" or "next Tuesday". --- view/tpl/prv_message.tpl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl index d65bc3570..494eec48c 100755 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -17,12 +17,15 @@
                {{$subject}}
                +
                {{$expires}}
                + +
                {{$yourmessage}}
                - +
                - +
                -- cgit v1.2.3 From 7381326b7a7a271da52464d15774a1309adb2bd5 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 7 Nov 2013 00:47:50 -0800 Subject: provide expire feature on post and comments as well as private messages. This requires a feature setting and is currently unmaskable - if the author says it's gone, there's not a lot you can do to stop it or try and save it. It's gone. --- view/tpl/jot-header.tpl | 7 +++++++ view/tpl/jot.tpl | 6 ++++++ view/tpl/prv_message.tpl | 2 ++ 3 files changed, 15 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 527db4e4f..05928bc32 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -191,6 +191,13 @@ function enableOnUser(){ } } + function jotGetExpiry() { + reply = prompt("{{$expirewhen}}", $('#jot-expire').val()); + if(reply && reply.length) { + $('#jot-expire').val(reply); + } + } + function jotShare(id) { if ($('#jot-popup').length != 0) $('#jot-popup').show(); diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 12978038c..f7dd12758 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -5,6 +5,7 @@ + @@ -50,6 +51,11 @@ +
                + +
                + +
                diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl index 494eec48c..35f50da00 100755 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -17,8 +17,10 @@
                {{$subject}}
                +{{if $feature_expire}}
                {{$expires}}
                +{{/if}}
                {{$yourmessage}}
                -- cgit v1.2.3 From cb37c0ce1421ecf5ddd00baee39b227307bb10b5 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 7 Nov 2013 15:30:59 -0800 Subject: make PM expiry UI match the main post editor, e.g. JS input triggered by an icon rather than a scary looking text field --- view/tpl/msg-header.tpl | 7 +++++++ view/tpl/prv_message.tpl | 18 ++++++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl index 5e2597605..79f9e23c1 100755 --- a/view/tpl/msg-header.tpl +++ b/view/tpl/msg-header.tpl @@ -85,6 +85,13 @@ else } } + function prvmailGetExpiry() { + reply = prompt("{{$expireswhen}}", $('#inp-prvmail-expires').val()); + if(reply && reply.length) { + $('#inp-prvmail-expires').val(reply); + } + } + function linkdropper(event) { var linkFound = event.dataTransfer.types.contains("text/uri-list"); if(linkFound) diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl index 35f50da00..621f56be7 100755 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -14,20 +14,17 @@ {{$select}} {{/if}} + +
                {{$subject}}
                -{{if $feature_expire}} -
                {{$expires}}
                - -{{/if}} -
                {{$yourmessage}}
                - +
                - +
                @@ -36,10 +33,15 @@
                - + +
                + +
                + +
                -- cgit v1.2.3 From 7b29400c6c8448718f156aff73754f669992ee69 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sat, 9 Nov 2013 18:43:40 +0000 Subject: Bring safe search to the UI --- view/tpl/safesearch.tpl | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 view/tpl/safesearch.tpl (limited to 'view/tpl') diff --git a/view/tpl/safesearch.tpl b/view/tpl/safesearch.tpl new file mode 100644 index 000000000..92c3db2a5 --- /dev/null +++ b/view/tpl/safesearch.tpl @@ -0,0 +1,2 @@ +

                Safe Mode

                +{{$toggle}} -- cgit v1.2.3 From effb1a0534aae40a1b2a0e396de09d1b0d06bb44 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 10 Nov 2013 18:57:24 -0800 Subject: provide zid in js so we can use it from client --- view/tpl/head.tpl | 1 + 1 file changed, 1 insertion(+) (limited to 'view/tpl') diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index 4211eeab3..eb4c6c2ad 100755 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -23,6 +23,7 @@ var updateInterval = {{$update_interval}}; var localUser = {{if $local_user}}{{$local_user}}{{else}}false{{/if}}; + var zid = {{if $zid}}'{{$zid}}'{{else}}null{{/if}}; -- cgit v1.2.3 From c39200429046cdde16edbcb6e28c5cf3c7434d4a Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 10 Nov 2013 20:34:10 -0800 Subject: some more doco for how to finish it. --- view/tpl/jot.tpl | 3 +++ 1 file changed, 3 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index f7dd12758..c04880cf7 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -54,6 +54,9 @@
                +
                -- cgit v1.2.3 From ca4103debef7ecf36d93842750667e70c2a1e42a Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 10 Nov 2013 23:19:44 -0800 Subject: e2ee --- view/tpl/jot.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index c04880cf7..0618e7491 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -54,9 +54,9 @@
                - +
                + +
                -- cgit v1.2.3 From 435e2dae0e9204afd7288c14748e88f680276969 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 11 Nov 2013 00:21:00 -0800 Subject: display encrypted text inline --- view/tpl/jot-header.tpl | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 05928bc32..4457a6d52 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -361,6 +361,42 @@ function enableOnUser(){ }; + function b2h(s) { + var y = s; + function rep(re, str) { + y = y.replace(re,str); + }; + + rep(/\n/gi,"
                "); + rep(/\[b\]/gi,""); + rep(/\[\/b\]/gi,""); + rep(/\[i\]/gi,""); + rep(/\[\/i\]/gi,""); + rep(/\[u\]/gi,""); + rep(/\[\/u\]/gi,""); + rep(/\[hr\]/gi,"
                "); + rep(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,"$2"); + rep(/\[url\](.*?)\[\/url\]/gi,"$1"); + rep(/\[img=(.*?)x(.*?)\](.*?)\[\/img\]/gi,""); + rep(/\[img\](.*?)\[\/img\]/gi,""); + + rep(/\[list\](.*?)\[\/list\]/gi, '
                  $1
                '); + rep(/\[list=\](.*?)\[\/list\]/gi, '
                  $1
                '); + rep(/\[list=1\](.*?)\[\/list\]/gi, '
                  $1
                '); + rep(/\[list=i\](.*?)\[\/list\]/gi,'
                  $1
                '); + rep(/\[list=I\](.*?)\[\/list\]/gi, '
                  $1
                '); + rep(/\[list=a\](.*?)\[\/list\]/gi, '
                  $1
                '); + rep(/\[list=A\](.*?)\[\/list\]/gi, '
                  $1
                '); + rep(/\[li\](.*?)\[\/li\]/gi, '
              • $1
                • '); + rep(/\[color=(.*?)\](.*?)\[\/color\]/gi,"$2"); + rep(/\[size=(.*?)\](.*?)\[\/size\]/gi,"$2"); + rep(/\[code\](.*?)\[\/code\]/gi,"$1"); + rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"
                $1
                "); + + return y; + }; + + {{$geotag}} -- cgit v1.2.3 From b5bc04799c9f2fec82bbd0e9823a384118ea14c1 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 11 Nov 2013 01:18:09 -0800 Subject: turn safemode into a proper widget --- view/tpl/safesearch.tpl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/safesearch.tpl b/view/tpl/safesearch.tpl index 92c3db2a5..e0b2ab538 100644 --- a/view/tpl/safesearch.tpl +++ b/view/tpl/safesearch.tpl @@ -1,2 +1,4 @@ -

                Safe Mode

                +
                +

                {{$safemode}}

                {{$toggle}} +
                -- cgit v1.2.3 From f8a34c737d312ca3102ccacb737b59ff712b4612 Mon Sep 17 00:00:00 2001 From: marijus Date: Mon, 11 Nov 2013 16:50:43 +0100 Subject: change spacing to fit other widgets --- view/tpl/peoplefind.tpl | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl index c3cbb064b..aef341d41 100755 --- a/view/tpl/peoplefind.tpl +++ b/view/tpl/peoplefind.tpl @@ -1,16 +1,14 @@

                {{$findpeople}}

                -
                {{$desc}}
                + {{$desc}}
                - + +
                - {{if $similar}} - - {{/if}} - - - {{if $inv}} - - {{/if}} +
                + {{if $similar}}{{$similar}}
                {{/if}} + {{$suggest}}
                + {{$random}}
                + {{if $inv}}{{$inv}}{{/if}}
                -- cgit v1.2.3 From 4a3191cd1909dbfde861a113ba121e94b577a4cd Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 11 Nov 2013 15:20:30 -0800 Subject: localise js ui strings for e2ee --- view/tpl/js_strings.tpl | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl index b61c69b90..144ecb17c 100755 --- a/view/tpl/js_strings.tpl +++ b/view/tpl/js_strings.tpl @@ -2,13 +2,15 @@ var aStr = { - 'delitem' : '{{$delitem}}', - 'comment' : '{{$comment}}', - 'showmore' : '{{$showmore}}', - 'showfewer' : '{{$showfewer}}', - 'pwshort' : '{{$pwshort}}', - 'pwnomatch' : '{{$pwnomatch}}', - 'everybody' : '{{$everybody}}', + 'delitem' : '{{$delitem}}', + 'comment' : '{{$comment}}', + 'showmore' : '{{$showmore}}', + 'showfewer' : '{{$showfewer}}', + 'pwshort' : '{{$pwshort}}', + 'pwnomatch' : '{{$pwnomatch}}', + 'everybody' : '{{$everybody}}', + 'passphrase' : '{{$passphrase}}', + 'passhint' : '{{$passhint}}', 't01' : {{$t01}}, 't02' : {{$t02}}, -- cgit v1.2.3 From d9013f43110a6474a8e52b72492bc490d50b7972 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 11 Nov 2013 16:47:49 -0800 Subject: provide real barebones XSS protection on e2ee contents and implement a few bbcode tags we're likely to see a lot of. Still need to write a js zid() function to properly implement zrl and zmg but at least they will be linked now. --- view/tpl/jot-header.tpl | 67 +++++++++++++++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 25 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index 4457a6d52..eb7c5abdb 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -367,31 +367,48 @@ function enableOnUser(){ y = y.replace(re,str); }; - rep(/\n/gi,"
                "); - rep(/\[b\]/gi,""); - rep(/\[\/b\]/gi,""); - rep(/\[i\]/gi,""); - rep(/\[\/i\]/gi,""); - rep(/\[u\]/gi,""); - rep(/\[\/u\]/gi,""); - rep(/\[hr\]/gi,"
                "); - rep(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,"$2"); - rep(/\[url\](.*?)\[\/url\]/gi,"$1"); - rep(/\[img=(.*?)x(.*?)\](.*?)\[\/img\]/gi,""); - rep(/\[img\](.*?)\[\/img\]/gi,""); - - rep(/\[list\](.*?)\[\/list\]/gi, '
                  $1
                '); - rep(/\[list=\](.*?)\[\/list\]/gi, '
                  $1
                '); - rep(/\[list=1\](.*?)\[\/list\]/gi, '
                  $1
                '); - rep(/\[list=i\](.*?)\[\/list\]/gi,'
                  $1
                '); - rep(/\[list=I\](.*?)\[\/list\]/gi, '
                  $1
                '); - rep(/\[list=a\](.*?)\[\/list\]/gi, '
                  $1
                '); - rep(/\[list=A\](.*?)\[\/list\]/gi, '
                  $1
                '); - rep(/\[li\](.*?)\[\/li\]/gi, '
              • $1
                • '); - rep(/\[color=(.*?)\](.*?)\[\/color\]/gi,"$2"); - rep(/\[size=(.*?)\](.*?)\[\/size\]/gi,"$2"); - rep(/\[code\](.*?)\[\/code\]/gi,"$1"); - rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"
                $1
                "); + rep(/\&/gi,"&"); + rep(/\/gi,">"); + rep(/\"/gi,"""); + + rep(/\n/gi,"
                "); + rep(/\[b\]/gi,""); + rep(/\[\/b\]/gi,""); + rep(/\[i\]/gi,""); + rep(/\[\/i\]/gi,""); + rep(/\[u\]/gi,""); + rep(/\[\/u\]/gi,""); + rep(/\[hr\]/gi,"
                "); + rep(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,"$2"); + rep(/\[url\](.*?)\[\/url\]/gi,"$1"); + rep(/\[img=(.*?)x(.*?)\](.*?)\[\/img\]/gi,""); + rep(/\[img\](.*?)\[\/img\]/gi,""); + + // FIXME - add zid + rep(/\[zrl=([^\]]+)\](.*?)\[\/zrl\]/gi,"$2"); + rep(/\[zrl\](.*?)\[\/zrl\]/gi,"$1"); + rep(/\[zmg=(.*?)x(.*?)\](.*?)\[\/zmg\]/gi,""); + rep(/\[zmg\](.*?)\[\/zmg\]/gi,""); + + rep(/\[list\](.*?)\[\/list\]/gi, '
                  $1
                '); + rep(/\[list=\](.*?)\[\/list\]/gi, '
                  $1
                '); + rep(/\[list=1\](.*?)\[\/list\]/gi, '
                  $1
                '); + rep(/\[list=i\](.*?)\[\/list\]/gi,'
                  $1
                '); + rep(/\[list=I\](.*?)\[\/list\]/gi, '
                  $1
                '); + rep(/\[list=a\](.*?)\[\/list\]/gi, '
                  $1
                '); + rep(/\[list=A\](.*?)\[\/list\]/gi, '
                  $1
                '); + rep(/\[li\](.*?)\[\/li\]/gi, '
              • $1
                • '); + rep(/\[color=(.*?)\](.*?)\[\/color\]/gi,"$2"); + rep(/\[size=(.*?)\](.*?)\[\/size\]/gi,"$2"); + rep(/\[code\](.*?)\[\/code\]/gi,"$1"); + rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"
                $1
                "); + + + + rep(/\[\&\;([#a-z0-9]+)\;\]/gi,'&$1;'); + + rep(/\<(.*?)(src|href)=\"[^hfm](.*?)\>/gi,'<$1$2="">'); return y; }; -- cgit v1.2.3 From 54438be7c2c402e4a897a2534f0f465dea5f068b Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 11 Nov 2013 17:50:36 -0800 Subject: make e2ee work on tinymce --- view/tpl/jot-header.tpl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'view/tpl') diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index eb7c5abdb..ce29443f7 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -299,12 +299,13 @@ function enableOnUser(){ function addeditortext(data) { - if(plaintext == 'none') { + if(typeof tinyMCE !== "undefined") { + tinyMCE.execCommand('mceInsertRawHTML',false,data); + } + else { var currentText = $("#profile-jot-text").val(); $("#profile-jot-text").val(currentText + data); } - else - tinyMCE.execCommand('mceInsertRawHTML',false,data); } function h2b(s) { -- cgit v1.2.3 From a7c53d470b9be467fc047130383095a569ba74e8 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 11 Nov 2013 18:42:49 -0800 Subject: ability to use other ciphers --- view/tpl/jot.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 0618e7491..924f7d9bc 100755 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -55,7 +55,7 @@
- +
-- cgit v1.2.3 From 34ee8de82176d3dca4a340388dcac6a3e5a91b9f Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 11 Nov 2013 20:20:31 -0800 Subject: basic linking of audio/video tags in encrypted bbcode --- view/tpl/jot-header.tpl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'view/tpl') diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index ce29443f7..c3e020619 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -405,7 +405,8 @@ function enableOnUser(){ rep(/\[code\](.*?)\[\/code\]/gi,"$1"); rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"
$1
"); - + rep(/\[video\](.*?)\[\/video\]/gi,"$1"); + rep(/\[audio\](.*?)\[\/audio\]/gi,"$1"); rep(/\[\&\;([#a-z0-9]+)\;\]/gi,'&$1;'); -- cgit v1.2.3