Skip to content

Commit 2b72074

Browse files
MauricioFauthMauricioFauth
committed
Remove .pma-fieldset CSS class from database/structure templates
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
1 parent fa8931e commit 2b72074

10 files changed

Lines changed: 124 additions & 172 deletions

File tree

‎public/themes/bootstrap/scss/_common.scss‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1781,14 +1781,6 @@ div#page_content div {
17811781
}
17821782
}
17831783

1784-
table.show_create {
1785-
margin-top: 1em;
1786-
1787-
td {
1788-
border-right: 1px solid #bbb;
1789-
}
1790-
}
1791-
17921784
#alias_modal {
17931785
table {
17941786
width: 100%;

‎public/themes/metro/scss/_common.scss‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2050,14 +2050,6 @@ div#page_content div {
20502050
}
20512051
}
20522052

2053-
table.show_create {
2054-
margin-top: 1em;
2055-
2056-
td {
2057-
border-right: 1px solid #bbb;
2058-
}
2059-
}
2060-
20612053
#alias_modal {
20622054
table th {
20632055
vertical-align: middle;

‎public/themes/original/scss/_common.scss‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1784,14 +1784,6 @@ div#page_content div {
17841784
}
17851785
}
17861786

1787-
table.show_create {
1788-
margin-top: 1em;
1789-
1790-
td {
1791-
border-right: 1px solid #bbb;
1792-
}
1793-
}
1794-
17951787
#alias_modal {
17961788
table {
17971789
width: 100%;

‎public/themes/pmahomme/scss/_common.scss‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1966,14 +1966,6 @@ div#page_content div {
19661966
}
19671967
}
19681968

1969-
table.show_create {
1970-
margin-top: 1em;
1971-
1972-
td {
1973-
border-right: 1px solid #bbb;
1974-
}
1975-
}
1976-
19771969
#alias_modal {
19781970
table {
19791971
width: 100%;

‎templates/database/structure/add_prefix.twig‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
11
<form id="ajax_form" action="{{ url('/database/structure/add-prefix-table') }}" method="post">
22
{{ get_hidden_inputs(url_params) }}
3-
4-
<fieldset class="pma-fieldset input">
5-
<table>
6-
<tr>
7-
<td>{% trans 'Add prefix' %}</td>
8-
<td>
9-
<input type="text" name="add_prefix" id="txtPrefix" aria-label="{% trans 'Add prefix' %}">
10-
</td>
11-
</tr>
12-
<tr>
13-
</table>
14-
</fieldset>
3+
<div>
4+
<label for="addTablePrefixInput" class="form-label">{% trans 'Add prefix' %}</label>
5+
<input type="text" class="form-control" id="addTablePrefixInput" name="add_prefix">
6+
</div>
157
</form>

‎templates/database/structure/change_prefix_form.twig‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,11 @@
11
<form id="ajax_form" action="{{ url(route) }}" method="post">
22
{{ get_hidden_inputs(url_params) }}
3-
4-
<fieldset class="pma-fieldset input">
5-
<table>
6-
<tr>
7-
<td>{% trans 'From' %}</td>
8-
<td>
9-
<input type="text" name="from_prefix" id="initialPrefix">
10-
</td>
11-
</tr>
12-
<tr>
13-
<td>{% trans 'To' %}</td>
14-
<td>
15-
<input type="text" name="to_prefix" id="newPrefix">
16-
</td>
17-
</tr>
18-
</table>
19-
</fieldset>
3+
<div class="mb-3">
4+
<label for="initialPrefixInput" class="form-label">{% trans 'From' %}</label>
5+
<input type="text" class="form-control" id="initialPrefixInput" name="from_prefix">
6+
</div>
7+
<div>
8+
<label for="newPrefixInput" class="form-label">{% trans 'To' %}</label>
9+
<input type="text" class="form-control" id="newPrefixInput" name="to_prefix">
10+
</div>
2011
</form>

‎templates/database/structure/copy_form.twig‎

Lines changed: 37 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,49 @@
11
<form id="ajax_form" action="{{ url('/database/structure/copy-table') }}" method="post">
22
{{ get_hidden_inputs(url_params) }}
33

4-
<fieldset class="pma-fieldset">
5-
<strong><label for="db_name_dropdown">{% trans 'Database:' %}</label></strong>
6-
<select id="db_name_dropdown" name="target_db">
4+
<div class="mb-3">
5+
<label for="databaseNameSelect" class="form-label">{% trans 'Database:' %}</label>
6+
<select class="form-select" id="databaseNameSelect" name="target_db">
77
{% for each_db in options %}
88
<option value="{{ each_db.name }}"{{ each_db.is_selected ? ' selected' }}>{{ each_db.name }}</option>
99
{% endfor %}
1010
</select>
11+
</div>
12+
13+
<fieldset class="mb-3">
14+
<legend class="col-form-label">{% trans 'Options:' %}</legend>
15+
<div class="form-check">
16+
<input class="form-check-input" type="radio" name="what" id="whatDataRadio" value="data" checked>
17+
<label class="form-check-label" for="whatDataRadio">{% trans 'Structure and data' %}</label>
18+
</div>
19+
<div class="form-check">
20+
<input class="form-check-input" type="radio" name="what" id="whatStructureRadio" value="structure">
21+
<label class="form-check-label" for="whatStructureRadio">{% trans 'Structure only' %}</label>
22+
</div>
23+
<div class="form-check">
24+
<input class="form-check-input" type="radio" name="what" id="whatDataOnlyRadio" value="dataonly">
25+
<label class="form-check-label" for="whatDataOnlyRadio">{% trans 'Data only' %}</label>
26+
</div>
27+
</fieldset>
1128

12-
<br><br>
13-
14-
<strong><label>{% trans 'Options:' %}</label></strong>
15-
16-
<br>
17-
18-
<input type="radio" id="what_structure" value="structure" name="what">
19-
<label for="what_structure">{% trans 'Structure only' %}</label>
20-
21-
<br>
22-
23-
<input type="radio" id="what_data" value="data" name="what" checked>
24-
<label for="what_data">{% trans 'Structure and data' %}</label>
25-
26-
<br>
27-
28-
<input type="radio" id="what_dataonly" value="dataonly" name="what">
29-
<label for="what_dataonly">{% trans 'Data only' %}</label>
30-
31-
<br><br>
32-
33-
<input type="checkbox" id="checkbox_drop" value="true" name="drop_if_exists">
34-
<label for="checkbox_drop">{% trans 'Add DROP TABLE' %}</label>
35-
36-
<br>
37-
38-
<input type="checkbox" id="checkbox_auto_increment_cp" value="1" name="sql_auto_increment">
39-
<label for="checkbox_auto_increment_cp">{% trans 'Add AUTO INCREMENT value' %}</label>
40-
41-
<br>
42-
43-
<input type="checkbox" id="checkbox_constraints" value="1" name="sql_auto_increment" checked>
44-
<label for="checkbox_constraints">{% trans 'Add constraints' %}</label>
45-
46-
<br><br>
47-
48-
<input type="checkbox" name="adjust_privileges" value="1" id="checkbox_adjust_privileges" checked>
49-
<label for="checkbox_adjust_privileges">
29+
<div class="form-check">
30+
<input class="form-check-input" type="checkbox" value="true" name="drop_if_exists" id="addDropTableCheckbox">
31+
<label class="form-check-label" for="addDropTableCheckbox">{% trans 'Add DROP TABLE' %}</label>
32+
</div>
33+
<div class="form-check">
34+
<input class="form-check-input" type="checkbox" value="1" name="sql_auto_increment" id="addAutoIncrementCheckbox">
35+
<label class="form-check-label" for="addAutoIncrementCheckbox">{% trans 'Add AUTO INCREMENT value' %}</label>
36+
</div>
37+
<div class="form-check mb-3">
38+
<input class="form-check-input" type="checkbox" value="1" name="add_constraints" id="addConstraintsCheckbox" checked>
39+
<label class="form-check-label" for="addConstraintsCheckbox">{% trans 'Add constraints' %}</label>
40+
</div>
41+
42+
<div class="form-check">
43+
<input class="form-check-input" type="checkbox" value="1" name="adjust_privileges" id="adjustPrivilegesCheckbox">
44+
<label class="form-check-label" for="adjustPrivilegesCheckbox">
5045
{% trans 'Adjust privileges' %}
5146
{{ show_docu('faq', 'faq6-39') }}
5247
</label>
53-
</fieldset>
48+
</div>
5449
</form>

‎templates/database/structure/drop_form.twig‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
1-
<form action="{{ url('/database/structure/drop-table') }}" method="post">
2-
{{ get_hidden_inputs(url_params) }}
1+
<div class="container">
2+
<form action="{{ url('/database/structure/drop-table') }}" method="post" class="card">
3+
{{ get_hidden_inputs(url_params) }}
4+
<input type="hidden" name="fk_checks" value="0">
35

4-
<fieldset class="pma-fieldset confirmation">
5-
<legend>
6-
{% trans 'Do you really want to execute the following query?' %}
7-
</legend>
6+
<div class="card-header">{% trans 'Do you really want to execute the following query?' %}</div>
87

9-
<code>{{ full_query|raw }}</code>
10-
</fieldset>
8+
<div class="card-body">
9+
<div class="card mb-3">
10+
<div class="card-body"><code>{{ full_query|raw }}</code></div>
11+
</div>
1112

12-
<fieldset class="pma-fieldset tblFooters">
13-
<div id="foreignkeychk" class="float-start">
14-
<input type="hidden" name="fk_checks" value="0">
15-
<input type="checkbox" name="fk_checks" id="fk_checks" value="1"{{ is_foreign_key_check ? ' checked' }}>
16-
<label for="fk_checks">{% trans 'Enable foreign key checks' %}</label>
13+
<div class="form-check">
14+
<input class="form-check-input" type="checkbox" name="fk_checks" id="checkForeignKeyCheckbox" value="1"{{ is_foreign_key_check ? ' checked' }}>
15+
<label class="form-check-label" for="checkForeignKeyCheckbox">{% trans 'Enable foreign key checks' %}</label>
16+
</div>
1717
</div>
18-
<div class="float-end">
19-
<input id="buttonYes" class="btn btn-secondary" type="submit" name="mult_btn" value="{% trans 'Yes' %}">
18+
19+
<div class="card-footer">
20+
<input id="buttonYes" class="btn btn-danger" type="submit" name="mult_btn" value="{% trans 'Yes' %}">
2021
<input id="buttonNo" class="btn btn-secondary" type="submit" name="mult_btn" value="{% trans 'No' %}">
2122
</div>
22-
</fieldset>
23-
</form>
23+
</form>
24+
</div>

‎templates/database/structure/empty_form.twig‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
1-
<form action="{{ url('/database/structure/empty-table') }}" class="disableAjax" method="post">
2-
{{ get_hidden_inputs(url_params) }}
1+
<div class="container">
2+
<form action="{{ url('/database/structure/empty-table') }}" class="card disableAjax" method="post">
3+
{{ get_hidden_inputs(url_params) }}
4+
<input type="hidden" name="fk_checks" value="0">
35

4-
<fieldset class="pma-fieldset confirmation">
5-
<legend>
6-
{% trans 'Do you really want to execute the following query?' %}
7-
</legend>
6+
<div class="card-header">{% trans 'Do you really want to execute the following query?' %}</div>
87

9-
<code>{{ full_query|raw }}</code>
10-
</fieldset>
8+
<div class="card-body">
9+
<div class="card mb-3">
10+
<div class="card-body"><code>{{ full_query|raw }}</code></div>
11+
</div>
1112

12-
<fieldset class="pma-fieldset tblFooters">
13-
<div id="foreignkeychk" class="float-start">
14-
<input type="hidden" name="fk_checks" value="0">
15-
<input type="checkbox" name="fk_checks" id="fk_checks" value="1"{{ is_foreign_key_check ? ' checked' }}>
16-
<label for="fk_checks">{% trans 'Enable foreign key checks' %}</label>
13+
<div class="form-check">
14+
<input class="form-check-input" type="checkbox" name="fk_checks" id="checkForeignKeyCheckbox" value="1"{{ is_foreign_key_check ? ' checked' }}>
15+
<label class="form-check-label" for="checkForeignKeyCheckbox">{% trans 'Enable foreign key checks' %}</label>
16+
</div>
1717
</div>
18-
<div class="float-end">
19-
<input id="buttonYes" class="btn btn-secondary" type="submit" name="mult_btn" value="{% trans 'Yes' %}">
18+
19+
<div class="card-footer">
20+
<input id="buttonYes" class="btn btn-danger" type="submit" name="mult_btn" value="{% trans 'Yes' %}">
2021
<input id="buttonNo" class="btn btn-secondary" type="submit" name="mult_btn" value="{% trans 'No' %}">
2122
</div>
22-
</fieldset>
23-
</form>
23+
</form>
24+
</div>

‎templates/database/structure/show_create.twig‎

Lines changed: 39 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,51 @@
1-
<div class="show_create_results">
1+
<div class="container">
22
<h2>{% trans 'Showing create queries' %}</h2>
33

44
{% if tables.tables is not empty %}
5-
<fieldset class="pma-fieldset">
6-
<legend>{% trans 'Tables' %}</legend>
7-
<table class="table table-striped show_create">
8-
<thead>
9-
<tr>
10-
<th>{% trans 'Table' %}</th>
11-
<th>{% trans 'Create table' %}</th>
12-
</tr>
13-
</thead>
14-
<tbody>
15-
{% for table in tables.tables %}
5+
<div class="card mb-3">
6+
<div class="card-header">{% trans 'Tables' %}</div>
7+
<div class="card-body">
8+
<table class="table">
9+
<thead>
1610
<tr>
17-
<td><strong>{{ table.name|raw }}</strong></td>
18-
<td>{{ table.show_create|raw }}</td>
11+
<th>{% trans 'Table' %}</th>
12+
<th>{% trans 'Create table' %}</th>
1913
</tr>
20-
{% endfor %}
21-
</tbody>
22-
</table>
23-
</fieldset>
14+
</thead>
15+
<tbody>
16+
{% for table in tables.tables %}
17+
<tr>
18+
<td><strong>{{ table.name|raw }}</strong></td>
19+
<td>{{ table.show_create|raw }}</td>
20+
</tr>
21+
{% endfor %}
22+
</tbody>
23+
</table>
24+
</div>
25+
</div>
2426
{% endif %}
2527

2628
{% if tables.views is not empty %}
27-
<fieldset class="pma-fieldset">
28-
<legend>{% trans 'Views' %}</legend>
29-
<table class="table table-striped show_create">
30-
<thead>
31-
<tr>
32-
<th>{% trans 'View' %}</th>
33-
<th>{% trans 'Create view' %}</th>
34-
</tr>
35-
</thead>
36-
<tbody>
37-
{% for view in tables.views %}
29+
<div class="card">
30+
<div class="card-header">{% trans 'Views' %}</div>
31+
<div class="card-body">
32+
<table class="table">
33+
<thead>
3834
<tr>
39-
<td><strong>{{ view.name }}</strong></td>
40-
<td>{{ view.show_create|raw }}</td>
35+
<th>{% trans 'View' %}</th>
36+
<th>{% trans 'Create view' %}</th>
4137
</tr>
42-
{% endfor %}
43-
</tbody>
44-
</table>
45-
</fieldset>
38+
</thead>
39+
<tbody>
40+
{% for view in tables.views %}
41+
<tr>
42+
<td><strong>{{ view.name }}</strong></td>
43+
<td>{{ view.show_create|raw }}</td>
44+
</tr>
45+
{% endfor %}
46+
</tbody>
47+
</table>
48+
</div>
49+
</div>
4650
{% endif %}
4751
</div>

0 commit comments

Comments
 (0)