From 665139660a2cec16a71efeb10dc5fabcaade3750 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 18 May 2014 20:30:27 +0200 Subject: [PATCH 1/3] Make embedded videos look better. (better margin data) --- view/global.css | 10 ++++++++++ view/templates/oembed_video.tpl | 2 +- view/theme/vier/style.css | 5 +++-- view/theme/vier/templates/nav.tpl | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/view/global.css b/view/global.css index 769cfe81..c6432813 100644 --- a/view/global.css +++ b/view/global.css @@ -57,12 +57,22 @@ span.connector { .type-link img, .type-video img { } +.type-video .embed_video { + margin: 0em; +} + .type-link span.oembed + br, .type-video span.oembed + br, .type-link a + br, .type-video a + br, .type-link img + br, .type-video img + br{ display: none; } +.embed_video { + float:left; + margin: 1em; + position: relative; +} + /* Shared Messages */ .shared_header { height: 32px; diff --git a/view/templates/oembed_video.tpl b/view/templates/oembed_video.tpl index bdfa1150..214f67f7 100644 --- a/view/templates/oembed_video.tpl +++ b/view/templates/oembed_video.tpl @@ -3,7 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} - +
diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index c66b01bf..4a6a3fb9 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -1737,7 +1737,7 @@ h2 { width: 780px; } #profile-jot-wrapper { - margin-bottom: 20px; + margin-bottom: 10px; } /** buttons **/ @@ -1899,7 +1899,7 @@ ul.tabs a { padding-right: 10px; padding-top: 5px; padding-bottom: 5px; - margin-bottom: 10px; + margin-bottom: 0px; } div.pager, .birthday-notice, .comment-edit-submit-wrapper .fakelink { @@ -2147,6 +2147,7 @@ blockquote { /* font-size: large; */ font-size: larger; font-weight: bold; + display: block; } /* ================== */ diff --git a/view/theme/vier/templates/nav.tpl b/view/theme/vier/templates/nav.tpl index 8932e730..b5731496 100644 --- a/view/theme/vier/templates/nav.tpl +++ b/view/theme/vier/templates/nav.tpl @@ -113,7 +113,7 @@
  • {2} {3}
    • {{* From 6b461a74cb0c9995c4a702fb051558547f9ee531 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 18 May 2014 20:32:06 +0200 Subject: [PATCH 2/3] Cleaning up tracking parameters in urls. --- include/network.php | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/include/network.php b/include/network.php index 310b988c..240d2978 100644 --- a/include/network.php +++ b/include/network.php @@ -1107,8 +1107,29 @@ function xml2array($contents, $namespaces = true, $get_attributes=1, $priority = } function original_url($url, $depth=1, $fetchbody = false) { + + // Remove Analytics Data from Google and other tracking platforms + $urldata = parse_url($url); + if (is_string($urldata["query"])) { + $query = $urldata["query"]; + parse_str($query, $querydata); + + if (is_array($querydata)) + foreach ($querydata AS $param=>$value) + if (in_array($param, array("utm_source", "utm_medium", "utm_term", "utm_content", "utm_campaign", + "wt_mc", "pk_campaign", "pk_kwd", "mc_cid", "mc_eid", + "woo_campaign", "woo_source", "woo_medium", "woo_content", "woo_term"))) { + $pair = $param."=".$value; + $url = str_replace($pair, "", $url); + $url = str_replace(array("?&", "&&"), array("?", ""), $url); + } + + if (substr($url, -1, 1) == "?") + $url = substr($url, 0, -1); + } + if ($depth > 10) - return($url); + return($url); $url = trim($url, "'"); From d964e7e08f79583a748669ebb2d90367ec5403fd Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 18 May 2014 23:39:34 +0200 Subject: [PATCH 3/3] New function for shortening of text (is used by the buffer export)/Vier: comment bubble is now grey. --- include/plaintext.php | 29 +++++++++++++++++------------ view/theme/vier/style.css | 5 +++++ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/include/plaintext.php b/include/plaintext.php index 76bcaa1f..18763f86 100644 --- a/include/plaintext.php +++ b/include/plaintext.php @@ -41,6 +41,22 @@ function get_attached_data($body) { 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) { require_once("include/bbcode.php"); require_once("include/html2plain.php"); @@ -159,18 +175,7 @@ function plaintext($a, $b, $limit = 0, $includedlinks = false) { $post["url"] = $b["plink"]; } - $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; - } + $msg = shortenmsg($msg, $limit); } } diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index 4a6a3fb9..6563be23 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -1282,6 +1282,11 @@ h2 { 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 { width: 100%; margin-bottom: 0.3em;