aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-07-18 19:17:16 -0700
committerFriendika <info@friendika.com>2011-07-18 19:17:16 -0700
commit7008bec045e296422a85553de1266dc864f041bc (patch)
treefb312c4e9dc82887225856abce84742878bc42fa
parentc0b8e63a3fe600326e0f18c03207ba9fd30c8126 (diff)
downloadvolse-hubzilla-7008bec045e296422a85553de1266dc864f041bc.tar.gz
volse-hubzilla-7008bec045e296422a85553de1266dc864f041bc.tar.bz2
volse-hubzilla-7008bec045e296422a85553de1266dc864f041bc.zip
improved code blocks
-rw-r--r--include/bbcode.php14
-rw-r--r--view/theme/duepuntozero/style.css4
2 files changed, 16 insertions, 2 deletions
diff --git a/include/bbcode.php b/include/bbcode.php
index 7fc1eac1c..3619015ca 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -3,6 +3,13 @@
require_once("include/oembed.php");
require_once('include/event.php');
+
+
+function stripcode_br_cb($s) {
+ return '[code]' . str_replace('<br />', '', $s[1]) . '[/code]';
+}
+
+
// BBcode 2 HTML was written by WAY2WEB.net
// extended to work with Mistpark/Friendika - Mike Macgirvin
@@ -89,9 +96,16 @@ function bbcode($Text,$preserve_nl = false) {
$Text = preg_replace("(\[font=(.*?)\](.*?)\[\/font\])","<span style=\"font-family: $1;\">$2</span>",$Text);
// Declare the format for [code] layout
+
+ $Text = preg_replace_callback("/\[code\](.*?)\[\/code\]/is",'stripcode_br_cb',$Text);
+
$CodeLayout = '<code>$1</code>';
// Check for [code] text
$Text = preg_replace("/\[code\](.*?)\[\/code\]/is","$CodeLayout", $Text);
+
+
+
+
// Declare the format for [quote] layout
$QuoteLayout = '<blockquote>$1</blockquote>';
// Check for [quote] text
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 78a0bff5b..5ee3761ef 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -45,8 +45,8 @@ code {
border: 1px solid #444;
background: #EEE;
color: #444;
- padding: 10px;
- margin-top: 20px;
+ padding: 0px 10px 10px 10px;
+ margin-top: 20px;
}
/*blockquote:before {
content: '>> ';