New bbcode elements h1 to h6 for a better conversion of Diaspora content
This commit is contained in:
parent
ac3a4824df
commit
bf0f7c3d0a
|
@ -842,8 +842,10 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
|
|||
|
||||
// removing multiplicated newlines
|
||||
if (get_config("system", "remove_multiplicated_lines")) {
|
||||
$search = array("\n\n\n", "\n ", " \n", "[/quote]\n\n", "\n[/quote]", "[/li]\n", "\n[li]", "\n[ul]", "[/ul]\n", "\n\n[share ", "[/attachment]\n");
|
||||
$replace = array("\n\n", "\n", "\n", "[/quote]\n", "[/quote]", "[/li]", "[li]", "[ul]", "[/ul]", "\n[share ", "[/attachment]");
|
||||
$search = array("\n\n\n", "\n ", " \n", "[/quote]\n\n", "\n[/quote]", "[/li]\n", "\n[li]", "\n[ul]", "[/ul]\n", "\n\n[share ", "[/attachment]\n",
|
||||
"\n[h1]", "[/h1]\n", "\n[h2]", "[/h2]\n", "\n[h3]", "[/h3]\n", "\n[h4]", "[/h4]\n", "\n[h5]", "[/h5]\n", "\n[h6]", "[/h6]\n");
|
||||
$replace = array("\n\n", "\n", "\n", "[/quote]\n", "[/quote]", "[/li]", "[li]", "[ul]", "[/ul]", "\n[share ", "[/attachment]",
|
||||
"[h1]", "[/h1]", "[h2]", "[/h2]", "[h3]", "[/h3]", "[h4]", "[/h4]", "[h5]", "[/h5]", "[h6]", "[/h6]");
|
||||
do {
|
||||
$oldtext = $Text;
|
||||
$Text = str_replace($search, $replace, $Text);
|
||||
|
@ -923,6 +925,14 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true, $simplehtml = fal
|
|||
$Text = preg_replace("/\[mail\]([$MAILSearchString]*)\[\/mail\]/", '<a href="mailto:$1">$1</a>', $Text);
|
||||
$Text = preg_replace("/\[mail\=([$MAILSearchString]*)\](.*?)\[\/mail\]/", '<a href="mailto:$1">$2</a>', $Text);
|
||||
|
||||
// Check for headers
|
||||
$Text = preg_replace("(\[h1\](.*?)\[\/h1\])ism",'<h1>$1</h1>',$Text);
|
||||
$Text = preg_replace("(\[h2\](.*?)\[\/h2\])ism",'<h2>$1</h2>',$Text);
|
||||
$Text = preg_replace("(\[h3\](.*?)\[\/h3\])ism",'<h3>$1</h3>',$Text);
|
||||
$Text = preg_replace("(\[h4\](.*?)\[\/h4\])ism",'<h4>$1</h4>',$Text);
|
||||
$Text = preg_replace("(\[h5\](.*?)\[\/h5\])ism",'<h5>$1</h5>',$Text);
|
||||
$Text = preg_replace("(\[h6\](.*?)\[\/h6\])ism",'<h6>$1</h6>',$Text);
|
||||
|
||||
// Check for bold text
|
||||
$Text = preg_replace("(\[b\](.*?)\[\/b\])ism",'<strong>$1</strong>',$Text);
|
||||
|
||||
|
|
|
@ -207,12 +207,19 @@ function html2bbcode($message)
|
|||
//node2bbcode($doc, 'tr', array(), "[tr]", "[/tr]");
|
||||
//node2bbcode($doc, 'td', array(), "[td]", "[/td]");
|
||||
|
||||
node2bbcode($doc, 'h1', array(), "\n\n[size=xx-large][b]", "[/b][/size]\n");
|
||||
node2bbcode($doc, 'h2', array(), "\n\n[size=x-large][b]", "[/b][/size]\n");
|
||||
node2bbcode($doc, 'h3', array(), "\n\n[size=large][b]", "[/b][/size]\n");
|
||||
node2bbcode($doc, 'h4', array(), "\n\n[size=medium][b]", "[/b][/size]\n");
|
||||
node2bbcode($doc, 'h5', array(), "\n\n[size=small][b]", "[/b][/size]\n");
|
||||
node2bbcode($doc, 'h6', array(), "\n\n[size=x-small][b]", "[/b][/size]\n");
|
||||
//node2bbcode($doc, 'h1', array(), "\n\n[size=xx-large][b]", "[/b][/size]\n");
|
||||
//node2bbcode($doc, 'h2', array(), "\n\n[size=x-large][b]", "[/b][/size]\n");
|
||||
//node2bbcode($doc, 'h3', array(), "\n\n[size=large][b]", "[/b][/size]\n");
|
||||
//node2bbcode($doc, 'h4', array(), "\n\n[size=medium][b]", "[/b][/size]\n");
|
||||
//node2bbcode($doc, 'h5', array(), "\n\n[size=small][b]", "[/b][/size]\n");
|
||||
//node2bbcode($doc, 'h6', array(), "\n\n[size=x-small][b]", "[/b][/size]\n");
|
||||
|
||||
node2bbcode($doc, 'h1', array(), "\n\n[h1]", "[/h1]\n");
|
||||
node2bbcode($doc, 'h2', array(), "\n\n[h2]", "[/h2]\n");
|
||||
node2bbcode($doc, 'h3', array(), "\n\n[h3]", "[/h3]\n");
|
||||
node2bbcode($doc, 'h4', array(), "\n\n[h4]", "[/h4]\n");
|
||||
node2bbcode($doc, 'h5', array(), "\n\n[h5]", "[/h5]\n");
|
||||
node2bbcode($doc, 'h6', array(), "\n\n[h6]", "[/h6]\n");
|
||||
|
||||
node2bbcode($doc, 'a', array('href'=>'/mailto:(.+)/'), '[mail=$1]', '[/mail]');
|
||||
node2bbcode($doc, 'a', array('href'=>'/(.+)/'), '[url=$1]', '[/url]');
|
||||
|
|
|
@ -125,4 +125,36 @@ blockquote.shared_content {
|
|||
|
||||
.settings-heading a:after{
|
||||
content: ' »';
|
||||
}
|
||||
}
|
||||
|
||||
/* headers */
|
||||
h1, h2, h3, h4, h5, h6 {
|
||||
margin: 10px 0px;
|
||||
font-weight: normal;
|
||||
line-height: normal;
|
||||
text-rendering: optimizelegibility;
|
||||
}
|
||||
|
||||
h1 {
|
||||
font-size: 38.5px;
|
||||
}
|
||||
|
||||
h2 {
|
||||
font-size: 31.5px;
|
||||
}
|
||||
|
||||
h3 {
|
||||
font-size: 24.5px;
|
||||
}
|
||||
|
||||
h4 {
|
||||
font-size: 20.5px;
|
||||
}
|
||||
|
||||
h5 {
|
||||
font-size: 16.5px;
|
||||
}
|
||||
|
||||
h6 {
|
||||
font-size: 14.95px;
|
||||
}
|
||||
|
|
|
@ -283,10 +283,6 @@ body {
|
|||
display: table;
|
||||
}
|
||||
|
||||
h4 {
|
||||
font-size: 1.1em;
|
||||
}
|
||||
|
||||
a {
|
||||
color: #36C;
|
||||
/* color: #3e3e8c; */
|
||||
|
@ -1202,10 +1198,6 @@ section.minimal {
|
|||
width: 350px;
|
||||
float: left;
|
||||
font-size: 12px;
|
||||
}}
|
||||
|
||||
h2 {
|
||||
line-height: normal;
|
||||
}
|
||||
|
||||
.wall-item-container .wall-item-content {
|
||||
|
|
Loading…
Reference in a new issue