Merge pull request #14255 from laps15/templates

Addapt getTableHeader to twig template
This commit is contained in:
Maurício Meneghini Fauth 2018-05-04 01:51:41 -03:00 committed by GitHub
commit dcb2aec958
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 30 deletions

View File

@ -733,36 +733,11 @@ class CentralColumns
string $title = '',
int $actionCount = 0
): string {
$action = '';
if ($actionCount > 0) {
$action .= '<th class="column_action" colspan="' . $actionCount . '">'
. __('Action') . '</th>';
}
$tableheader = '<thead>';
$tableheader .= '<tr>'
. '<th class="' . $class . '"></th>'
. '<th class="hide"></th>'
. $action
. '<th class="' . $class . '" title="' . $title . '" data-column="name">'
. __('Name') . '<div class="sorticon"></div></th>'
. '<th class="' . $class . '" title="' . $title . '" data-column="type">'
. __('Type') . '<div class="sorticon"></div></th>'
. '<th class="' . $class . '" title="' . $title . '" data-column="length">'
. __('Length/Values') . '<div class="sorticon"></div></th>'
. '<th class="' . $class . '" title="' . $title . '" data-column="default">'
. __('Default') . '<div class="sorticon"></div></th>'
. '<th class="' . $class . '" title="' . $title . '" data-column="collation"'
. '>' . __('Collation') . '<div class="sorticon"></div></th>'
. '<th class="' . $class . '" title="' . $title
. '" data-column="attribute">'
. __('Attribute') . '<div class="sorticon"></div></th>'
. '<th class="' . $class . '" title="' . $title . '" data-column="isnull">'
. __('Null') . '<div class="sorticon"></div></th>'
. '<th class="' . $class . '" title="' . $title . '" data-column="extra">'
. __('A_I') . '<div class="sorticon"></div></th>'
. '</tr>';
$tableheader .= '</thead>';
return $tableheader;
return Template::get('database/central_columns/table_header')->render(array(
"class" => $class,
"title" => $title,
"actionCount" => $actionCount,
));
}
/**

View File

@ -0,0 +1,41 @@
<thead>
<tr>
<th class="{{ class }}"></th>
<th class="hide"></th>
{% if actionCount > 0 %}
<th class="column_action" colspan="{{actionCount}}">{% trans 'Action' %}</th>
{% endif %}
<th class="{{ class }}" title="{{ title }}" data-column="name">
{% trans 'Name' %}
<div class="sorticon"></div>
</th>
<th class="{{ class }}" title="{{ title }}" data-column="type">
{% trans 'Type' %}
<div class="sorticon"></div>
</th>
<th class="{{ class }}" title="{{ title }}" data-column="length">
{% trans 'Lenght/Value' %}
<div class="sorticon"></div>
</th>
<th class="{{ class }}" title="{{ title }}" data-column="default">
{% trans 'Default' %}
<div class="sorticon"></div>
</th>
<th class="{{ class }}" title="{{ title }}" data-column="collation">
{% trans 'Collation' %}
<div class="sorticon"></div>
</th>
<th class="{{ class }}" title="{{ title }}" data-column="attribute">
{% trans 'Attribute' %}
<div class="sorticon"></div>
</th>
<th class="{{ class }}" title="{{ title }}" data-column="isnull">
{% trans 'Null' %}
<div class="sorticon"></div>
</th>
<th class="{{ class }}" title="{{ title }}" data-column="extra">
{% trans 'A_I' %}
<div class="sorticon"></div>
</th>
</tr>
</thead>