Skip to content

Add "button" type to column configuration for index view (CO-2137) #15

Merged
merged 3 commits into from
Sep 30, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions app/templates/MatchgridRecords/columns.inc
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,14 @@ $indexColumns = [
'sortable' => true
],
'referenceid' => [
'type' => 'echo',
'sortable' => true
'type' => 'button',
'button' => [
'text' => 'fieldVal',
'attrs' => ['class' => 'btn link referenceid'],
'popover' => 'fieldVal',
],
'truncate' => 8,
'sortable' => true
]
];

Expand Down
28 changes: 28 additions & 0 deletions app/templates/Standard/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,34 @@ function _column_key($modelsName, $c, $tz=null) {
print $entity->$col;
}
break;
case 'button':
$buttonAttrs = [];
$buttonText = $entity->$col;
if(!empty($cfg['button']['attrs'])) {
$buttonAttrs = $cfg['button']['attrs'];
}
$buttonAttrs['type'] = 'button';
if(!empty($cfg['button']['text']) && $cfg['button']['text'] != 'fieldVal') {
$buttonText = $cfg['button']['text'];
}
if(!empty($cfg['truncate']) && is_int($cfg['truncate'])) {
$buttonText = (strlen($buttonText) > $cfg['truncate']) ? substr($buttonText,0,$cfg['truncate']).'...' : $buttonText;
}
if(!empty($cfg['button']['popover'])) {
if($cfg['button']['popover'] == 'fieldVal') {
$buttonAttrs['data-content'] = $entity->$col;
} else {
$buttonAttrs['data-content'] = $cfg['button']['popover'];
}
$label = !empty($cfg['label']) ? $cfg['label'] : _column_key($modelsName, $col, $vv_tz);
$buttonAttrs['title'] = $label;
$buttonAttrs['data-toggle'] = 'popover';
$buttonAttrs['data-container'] = 'body';
$buttonAttrs['data-placement'] = 'top';
$buttonAttrs['data-animation'] = 'false';
}
print $this->Form->button($buttonText, $buttonAttrs);
break;
case 'link':
case 'echo':
default:
Expand Down
5 changes: 5 additions & 0 deletions app/templates/element/javascript.php
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,11 @@

// Make all select form controls Bootstrappy
$("select").addClass("form-control");

// Enable Bootstrap Popovers. Unless needed elsewhere, constrain this to #content
$(function () {
$('#content [data-toggle="popover"]').popover()
});

// Other buttons (jQuery)
$(".addbutton").button({
Expand Down
18 changes: 14 additions & 4 deletions app/webroot/css/co-base.css
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,14 @@ body.logged-in #top-menu {
color: #222;
margin-right: 0.5em;
}
/* Pagination */
/* MATCHGRID RECORDS INDEX */
body.matchgridrecords .popover {
max-width: unset;
}
body.matchgridrecords .popover-header {
font-size: 1em;
}
/* PAGINATION */
#pagination {
margin: 0;
min-height: 1.5em;
Expand Down Expand Up @@ -1190,9 +1197,6 @@ td.indented {
color: white !important;
text-decoration: none !important;
}
.btn:focus {
border: 1px dotted white;
}
.btn-primary.disabled,
.btn-primary:disabled {
color: #fff;
Expand All @@ -1214,6 +1218,12 @@ td.indented {
background-color: #c33; /* red */
color: white;
}
.btn.link {
font-size: 1em;
text-decoration: underline;
color: var(--cmg-blue-primary);
border: none;
}
/* Call to Action Blocks */
.call-to-action {
margin-bottom: 2em;
Expand Down