Skip to content

Commit

Permalink
use rex-link-expanded for icon buttons (#1184)
Browse files Browse the repository at this point in the history
  • Loading branch information
Dirk Schürjohann authored Dec 18, 2021
1 parent 6533a32 commit e874625
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion plugins/email/pages/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
$list->addTableColumnGroup([40, 40, '*', 153, 153]);

$tdIcon = '<i class="rex-icon rex-icon-template"></i>';
$thIcon = '<a href="' . $list->getUrl(['func' => 'add']) . '"' . rex::getAccesskey(rex_i18n::msg('create_template'), 'add') . ' title="' . rex_i18n::msg('create_template') . '"><i class="rex-icon rex-icon-add-template"></i></a>';
$thIcon = '<a class="rex-link-expanded" href="' . $list->getUrl(['func' => 'add']) . '"' . rex::getAccesskey(rex_i18n::msg('create_template'), 'add') . ' title="' . rex_i18n::msg('create_template') . '"><i class="rex-icon rex-icon-add-template"></i></a>';
$list->addColumn($thIcon, $tdIcon, 0, [
'<th class="rex-table-icon">###VALUE###</th>',
'<td class="rex-table-icon">###VALUE###</td>'
Expand Down
4 changes: 2 additions & 2 deletions plugins/manager/lib/yform/manager.php
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ public function getDataPage()
$rex_yform_list[$list->getPager()->getCursorName()] = rex_request($list->getPager()->getCursorName(), 'int', 0);

if ($this->hasDataPageFunction('add') && $this->table->isGranted('EDIT', rex::getUser())) {
$thIcon = '<a href="index.php?' . http_build_query(array_merge(['func' => 'add'], $rex_link_vars)) . '"' . rex::getAccesskey(rex_i18n::msg('add'), 'add') . '><i class="rex-icon rex-icon-add"></i></a>';
$thIcon = '<a class="rex-link-expanded" href="index.php?' . http_build_query(array_merge(['func' => 'add'], $rex_link_vars)) . '"' . rex::getAccesskey(rex_i18n::msg('add'), 'add') . '><i class="rex-icon rex-icon-add"></i></a>';
$tdIcon = '<i class="rex-icon rex-icon-editmode"></i>';
$list->addColumn($thIcon, $tdIcon, 0, ['<th class="rex-table-icon">###VALUE###</th>', '<td class="rex-table-icon" data-title="' . rex_i18n::msg('id') . '">###VALUE###</td>']);
$list->setColumnParams($thIcon, array_merge(['data_id' => '###id###', 'func' => 'edit'], $rex_yform_list));
Expand Down Expand Up @@ -1397,7 +1397,7 @@ function rex_yform_list_delete_format($p)
// $list->setColumnFormat('id', 'Id');

$tdIcon = '<i class="rex-icon rex-icon-editmode"></i>';
$thIcon = '<a href="' . $list->getUrl(['table_name' => $table->getTableName(), 'func' => 'choosenadd']) . '" ' . rex::getAccesskey(rex_i18n::msg('add'), 'add') . '><i class="rex-icon rex-icon-add"></i></a>';
$thIcon = '<a class="rex-link-expanded" href="' . $list->getUrl(['table_name' => $table->getTableName(), 'func' => 'choosenadd']) . '" ' . rex::getAccesskey(rex_i18n::msg('add'), 'add') . '><i class="rex-icon rex-icon-add"></i></a>';
$list->addColumn($thIcon, $tdIcon, 0, ['<th class="rex-table-icon">###VALUE###</th>', '<td class="rex-table-icon">###VALUE###</td>']);
$list->setColumnParams($thIcon, ['field_id' => '###id###', 'func' => 'edit', 'type_name' => '###type_name###', 'type_id' => '###type_id###']);

Expand Down
2 changes: 1 addition & 1 deletion plugins/manager/pages/table_edit.php
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ function rex_yform_list_translate($params)
$list->setColumnSortable('hidden');

$tdIcon = '<i class="rex-icon rex-icon-table"></i>';
$thIcon = '<a href="' . $list->getUrl(['func' => 'add']) . '"' . rex::getAccesskey(rex_i18n::msg('add'), 'add') . '><i class="rex-icon rex-icon-add"></i></a>';
$thIcon = '<a class="rex-link-expanded" href="' . $list->getUrl(['func' => 'add']) . '"' . rex::getAccesskey(rex_i18n::msg('add'), 'add') . '><i class="rex-icon rex-icon-add"></i></a>';
$list->addColumn($thIcon, $tdIcon, 0, ['<th class="rex-table-icon">###VALUE###</th>', '<td class="rex-table-icon">###VALUE###</td>']);
$list->setColumnParams($thIcon, ['func' => 'edit', 'table_id' => '###id###']);

Expand Down
2 changes: 1 addition & 1 deletion plugins/rest/pages/access.php
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
$list->addTableColumnGroup([40, 40, '*', 153, 153]);

$tdIcon = '<i class="rex-icon rex-icon-template"></i>';
$thIcon = '<!--<a href="' . $list->getUrl(['func' => 'add']) . '"' . rex::getAccesskey(rex_i18n::msg('create_token'), 'add') . ' title="' . rex_i18n::msg('create_template') . '"><i class="rex-icon rex-icon-add-template"></i></a>-->';
$thIcon = '<!--<a class="rex-link-expanded" href="' . $list->getUrl(['func' => 'add']) . '"' . rex::getAccesskey(rex_i18n::msg('create_token'), 'add') . ' title="' . rex_i18n::msg('create_template') . '"><i class="rex-icon rex-icon-add-template"></i></a>-->';
$list->addColumn($thIcon, $tdIcon, 0, ['<th class="rex-table-icon">###VALUE###</th>', '<td class="rex-table-icon">###VALUE###</td>']);

$list->setColumnLabel('id', 'ID');
Expand Down
2 changes: 1 addition & 1 deletion plugins/rest/pages/token.php
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@
$list->addTableColumnGroup([40, 40, '*', 153, 153]);

$tdIcon = '<i class="rex-icon rex-icon-template"></i>';
$thIcon = '<a href="' . $list->getUrl(['func' => 'add']) . '"' . rex::getAccesskey(rex_i18n::msg('create_token'), 'add') . ' title="' . rex_i18n::msg('create_template') . '"><i class="rex-icon rex-icon-add-template"></i></a>';
$thIcon = '<a class="rex-link-expanded" href="' . $list->getUrl(['func' => 'add']) . '"' . rex::getAccesskey(rex_i18n::msg('create_token'), 'add') . ' title="' . rex_i18n::msg('create_template') . '"><i class="rex-icon rex-icon-add-template"></i></a>';
$list->addColumn($thIcon, $tdIcon, 0, ['<th class="rex-table-icon">###VALUE###</th>', '<td class="rex-table-icon">###VALUE###</td>']);

$list->setColumnLabel('id', 'ID');
Expand Down

0 comments on commit e874625

Please sign in to comment.