Merge pull request #4565 from MrPetovan/task/improve-babel
Improve mod/babel
This commit is contained in:
Michael Vogel
GitHub
commit
631c710412
130
mod/babel.php
130
mod/babel.php
|
|
@ -13,64 +13,104 @@ function visible_lf($s)
|
||||||
|
|
||||||
function babel_content()
|
function babel_content()
|
||||||
{
|
{
|
||||||
$o = '<h1>Babel Diagnostic</h1>';
|
$results = [];
|
||||||
|
if (!empty($_REQUEST['text'])) {
|
||||||
|
switch (defaults($_REQUEST, 'type', 'bbcode')) {
|
||||||
|
case 'bbcode':
|
||||||
|
$bbcode = trim($_REQUEST['text']);
|
||||||
|
$results[] = [
|
||||||
|
'title' => L10n::t('Source input'),
|
||||||
|
'content' => visible_lf($bbcode)
|
||||||
|
];
|
||||||
|
|
||||||
$o .= '<form action="babel" method="post">';
|
$html = Text\BBCode::convert($bbcode);
|
||||||
$o .= L10n::t("Source \x28bbcode\x29 text:") . EOL;
|
$results[] = [
|
||||||
$o .= '<textarea name="text" cols="80" rows="10">' . htmlspecialchars($_REQUEST['text']) . '</textarea>' . EOL;
|
'title' => L10n::t("BBCode::convert \x28raw HTML\x28"),
|
||||||
$o .= '<input type="submit" name="submit" value="Submit" /></form>';
|
'content' => htmlspecialchars($html)
|
||||||
|
];
|
||||||
|
|
||||||
$o .= '<br /><br />';
|
$results[] = [
|
||||||
|
'title' => L10n::t('BBCode::convert'),
|
||||||
|
'content' => $html
|
||||||
|
];
|
||||||
|
|
||||||
$o .= '<form action="babel" method="post">';
|
$bbcode2 = Text\HTML::toBBCode($html);
|
||||||
$o .= L10n::t("Source \x28Diaspora\x29 text to convert to BBcode:") . EOL;
|
$results[] = [
|
||||||
$o .= '<textarea name="d2bbtext" cols="80" rows="10">' . htmlspecialchars($_REQUEST['d2bbtext']) . '</textarea>' . EOL;
|
'title' => L10n::t('BBCode::convert => HTML::toBBCode'),
|
||||||
$o .= '<input type="submit" name="submit" value="Submit" /></form>';
|
'content' => visible_lf($bbcode2)
|
||||||
|
];
|
||||||
|
|
||||||
$o .= '<br /><br />';
|
$markdown = Text\BBCode::toMarkdown($bbcode);
|
||||||
|
$results[] = [
|
||||||
|
'title' => L10n::t('BBCode::toMarkdown'),
|
||||||
|
'content' => visible_lf($markdown)
|
||||||
|
];
|
||||||
|
|
||||||
if (x($_REQUEST, 'text')) {
|
$html2 = Text\Markdown::convert($markdown);
|
||||||
$text = trim($_REQUEST['text']);
|
$results[] = [
|
||||||
$o .= '<h2>' . L10n::t('Source input: ') . '</h2>' . EOL . EOL;
|
'title' => L10n::t('BBCode::toMarkdown => Markdown::convert'),
|
||||||
$o .= visible_lf($text) . EOL . EOL;
|
'content' => $html2
|
||||||
|
];
|
||||||
|
|
||||||
$html = Text\BBCode::convert($text);
|
$bbcode3 = Text\Markdown::toBBCode($markdown);
|
||||||
$o .= '<h2>' . L10n::t("BBCode::convert \x28raw HTML\x28: ") . '</h2>' . EOL . EOL;
|
$results[] = [
|
||||||
$o .= htmlspecialchars($html) . EOL . EOL;
|
'title' => L10n::t('BBCode::toMarkdown => Markdown::toBBCode'),
|
||||||
|
'content' => visible_lf($bbcode3)
|
||||||
|
];
|
||||||
|
|
||||||
$o .= '<h2>' . L10n::t('BBCode::convert: ') . '</h2>' . EOL . EOL;
|
$bbcode4 = Text\HTML::toBBCode($html2);
|
||||||
$o .= $html . EOL . EOL;
|
$results[] = [
|
||||||
|
'title' => L10n::t('BBCode::toMarkdown => Markdown::convert => HTML::toBBCode'),
|
||||||
|
'content' => visible_lf($bbcode4)
|
||||||
|
];
|
||||||
|
break;
|
||||||
|
case 'markdown':
|
||||||
|
$markdown = trim($_REQUEST['text']);
|
||||||
|
$results[] = [
|
||||||
|
'title' => L10n::t('Source input \x28Diaspora format\x29'),
|
||||||
|
'content' => '<pre>' . $markdown . '</pre>'
|
||||||
|
];
|
||||||
|
|
||||||
$bbcode = Text\HTML::toBBCode($html);
|
$bbcode = Text\Markdown::toBBCode($markdown);
|
||||||
$o .= '<h2>' . L10n::t('BBCode::convert => HTML::toBBCode: ') . '</h2>' . EOL . EOL;
|
$results[] = [
|
||||||
$o .= visible_lf($bbcode) . EOL . EOL;
|
'title' => L10n::t('Markdown::toBBCode'),
|
||||||
|
'content' => '<pre>' . $bbcode . '</pre>'
|
||||||
|
];
|
||||||
|
break;
|
||||||
|
case 'html' :
|
||||||
|
$html = trim($_REQUEST['text']);
|
||||||
|
$results[] = [
|
||||||
|
'title' => L10n::t("Raw HTML input"),
|
||||||
|
'content' => htmlspecialchars($html)
|
||||||
|
];
|
||||||
|
|
||||||
$diaspora = Text\BBCode::toMarkdown($text);
|
$results[] = [
|
||||||
$o .= '<h2>' . L10n::t('BBCode::toMarkdown: ') . '</h2>' . EOL . EOL;
|
'title' => L10n::t('HTML Input'),
|
||||||
$o .= visible_lf($diaspora) . EOL . EOL;
|
'content' => $html
|
||||||
|
];
|
||||||
|
|
||||||
$html = Text\Markdown::convert($diaspora);
|
$bbcode = Text\HTML::toBBCode($html);
|
||||||
$o .= '<h2>' . L10n::t('BBCode::toMarkdown => Markdown::convert: ') . '</h2>' . EOL . EOL;
|
$results[] = [
|
||||||
$o .= $html . EOL . EOL;
|
'title' => L10n::t('HTML::toBBCode'),
|
||||||
|
'content' => visible_lf($bbcode)
|
||||||
|
];
|
||||||
|
|
||||||
$bbcode = Text\Markdown::toBBCode($diaspora);
|
$text = Text\HTML::toPlaintext($html);
|
||||||
$o .= '<h2>' . L10n::t('BBCode::toMarkdown => Markdown::toBBCode: ') . '</h2>' . EOL . EOL;
|
$results[] = [
|
||||||
$o .= visible_lf($bbcode) . EOL . EOL;
|
'title' => L10n::t('HTML::toPlaintext'),
|
||||||
|
'content' => '<pre>' . $text . '</pre>'
|
||||||
$bbcode = Text\HTML::toBBCode($html);
|
];
|
||||||
$o .= '<h2>' . L10n::t('BBCode::toMarkdown => Markdown::convert => HTML::toBBCode: ') . '</h2>' . EOL . EOL;
|
}
|
||||||
$o .= visible_lf($bbcode) . EOL . EOL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($_REQUEST, 'd2bbtext')) {
|
$tpl = get_markup_template('babel.tpl');
|
||||||
$d2bbtext = trim($_REQUEST['d2bbtext']);
|
$o = replace_macros($tpl, [
|
||||||
$o .= '<h2>' . L10n::t("Source input \x28Diaspora format\x29: ") . '</h2>' . EOL . EOL;
|
'$text' => ['text', L10n::t('Source text'), defaults($_REQUEST, 'text', ''), ''],
|
||||||
$o .= '<pre>' . $d2bbtext . '</pre>' . EOL . EOL;
|
'$type_bbcode' => ['type', L10n::t('BBCode'), 'bbcode', '', defaults($_REQUEST, 'type', 'bbcode') == 'bbcode'],
|
||||||
|
'$type_markdown' => ['type', L10n::t('Markdown'), 'markdown', '', defaults($_REQUEST, 'type', 'bbcode') == 'markdown'],
|
||||||
$bb = Text\Markdown::toBBCode($d2bbtext);
|
'$type_html' => ['type', L10n::t('HTML'), 'html', '', defaults($_REQUEST, 'type', 'bbcode') == 'html'],
|
||||||
$o .= '<h2>' . L10n::t('Markdown::toBBCode: ') . '</h2>' . EOL . EOL;
|
'$results' => $results
|
||||||
$o .= '<pre>' . $bb . '</pre>' . EOL . EOL;
|
]);
|
||||||
}
|
|
||||||
|
|
||||||
return $o;
|
return $o;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
29
view/templates/babel.tpl
Normal file
29
view/templates/babel.tpl
Normal file
|
|
@ -0,0 +1,29 @@
|
||||||
|
<h2>Babel Diagnostic</h2>
|
||||||
|
<form action="babel" method="post" class="panel panel-default">
|
||||||
|
<div class="panel-body">
|
||||||
|
<div class="form-group">
|
||||||
|
{{include file="field_textarea.tpl" field=$text}}
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
{{include file="field_radio.tpl" field=$type_bbcode}}
|
||||||
|
{{include file="field_radio.tpl" field=$type_markdown}}
|
||||||
|
{{include file="field_radio.tpl" field=$type_html}}
|
||||||
|
</div>
|
||||||
|
<p><button type="submit" class="btn btn-primary">Submit</button></p>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
{{if $results}}
|
||||||
|
<div class="babel-results">
|
||||||
|
{{foreach $results as $result}}
|
||||||
|
<div class="panel panel-default">
|
||||||
|
<div class="panel-heading">
|
||||||
|
<h3 class="panel-title">{{$result.title}}</h3>
|
||||||
|
</div>
|
||||||
|
<div class="panel-body">
|
||||||
|
{{$result.content}}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
{{/foreach}}
|
||||||
|
</div>
|
||||||
|
{{/if}}
|
||||||
Loading…
Reference in a new issue