From bae844e36767836ebf9dbfed10759dfd1a2fbbd6 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 8 Dec 2013 16:49:07 +0100 Subject: [PATCH] New style for shared links. Preparation for changes in some addons --- include/bbcode.php | 2 +- mod/parse_url.php | 13 +++++++++++++ view/theme/vier/style.css | 25 +++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/include/bbcode.php b/include/bbcode.php index 412010380d..ff0d32772b 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -23,7 +23,7 @@ function cleancss($input) { if (($char >= "a") and ($char <= "z")) $cleaned .= $char; - if (!(strpos(" #;:0123456789", $char) === false)) + if (!(strpos(" #;:0123456789-_", $char) === false)) $cleaned .= $char; } diff --git a/mod/parse_url.php b/mod/parse_url.php index 3e17286256..cb7268c1df 100644 --- a/mod/parse_url.php +++ b/mod/parse_url.php @@ -75,6 +75,19 @@ function parseurl_getsiteinfo($url, $no_guessing = false) { return($siteinfo); } + require_once("include/oembed.php"); + + $oembed_data = oembed_fetch_url($url); + + if ($oembed_data->type == "link") { + if (isset($oembed_data->title)) + $siteinfo["title"] = $oembed_data->title; + if (isset($oembed_data->description)) + $siteinfo["text"] = $oembed_data->description; + if (isset($oembed_data->thumbnail_url)) + $siteinfo["image"] = $oembed_data->thumbnail_url; + } + // Fetch the first mentioned charset. Can be in body or header if (preg_match('/charset=(.*?)['."'".'"\s\n]/', $header, $matches)) $charset = trim(array_pop($matches)); diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index d340f12d60..e1f9b3def9 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -479,6 +479,11 @@ div.jGrowl div.info { color: #ffffff; padding-left: 58px; } + +div.jGrowl div.jGrowl-notification { + margin-top: 40px; +} + /* header */ header { position: fixed; @@ -1161,6 +1166,21 @@ border-bottom: 1px solid #D2D2D2; font-size: 12px; } +.wall-item-container .wall-item-content .type-link img, +.type-link img { + max-width: 160px; + max-height: 160px; + float: left; + margin-right: 10px; +} +.type-link blockquote { + margin-left: 160px; + max-height: 160px; + overflow: hidden; +} +.type-link .oembed { +} + .wall-item-container .wall-item-content { font-size: 14px; max-width: 660px; @@ -1659,22 +1679,27 @@ border-bottom: 1px solid #D2D2D2; #profile-link-wrapper { float: left; margin-left: 15px; + cursor: pointer; } #profile-video-wrapper { float: left; margin-left: 15px; + cursor: pointer; } #profile-audio-wrapper { float: left; margin-left: 15px; + cursor: pointer; } #profile-location-wrapper { float: left; margin-left: 15px; + cursor: pointer; } #profile-nolocation-wrapper { float: left; margin-left: 15px; + cursor: pointer; } #jot-perms-icon { float: right;