clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4906 from MrPetovan/task/content-filter-one-liner 

Move content filter HTML in a template
This commit is contained in:
rabuzarus 2018-04-23 00:14:22 +02:00 committed by GitHub
parent 76fdf5c910 087bfbc6a7
commit 12e7b6c3c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
include/text.php
View File

@ -1411,27 +1411,13 @@ function prepare_body(array &$item, $attach = false, $is_preview = false)
function apply_content_filter($html, array $reasons) function apply_content_filter($html, array $reasons)
{ {
if (count($reasons)) { if (count($reasons)) {
$rnd = random_string(8); $tpl = get_markup_template('wall/content_filter.tpl');
$html = replace_macros($tpl, [
if (count($reasons) > 1) { '$reasons' => $reasons,
$content_filter_html = '<ul class="content-filter-reasons">'; '$rnd' => random_string(8),
foreach ($reasons as $reason) { '$openclose' => L10n::t('Click to open/close'),
$content_filter_html .= '<li>' . htmlspecialchars($reason) . '</li>' . PHP_EOL; '$html' => $html
} ]);
$content_filter_html .= '</ul>
<p><button type="button" id="content-filter-wrap-' . $rnd . '" class="btn btn-default btn-small content-filter-button" onclick="openClose(\'content-filter-' . $rnd . '\');"><i class="glyphicon glyphicon-eye-open"></i> ' .
L10n::t('Click to open/close') .
'</button></p>';
} elseif (count($reasons) == 1) {
$reason = array_pop($reasons);
$content_filter_html .= '<p>' . htmlspecialchars($reason) . ' <button type="button" id="content-filter-wrap-' . $rnd . '" class="btn btn-default btn-xs content-filter-button" onclick="openClose(\'content-filter-' . $rnd . '\');"><i class="glyphicon glyphicon-eye-open"></i> ' .
L10n::t('Click to open/close') .
'</button></p>';
}
$content_filter_html .= '<div id="content-filter-' . $rnd . '" class="content-filter-content" style="display: none;">';
$html = $content_filter_html . $html . '</div>';
} }
return $html; return $html;

22
view/templates/wall/content_filter.tpl Normal file
View File

@ -0,0 +1,22 @@
{{if count($reasons) > 1}}
<ul class="content-filter-reasons">
{{foreach $reasons as $reason}}
<li>{{$reason|escape:html}}</li>
{{/foreach}}
</ul>
<p>
<button type="button" id="content-filter-wrap-{{$rnd}}" class="btn btn-default btn-small content-filter-button" onclick="openClose('content-filter-{{$rnd}}');">
<i class="glyphicon glyphicon-eye-open"></i> {{$openclose}}
</button>
</p>
{{else}}
<p>
{{$reasons.0|escape:html}}
<button type="button" id="content-filter-wrap-{{$rnd}}" class="btn btn-default btn-xs content-filter-button" onclick="openClose('content-filter-{{$rnd}}');">
<i class="glyphicon glyphicon-eye-open"></i> {{$openclose}}
</button>
</p>
{{/if}}
<div id="content-filter-{{$rnd}}" class="content-filter-content" style="display: none;">
{{$html}}
</div>