diff options
| author | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-11-25 02:43:29 +0000 |
|---|---|---|
| committer | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-11-25 02:43:29 +0000 |
| commit | 4ba8c744c41bb115ec2fc7c4e1791663090fd6fe (patch) | |
| tree | f401f61569d2f5be69f06b6e5fed109631eaabfe | |
| parent | d9ac9df172337f55bd3c3a84962baf5a1304fab9 (diff) | |
| parent | e9ba2ba600e5262d03300d37c8984a03808c47c3 (diff) | |
| download | volse-hubzilla-4ba8c744c41bb115ec2fc7c4e1791663090fd6fe.tar.gz volse-hubzilla-4ba8c744c41bb115ec2fc7c4e1791663090fd6fe.tar.bz2 volse-hubzilla-4ba8c744c41bb115ec2fc7c4e1791663090fd6fe.zip | |
Merge branch 'master' of https://github.com/friendica/red
| -rw-r--r-- | include/bbcode.php | 10 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 8 |
2 files changed, 14 insertions, 4 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index 6b7217f91..5b7451a6b 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -431,14 +431,16 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { // replace [observer.baseurl] if ($observer) { + $s1 = '<span class="bb_observer">'; + $s2 = '</span>'; $obsBaseURL = $observer['xchan_connurl']; $obsBaseURL = preg_replace("/\/poco\/.*$/", '', $obsBaseURL); $Text = str_replace('[observer.baseurl]', $obsBaseURL, $Text); $Text = str_replace('[observer.url]',$observer['xchan_url'], $Text); - $Text = str_replace('[observer.name]',$observer['xchan_name'], $Text); - $Text = str_replace('[observer.address]',$observer['xchan_addr'], $Text); - $Text = str_replace('[observer.webname]',substr($observer['xchan_addr'],0,strpos($observer['xchan_addr'],'@')), $Text); - $Text = str_replace('[observer.photo]','[zmg]'.$observer['xchan_photo_l'].'[/zmg]', $Text); + $Text = str_replace('[observer.name]',$s1 . $observer['xchan_name'] . $s2, $Text); + $Text = str_replace('[observer.address]',$s1 . $observer['xchan_addr'] . $s2, $Text); + $Text = str_replace('[observer.webname]',$s1 . substr($observer['xchan_addr'],0,strpos($observer['xchan_addr'],'@')) . $s2, $Text); + $Text = str_replace('[observer.photo]',$s1 . '[zmg]'.$observer['xchan_photo_l'].'[/zmg]' . $s2, $Text); } else { $Text = str_replace('[observer.baseurl]', '', $Text); $Text = str_replace('[observer.url]','', $Text); diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index ea8aa3365..eb3f67453 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2388,3 +2388,11 @@ aside .nav > li > a:hover, aside .nav > li > a:focus { height: 300px; width: 300px; } + +.bb_observer { + color: red; +} + +.bb_observer img { + border: 3px solid red !important; +}
\ No newline at end of file |