Skip to content

Commit 75cf234

Browse files
Akir4dAkir4d
committed
Fix card layout
1 parent 6eb00d0 commit 75cf234

File tree

3 files changed

+130
-135
lines changed

3 files changed

+130
-135
lines changed

‎assets/grocery_crud/themes/datatables-bootstrap3/views/add-multi-columns.php‎

Lines changed: 62 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -5,75 +5,73 @@
55
<div class='form-container table-container form-content form-div'>
66
<?php echo form_open($insert_url, 'method="post" id="crudForm" enctype="multipart/form-data" class="form-horizontal"'); ?>
77
<div class="card-body">
8-
<div class="container">
9-
<div class="row">
10-
<div class="col">
11-
<?php
12-
$counter = 0;
13-
$endline = '';
14-
$samelineobj = '';
15-
$cut = count($fields);
16-
//count real fields
17-
foreach ($fields as $field) {
18-
$fi = str_replace("'", '', str_replace('"', '', str_replace(' ', '', $input_fields[$field->field_name]->input)));
19-
if ($field->field_name == 'jobStatus') $cut--;
20-
if ((strpos($fi, "class=" . $exclude) !== false) or (strpos($fi, "class=mini-" . $exclude) !== false)) $cut--;
21-
if (strpos($fi, "class=" . $sameline) !== false) $cut--;
22-
}
23-
foreach ($fields as $field) :
24-
$fi = str_replace("'", '', str_replace('"', '', str_replace(' ', '', $input_fields[$field->field_name]->input)));
25-
if ($field->field_name == 'jobStatus') :
26-
echo '';
27-
elseif (strpos($fi, 'class=' . $sameline) !== false) :
28-
$samelineobj .= '<div class="col"><div class="form-group"><label for="' . $field->field_name . '" class="control-label">';
29-
$samelineobj .= strip_tags($input_fields[$field->field_name]->display_as);
30-
$samelineobj .= ($input_fields[$field->field_name]->required) ? "<span class='required'>*</span> " : "";
31-
$samelineobj .= '</label><div id="' . $field->field_name . '_field_box">' . $input_fields[$field->field_name]->input;
32-
$samelineobj .= '</div></div></div>';
33-
elseif ((strpos($fi, "class=" . $exclude) !== false) or (strpos($fi, "class=mini-" . $exclude) !== false)) :
34-
$endline .= ' <div class="form-group"><label for="' . $field->field_name . '" class="control-label">';
35-
$endline .= strip_tags($input_fields[$field->field_name]->display_as);
36-
$endline .= ($input_fields[$field->field_name]->required) ? "<span class='required'>*</span> " : "";
37-
$endline .= '</label><div id="' . $field->field_name . '_field_box">' . $input_fields[$field->field_name]->input;
38-
$endline .= '</div></div>';
39-
else :
40-
if ((intval($counter % ($cut / $columns)) === 0) and $counter < ($cut - ($cut % $columns)) and $counter !== 0) {
41-
echo ' </div><div class="col">';
42-
}
43-
?>
8+
<div class="row">
9+
<div class="col">
10+
<?php
11+
$counter = 0;
12+
$endline = '';
13+
$samelineobj = '';
14+
$cut = count($fields);
15+
//count real fields
16+
foreach ($fields as $field) {
17+
$fi = str_replace("'", '', str_replace('"', '', str_replace(' ', '', $input_fields[$field->field_name]->input)));
18+
if ($field->field_name == 'jobStatus') $cut--;
19+
if ((strpos($fi, "class=" . $exclude) !== false) or (strpos($fi, "class=mini-" . $exclude) !== false)) $cut--;
20+
if (strpos($fi, "class=" . $sameline) !== false) $cut--;
21+
}
22+
foreach ($fields as $field) :
23+
$fi = str_replace("'", '', str_replace('"', '', str_replace(' ', '', $input_fields[$field->field_name]->input)));
24+
if ($field->field_name == 'jobStatus') :
25+
echo '';
26+
elseif (strpos($fi, 'class=' . $sameline) !== false) :
27+
$samelineobj .= '<div class="col"><div class="form-group"><label for="' . $field->field_name . '" class="control-label">';
28+
$samelineobj .= strip_tags($input_fields[$field->field_name]->display_as);
29+
$samelineobj .= ($input_fields[$field->field_name]->required) ? "<span class='required'>*</span> " : "";
30+
$samelineobj .= '</label><div id="' . $field->field_name . '_field_box">' . $input_fields[$field->field_name]->input;
31+
$samelineobj .= '</div></div></div>';
32+
elseif ((strpos($fi, "class=" . $exclude) !== false) or (strpos($fi, "class=mini-" . $exclude) !== false)) :
33+
$endline .= ' <div class="form-group"><label for="' . $field->field_name . '" class="control-label">';
34+
$endline .= strip_tags($input_fields[$field->field_name]->display_as);
35+
$endline .= ($input_fields[$field->field_name]->required) ? "<span class='required'>*</span> " : "";
36+
$endline .= '</label><div id="' . $field->field_name . '_field_box">' . $input_fields[$field->field_name]->input;
37+
$endline .= '</div></div>';
38+
else :
39+
if ((intval($counter % ($cut / $columns)) === 0) and $counter < ($cut - ($cut % $columns)) and $counter !== 0) {
40+
echo ' </div><div class="col">';
41+
}
42+
?>
4443

45-
<div class="form-group">
46-
<label for="<?php echo $field->field_name; ?>" class="control-label">
47-
<?php
48-
echo strip_tags($input_fields[$field->field_name]->display_as);
49-
echo ($input_fields[$field->field_name]->required) ? "<span class='required'>*</span> " : "";
50-
?>
51-
</label>
52-
<div id="<?php echo $field->field_name; ?>_field_box">
53-
<?php echo $input_fields[$field->field_name]->input ?>
54-
</div>
44+
<div class="form-group">
45+
<label for="<?php echo $field->field_name; ?>" class="control-label">
46+
<?php
47+
echo strip_tags($input_fields[$field->field_name]->display_as);
48+
echo ($input_fields[$field->field_name]->required) ? "<span class='required'>*</span> " : "";
49+
?>
50+
</label>
51+
<div id="<?php echo $field->field_name; ?>_field_box">
52+
<?php echo $input_fields[$field->field_name]->input ?>
5553
</div>
54+
</div>
5655

57-
<?php
58-
$counter++;
59-
endif;
60-
endforeach; ?>
61-
</div>
62-
</div>
63-
<!-- Start of hidden inputs -->
64-
<?php
65-
echo '<div class="row">' . $samelineobj . '</div>' . $endline;
66-
foreach ($hidden_fields as $hidden_field) {
67-
echo $hidden_field->input;
68-
}
69-
?>
70-
<!-- End of hidden inputs -->
71-
<?php if ($is_ajax) { ?><input type="hidden" name="is_ajax" value="true" /><?php } ?>
72-
<div class="col-sm-12">
73-
<div id='report-error' class='report-div error callout callout-danger' style="display:none"></div>
74-
<div id='report-success' class='report-div success callout callout-success' style="display:none"></div>
56+
<?php
57+
$counter++;
58+
endif;
59+
endforeach; ?>
7560
</div>
7661
</div>
62+
<!-- Start of hidden inputs -->
63+
<?php
64+
echo '<div class="row">' . $samelineobj . '</div>' . $endline;
65+
foreach ($hidden_fields as $hidden_field) {
66+
echo $hidden_field->input;
67+
}
68+
?>
69+
<!-- End of hidden inputs -->
70+
<?php if ($is_ajax) { ?><input type="hidden" name="is_ajax" value="true" /><?php } ?>
71+
<div class="col-sm-12">
72+
<div id='report-error' class='report-div error callout callout-danger' style="display:none"></div>
73+
<div id='report-success' class='report-div success callout callout-success' style="display:none"></div>
74+
</div>
7775
</div>
7876
<div class='card-footer'>
7977

‎assets/grocery_crud/themes/datatables-bootstrap3/views/edit-multi-columns.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
<?php echo form_open($update_url, 'method="post" id="crudForm" enctype="multipart/form-data" class="form-horizontal"'); ?>
88
<div class="card-body">
9-
<div class="container">
109
<div class="row">
1110
<div class="col">
1211
<?php
@@ -95,7 +94,6 @@
9594
<div id='report-error' class='report-div error callout callout-danger' style="display:none"></div>
9695
<div id='report-success' class='report-div success callout callout-success' style="display:none"></div>
9796
</div>
98-
</div>
9997
</div>
10098
<div class='card-footer'>
10199
<button class="btn btn-success b10" type="submit" id="form-button-save">

‎assets/grocery_crud/themes/datatables-bootstrap3/views/read-multi-columns.php‎

Lines changed: 68 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -5,80 +5,79 @@
55
<div class='form-container table-container form-content form-div'>
66
<?php echo form_open($update_url, 'method="post" id="crudForm" enctype="multipart/form-data" class="form-horizontal"'); ?>
77
<div class="card-body">
8-
<div class="container-fluid">
9-
<div class="row">
10-
<div class="col">
11-
<?php
12-
$counter = 0;
13-
$cut = count($fields);
14-
//count real fields
15-
foreach ($fields as $field) {
16-
if ($field->field_name == 'jobStatus') $cut--;
17-
}
18-
foreach ($fields as $field) :
19-
if ($field->field_name == 'jobStatus') :
20-
$stat = 'card-secondary';
21-
$color = strip_tags($input_fields[$field->field_name]->input);
22-
switch ($color) {
23-
case 'red':
24-
$stat = 'card-danger';
25-
break;
26-
case 'yellow':
27-
$stat = 'card-warning';
28-
break;
29-
case 'blue':
30-
$stat = 'card-primary';
31-
break;
32-
case 'green':
33-
$stat = 'card-success';
34-
break;
35-
}
36-
echo '<script>$(".cardType").addClass("' . $stat . '");</script>';
37-
else :
38-
if ((intval($counter % ($cut / $columns)) === 0) and $counter < ($cut - ($cut%$columns)) and $counter !== 0) {
39-
echo ' </div><div class="col">';
40-
}
41-
?>
42-
<div class="card card-outline card-secondary">
43-
<div class="card-header">
44-
<h3 class="card-title">
45-
<?php
46-
echo strip_tags($input_fields[$field->field_name]->display_as);
47-
?>
48-
</h3>
49-
</div>
50-
<div class="card-body" id="<?php echo $field->field_name; ?>_field_box">
51-
<?php echo $input_fields[$field->field_name]->input ?>
52-
</div>
8+
<div class="row">
9+
<div class="col">
10+
<?php
11+
$counter = 0;
12+
$cut = count($fields);
13+
//count real fields
14+
foreach ($fields as $field) {
15+
if ($field->field_name == 'jobStatus') $cut--;
16+
}
17+
foreach ($fields as $field) :
18+
if ($field->field_name == 'jobStatus') :
19+
$stat = 'card-secondary';
20+
$color = strip_tags($input_fields[$field->field_name]->input);
21+
switch ($color) {
22+
case 'red':
23+
$stat = 'card-danger';
24+
break;
25+
case 'yellow':
26+
$stat = 'card-warning';
27+
break;
28+
case 'blue':
29+
$stat = 'card-primary';
30+
break;
31+
case 'green':
32+
$stat = 'card-success';
33+
break;
34+
}
35+
echo '<script>$(".cardType").addClass("' . $stat . '");</script>';
36+
else :
37+
if ((intval($counter % ($cut / $columns)) === 0) and $counter < ($cut - ($cut % $columns)) and $counter !== 0) {
38+
echo ' </div><div class="col">';
39+
}
40+
?>
41+
<div class="card card-outline card-secondary">
42+
<div class="card-header">
43+
<h3 class="card-title">
44+
<?php
45+
echo strip_tags($input_fields[$field->field_name]->display_as);
46+
?>
47+
</h3>
5348
</div>
49+
<div class="card-body" id="<?php echo $field->field_name; ?>_field_box">
50+
<?php echo $input_fields[$field->field_name]->input ?>
51+
</div>
52+
</div>
5453

55-
<?php
56-
$counter++;
57-
endif;
58-
endforeach; ?>
59-
</div>
60-
</div>
61-
<!-- Start of hidden inputs -->
62-
<?php
63-
foreach ($hidden_fields as $hidden_field) {
64-
echo $hidden_field->input;
65-
}
66-
?>
67-
<!-- End of hidden inputs -->
68-
<?php if ($is_ajax) { ?><input type="hidden" name="is_ajax" value="true" /><?php } ?>
69-
<div class="col-sm-12">
70-
<div id='report-error' class='report-div error callout callout-danger' style="display:none"></div>
71-
<div id='report-success' class='report-div success callout callout-success' style="display:none"></div>
54+
<?php
55+
$counter++;
56+
endif;
57+
endforeach; ?>
7258
</div>
7359
</div>
74-
75-
<div class='card-footer'>
76-
<button class="btn btn-info b10 back-to-list viewOnlyButton" type="button" id="cancel-button">
77-
<i class="fas fa-arrow-alt-circle-left"></i>
78-
<?php echo $this->l('form_back_to_list'); ?>
79-
</button>
60+
<!-- Start of hidden inputs -->
61+
<?php
62+
foreach ($hidden_fields as $hidden_field) {
63+
echo $hidden_field->input;
64+
}
65+
?>
66+
<!-- End of hidden inputs -->
67+
<?php if ($is_ajax) { ?><input type="hidden" name="is_ajax" value="true" /><?php } ?>
68+
<div class="col-sm-12">
69+
<div id='report-error' class='report-div error callout callout-danger' style="display:none"></div>
70+
<div id='report-success' class='report-div success callout callout-success' style="display:none"></div>
8071
</div>
8172
</div>
82-
</form>
73+
74+
<div class='card-footer'>
75+
<button class="btn btn-info b10 back-to-list viewOnlyButton" type="button" id="cancel-button">
76+
<i class="fas fa-arrow-alt-circle-left"></i>
77+
<?php echo $this->l('form_back_to_list'); ?>
78+
</button>
79+
</div>
8380
</div>
81+
</form>
82+
</div>
8483
</div>

0 commit comments

Comments
 (0)