From 5090ec15009b50c7ca1a1e93547172db82744b54 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Wed, 1 Jun 2016 16:04:31 +0200 Subject: [PATCH 1/6] Mentions are now having an own class --- include/bbcode.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/bbcode.php b/include/bbcode.php index bc3076777..3833c5540 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -809,7 +809,10 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal $Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $Text); - + elseif (!$simplehtml) + $Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", + '$1$3', + $Text); // Bookmarks in red - will be converted to bookmarks in friendica $Text = preg_replace("/#\^\[url\]([$URLSearchString]*)\[\/url\]/ism", '[bookmark=$1]$1[/bookmark]', $Text); From 85f42ad26d50ebb5847784cdda0256b40da59dd0 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Wed, 1 Jun 2016 16:19:53 +0200 Subject: [PATCH 2/6] Tags are now supported as well --- include/bbcode.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/bbcode.php b/include/bbcode.php index 3833c5540..39f04aa69 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -854,6 +854,9 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal if ($tryoembed) $Text = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism",'tryoembed',$Text); + $Text = preg_replace("/([#])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", + '$1$3', $Text); + $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/ism", '$1', $Text); $Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$2', $Text); //$Text = preg_replace("/\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[\/url\]/ism", '$2', $Text); From 0b766b86ba7d92c0800f8ac9049112def6b182da Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Wed, 1 Jun 2016 17:10:43 +0200 Subject: [PATCH 3/6] By setting the "userinfo" class the hovercard in frio works with mentions --- include/bbcode.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/bbcode.php b/include/bbcode.php index 39f04aa69..99295aee0 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -811,7 +811,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal $Text); elseif (!$simplehtml) $Text = preg_replace("/([@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", - '$1$3', + '$1$3', $Text); // Bookmarks in red - will be converted to bookmarks in friendica From cd0d5d6a18ed84aa6c2b586bc3bf5ae5664bc843 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Thu, 2 Jun 2016 20:59:31 +0200 Subject: [PATCH 4/6] frio: remove js part for shared-content div because it's now done by core --- view/theme/frio/css/style.css | 6 +++--- view/theme/frio/js/theme.js | 16 ---------------- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 4d7e4e2cb..6b5e840fb 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -1255,7 +1255,7 @@ section #jotOpen { max-height: 480px; object-fit: contain; } -.shared-content-wrapper, +.shared-wrapper, .vevent { margin-left: 50px; margin-right: 50px; @@ -1263,13 +1263,13 @@ section #jotOpen { box-shadow: 0 0 0 1.5px rgba(0, 0, 0, .1) inset, 0 1px 1px rgba(0, 0, 0, .05); } @media screen and (max-width: 767px) { - .shared-content-wrapper, + .shared-wrapper, .vevent { margin-left: 0px; margin-right: 0px; } } -.shared-content-wrapper:hover, +.shared-wrapper:hover, .vevent:hover { box-shadow: 0 0 0 1.5px rgba(0, 0, 0, .15) inset, 0 1px 1px rgba(0, 0, 0, .05); } diff --git a/view/theme/frio/js/theme.js b/view/theme/frio/js/theme.js index 928b04551..d7372704e 100644 --- a/view/theme/frio/js/theme.js +++ b/view/theme/frio/js/theme.js @@ -68,22 +68,6 @@ $(document).ready(function(){ if( $("#jot-popup").is(":hidden")) $("#topbar-second > .container > #navbar-button #jotOpen").hide(); } - // move shared content in it's own DIV (so we can style it better) - $('.wall-item-body .shared_content').each(function() { - // create a DIV after ".shared_content" where we will putt in the shared_header - // and the "shared_content" - $(this).after('
'); - // get the shared_header - var sheader = $(this).prev(); - // get the shared-content-wrapper which we have created above - var swrapper = $(this).next(); - // move the "shared_header into the new shared_content DIV - $(swrapper).append(sheader); - // move the "shared_content" into the new DIV - $(swrapper).append(this); - }); - - // show bulk deletion button at network page if checkbox is checked $('input.item-select').change(function(){ var checked = false; From 030f44b2feee482c29897eee164630eb62ab4434 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Thu, 2 Jun 2016 22:11:41 +0200 Subject: [PATCH 5/6] frio: give images in the networstream a little border-radius --- view/theme/frio/css/style.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 6b5e840fb..a874ce6ae 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -1255,6 +1255,10 @@ section #jotOpen { max-height: 480px; object-fit: contain; } +.wall-item-body > img, +.wall-item-body > a > img { + border-radius: 3px; +} .shared-wrapper, .vevent { margin-left: 50px; From b53391a9750a1faf104f23ed06ad122116049d59 Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Fri, 3 Jun 2016 18:55:57 +0200 Subject: [PATCH 6/6] frio: fix bulk deletion doesn't appear if post item was inserted by js --- view/theme/frio/js/theme.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/frio/js/theme.js b/view/theme/frio/js/theme.js index d7372704e..5138a4822 100644 --- a/view/theme/frio/js/theme.js +++ b/view/theme/frio/js/theme.js @@ -69,7 +69,7 @@ $(document).ready(function(){ } // show bulk deletion button at network page if checkbox is checked - $('input.item-select').change(function(){ + $("body").change("input.item-select", function(){ var checked = false; // We need to get all checked items, so it would close the delete button