Skip to content

Commit 5ada92d

Browse files
MauricioFauthMauricioFauth
authored
Merge pull request #19663 from MauricioFauth/column-definition-bs-form-classes
Add Bootstrap form classes to column definition inputs
2 parents 7c28e8e + 62d64df commit 5ada92d

4 files changed

Lines changed: 23 additions & 23 deletions

File tree

‎resources/templates/columns_definitions/column_attribute.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
{% endif %}
1212
{% set attribute = attribute|upper %}
1313
<select name="field_attribute[{{ column_number }}]"
14-
id="field_{{ column_number }}_{{ ci - ci_offset }}">
14+
id="field_{{ column_number }}_{{ ci - ci_offset }}" class="form-select">
1515
{% set cnt_attribute_types = attribute_types|length - 1 %}
1616
{% for i in 0..cnt_attribute_types %}
1717
<option value="{{ attribute_types[i] }}"

‎resources/templates/columns_definitions/column_attributes.twig‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,22 @@
1818
{% set ci = ci + 1 %}
1919
</td>
2020
<td class="text-center">
21-
<select class="column_type" name="field_type[{{ column_number }}]" id="field_{{ column_number }}_{{ ci - ci_offset }}"
21+
<select class="column_type form-select" name="field_type[{{ column_number }}]" id="field_{{ column_number }}_{{ ci - ci_offset }}"
2222
{{- column_meta['column_status'] is defined and not column_meta['column_status']['isEditable'] ? ' disabled' }}>
2323
{{ get_supported_datatypes(type_upper) }}
2424
</select>
2525
{% set ci = ci + 1 %}
2626
</td>
2727
<td class="text-center">
2828
<input id="field_{{ column_number }}_{{ ci - ci_offset }}" type="text" name="field_length[{{ column_number }}]" size="
29-
{{- length_values_input_size }}" value="{{ length }}" class="textfield">
29+
{{- length_values_input_size }}" value="{{ length }}" class="textfield form-control">
3030
<p class="enum_notice" id="enum_notice_{{ column_number }}_{{ ci - ci_offset }}">
3131
<a href="#" class="open_enum_editor">{{ t('Edit ENUM/SET values') }}</a>
3232
</p>
3333
{% set ci = ci + 1 %}
3434
</td>
3535
<td class="text-center">
36-
<select name="field_default_type[{{ column_number }}]" id="field_{{ column_number }}_{{ ci - ci_offset }}" class="default_type">
36+
<select name="field_default_type[{{ column_number }}]" id="field_{{ column_number }}_{{ ci - ci_offset }}" class="default_type form-select">
3737
<option value="NONE"{{ column_meta['DefaultType'] is defined and column_meta['DefaultType'] == 'NONE' ? ' selected' }}>
3838
{{ t('None', context = 'for default') }}
3939
</option>
@@ -53,15 +53,15 @@
5353
{% endif %}
5454
</select>
5555
{% if char_editing == 'textarea' %}
56-
<textarea name="field_default_value[{{ column_number }}]" cols="15" class="textfield default_value">{{ default_value }}</textarea>
56+
<textarea name="field_default_value[{{ column_number }}]" cols="15" class="textfield default_value form-control" style="resize: both;">{{ default_value }}</textarea>
5757
{% else %}
58-
<input type="text" name="field_default_value[{{ column_number }}]" size="12" value="{{ default_value ?? '' }}" class="textfield default_value">
58+
<input type="text" name="field_default_value[{{ column_number }}]" size="12" value="{{ default_value ?? '' }}" class="textfield default_value form-control">
5959
{% endif %}
6060
{% set ci = ci + 1 %}
6161
</td>
6262
<td class="text-center">
6363
{# column collation #}
64-
<select lang="en" dir="ltr" name="field_collation[{{ column_number }}]" id="field_{{ column_number }}_{{ ci - ci_offset }}">
64+
<select lang="en" dir="ltr" name="field_collation[{{ column_number }}]" id="field_{{ column_number }}_{{ ci - ci_offset }}" class="form-select">
6565
<option value=""></option>
6666
{% for charset in charsets %}
6767
<optgroup label="{{ charset.name }}" title="{{ charset.description }}">
@@ -90,14 +90,14 @@
9090
{% set ci = ci + 1 %}
9191
</td>
9292
<td class="text-center">
93-
<input name="field_null[{{ column_number }}]" id="field_{{ column_number }}_{{ ci - ci_offset }}" type="checkbox" value="YES" class="allow_null"
93+
<input name="field_null[{{ column_number }}]" id="field_{{ column_number }}_{{ ci - ci_offset }}" type="checkbox" value="YES" class="allow_null form-check-input"
9494
{{- column_meta['Null'] is defined and column_meta['Null'] is not empty and column_meta['Null'] != 'NO' and column_meta['Null'] != 'NOT NULL' ? ' checked' }}>
9595
{% set ci = ci + 1 %}
9696
</td>
9797
{% if change_column is defined and change_column is not empty %}
9898
{# column Adjust privileges, Only for 'Edit' Column(s) #}
9999
<td class="text-center">
100-
<input name="field_adjust_privileges[{{ column_number }}]" id="field_{{ column_number }}_{{ ci - ci_offset }}" type="checkbox" value="NULL" class="allow_null"
100+
<input name="field_adjust_privileges[{{ column_number }}]" id="field_{{ column_number }}_{{ ci - ci_offset }}" type="checkbox" value="NULL" class="allow_null form-check-input"
101101
{%- if privs_available %} checked>
102102
{%- else %} title="{{ t("You don't have sufficient privileges to perform this operation; Please refer to the documentation for more details") }}" disabled>
103103
{%- endif %}
@@ -107,7 +107,7 @@
107107
{% if not is_backup %}
108108
{# column indexes, See my other comment about this 'if'. #}
109109
<td class="text-center">
110-
<select name="field_key[{{ column_number }}]" id="field_{{ column_number }}_{{ ci - ci_offset }}" data-index="">
110+
<select name="field_key[{{ column_number }}]" id="field_{{ column_number }}_{{ ci - ci_offset }}" class="form-select" data-index="">
111111
<option value="none_{{ column_number }}">---</option>
112112
<option value="primary_{{ column_number }}" title="{{ t('Primary') }}"
113113
{{- column_meta['Key'] is defined and column_meta['Key'] == 'PRI' ? ' selected' }}>
@@ -134,20 +134,20 @@
134134
</td>
135135
{% endif %}
136136
<td class="text-center">
137-
<input name="field_extra[{{ column_number }}]" id="field_{{ column_number }}_{{ ci - ci_offset }}" type="checkbox" value="AUTO_INCREMENT"
137+
<input name="field_extra[{{ column_number }}]" id="field_{{ column_number }}_{{ ci - ci_offset }}" type="checkbox" value="AUTO_INCREMENT" class="form-check-input"
138138
{{- column_meta['Extra'] is defined and column_meta['Extra']|lower == 'auto_increment' ? ' checked' }}>
139139
{% set ci = ci + 1 %}
140140
</td>
141141
<td class="text-center">
142-
<textarea id="field_{{ column_number }}_{{ ci - ci_offset }}" rows="1" name="field_comments[{{ column_number }}]" maxlength="{{ max_length }}">
142+
<textarea id="field_{{ column_number }}_{{ ci - ci_offset }}" rows="1" name="field_comments[{{ column_number }}]" maxlength="{{ max_length }}" class="form-control" style="resize: both;">
143143
{{- column_meta['Field'] is defined and comments_map is iterable and comments_map[column_meta['Field']] is defined ? comments_map[column_meta['Field']] -}}
144144
</textarea>
145145
{% set ci = ci + 1 %}
146146
</td>
147147
{# column virtuality #}
148148
{% if is_virtual_columns_supported %}
149149
<td class="text-center">
150-
<select name="field_virtuality[{{ column_number }}]" id="field_{{ column_number }}_{{ ci - ci_offset }}" class="virtuality">
150+
<select name="field_virtuality[{{ column_number }}]" id="field_{{ column_number }}_{{ ci - ci_offset }}" class="virtuality form-select">
151151
{% for key, value in options %}
152152
{% set virtuality = column_meta['Extra'] is defined ? column_meta['Extra'] : null %}
153153
{# Creating a new row on create table sends a Virtuality field #}
@@ -160,9 +160,9 @@
160160
</select>
161161

162162
{% if char_editing == 'textarea' %}
163-
<textarea name="field_expression[{{ column_number }}]" cols="15" class="textfield expression">{{ column_meta['Expression'] is defined ? column_meta['Expression'] }}</textarea>
163+
<textarea name="field_expression[{{ column_number }}]" cols="15" class="textfield expression form-control" style="resize: both;">{{ column_meta['Expression'] is defined ? column_meta['Expression'] }}</textarea>
164164
{% else %}
165-
<input type="text" name="field_expression[{{ column_number }}]" size="12" value="{{ column_meta['Expression'] is defined ? column_meta['Expression'] }}" placeholder="{{ t('Expression') }}" class="textfield expression">
165+
<input type="text" name="field_expression[{{ column_number }}]" size="12" value="{{ column_meta['Expression'] is defined ? column_meta['Expression'] }}" placeholder="{{ t('Expression') }}" class="textfield expression form-control">
166166
{% endif %}
167167
{% set ci = ci + 1 %}
168168
</td>
@@ -179,7 +179,7 @@
179179
{% endfor %}
180180

181181
<td class="text-center">
182-
<select id="field_{{ column_number }}_{{ ci - ci_offset }}" name="field_move_to[{{ column_number }}]" size="1" width="5em">
182+
<select id="field_{{ column_number }}_{{ ci - ci_offset }}" name="field_move_to[{{ column_number }}]" size="1" class="form-select">
183183
<option value="" selected>&nbsp;</option>
184184
<option value="-first"{{ current_index == 0 ? ' disabled' }}>
185185
{{ t('first') }}
@@ -197,7 +197,7 @@
197197

198198
{% if relation_parameters.browserTransformationFeature is not null and relation_parameters.columnCommentsFeature is not null and browse_mime %}
199199
<td class="text-center">
200-
<select id="field_{{ column_number }}_{{ ci - ci_offset }}" size="1" name="field_mimetype[{{ column_number }}]">
200+
<select id="field_{{ column_number }}_{{ ci - ci_offset }}" size="1" name="field_mimetype[{{ column_number }}]" class="form-select">
201201
<option value="">&nbsp;</option>
202202
{% if available_mime['mimetype'] is defined and available_mime['mimetype'] is iterable %}
203203
{% for media_type in available_mime['mimetype'] %}
@@ -212,7 +212,7 @@
212212
{% set ci = ci + 1 %}
213213
</td>
214214
<td class="text-center">
215-
<select id="field_{{ column_number }}_{{ ci - ci_offset }}" size="1" name="field_transformation[{{ column_number }}]">
215+
<select id="field_{{ column_number }}_{{ ci - ci_offset }}" size="1" name="field_transformation[{{ column_number }}]" class="form-select">
216216
<option value="" title="{{ t('None') }}"></option>
217217
{% if available_mime['transformation'] is defined and available_mime['transformation'] is iterable %}
218218
{% for mimekey, transform in available_mime['transformation'] %}
@@ -230,12 +230,12 @@
230230
{% set ci = ci + 1 %}
231231
</td>
232232
<td class="text-center">
233-
<input id="field_{{ column_number }}_{{ ci - ci_offset }}" type="text" name="field_transformation_options[{{ column_number }}]" size="16" class="textfield" value="
233+
<input id="field_{{ column_number }}_{{ ci - ci_offset }}" type="text" name="field_transformation_options[{{ column_number }}]" size="16" class="textfield form-control" value="
234234
{{- column_meta['Field'] is defined and mime_map[column_meta['Field']]['transformation_options'] is defined ? mime_map[column_meta['Field']]['transformation_options'] }}">
235235
{% set ci = ci + 1 %}
236236
</td>
237237
<td class="text-center">
238-
<select id="field_{{ column_number }}_{{ ci - ci_offset }}" size="1" name="field_input_transformation[{{ column_number }}]">
238+
<select id="field_{{ column_number }}_{{ ci - ci_offset }}" size="1" name="field_input_transformation[{{ column_number }}]" class="form-select">
239239
<option value="" title="{{ t('None') }}"></option>
240240
{% if available_mime['input_transformation'] is defined and available_mime['input_transformation'] is iterable %}
241241
{% for mimekey, transform in available_mime['input_transformation'] %}
@@ -251,7 +251,7 @@
251251
{% set ci = ci + 1 %}
252252
</td>
253253
<td class="text-center">
254-
<input id="field_{{ column_number }}_{{ ci - ci_offset }}" type="text" name="field_input_transformation_options[{{ column_number }}]" size="16" class="textfield" value="
254+
<input id="field_{{ column_number }}_{{ ci - ci_offset }}" type="text" name="field_input_transformation_options[{{ column_number }}]" size="16" class="textfield form-control" value="
255255
{{- column_meta['Field'] is defined and mime_map[column_meta['Field']]['input_transformation_options'] is defined ? mime_map[column_meta['Field']]['input_transformation_options'] }}">
256256
{% set ci = ci + 1 %}
257257
</td>

‎resources/templates/columns_definitions/column_name.twig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
type="text"
2525
name="field_name[{{ column_number }}]"
2626
maxlength="64"
27-
class="textfield"
27+
class="textfield form-control"
2828
title="{{ title }}"
2929
size="10"
3030
value="{{ column_meta['Field'] is defined ? column_meta['Field'] }}">

‎tests/unit/Controllers/Table/Structure/ChangeControllerTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function testChangeController(): void
6060
. ' type="text"' . "\n"
6161
. ' name="field_name[0]"' . "\n"
6262
. ' maxlength="64"' . "\n"
63-
. ' class="textfield"' . "\n"
63+
. ' class="textfield form-control"' . "\n"
6464
. ' title="Column"' . "\n"
6565
. ' size="10"' . "\n"
6666
. ' value="_id">' . "\n",

0 commit comments

Comments
 (0)