nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

New function for shortening of text (is used by the buffer export)/Vier: comment bubble is now grey.

Browse source
This commit is contained in:
Michael Vogel 2014-05-18 23:39:34 +02:00
parent 6b461a74cb
commit d964e7e08f
2 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
include/plaintext.php
View file

@ -41,6 +41,22 @@ function get_attached_data($body) {
return($post); return($post);
} }
function shortenmsg($msg, $limit) {
$lines = explode("\n", $msg);
$msg = "";
$recycle = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8');
foreach ($lines AS $row=>$line) {
if (strlen(trim($msg."\n".$line)) <= $limit)
$msg = trim($msg."\n".$line);
// Is the new message empty by now or is it a reshared message?
elseif (($msg == "") OR (($row == 1) AND (substr($msg, 0, 4) == $recycle)))
$msg = substr(substr(trim($msg."\n".$line), 0, $limit), 0, -3)."...";
else
break;
}
return($msg);
}
function plaintext($a, $b, $limit = 0, $includedlinks = false) { function plaintext($a, $b, $limit = 0, $includedlinks = false) {
require_once("include/bbcode.php"); require_once("include/bbcode.php");
require_once("include/html2plain.php"); require_once("include/html2plain.php");
@ -159,18 +175,7 @@ function plaintext($a, $b, $limit = 0, $includedlinks = false) {
$post["url"] = $b["plink"]; $post["url"] = $b["plink"];
} }
$lines = explode("\n", $msg); $msg = shortenmsg($msg, $limit);
$msg = "";
$recycle = html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8');
foreach ($lines AS $row=>$line) {
if (strlen(trim($msg."\n".$line)) <= $limit)
$msg = trim($msg."\n".$line);
// Is the new message empty by now or is it a reshared message?
elseif (($msg == "") OR (($row == 1) AND (substr($msg, 0, 4) == $recycle)))
$msg = substr(substr(trim($msg."\n".$line), 0, $limit), 0, -3)."...";
else
break;
}
} }
} }

5
view/theme/vier/style.css
View file

@ -1282,6 +1282,11 @@ h2 {
transition: all 0.2s ease-in-out; transition: all 0.2s ease-in-out;
} }
.toplevel_item:hover .togglecomment,
.wall-item-container:hover .togglecomment {
color: #999;
}
.wall-item-container .wall-item-actions-author { .wall-item-container .wall-item-actions-author {
width: 100%; width: 100%;
margin-bottom: 0.3em; margin-bottom: 0.3em;