Remove some custom CSS utilities

Uses Bootstrap equivalents.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
Maurício Meneghini Fauth 2020-12-26 20:05:03 -03:00
parent 7152714b51
commit ac4bfaebe7
No known key found for this signature in database
GPG Key ID: 6A16FD38AFC89CC8
32 changed files with 139 additions and 203 deletions

View File

@ -3612,7 +3612,7 @@ AJAX.registerOnload('functions.js', function () {
var listSize = centralColumnList[db + '_' + table].length;
var min = (listSize <= maxRows) ? listSize : maxRows;
for (i = 0; i < min; i++) {
fields += '<tr><td><div><span class="font_weight_bold">' +
fields += '<tr><td><div><span class="fw-bold">' +
Functions.escapeHtml(centralColumnList[db + '_' + table][i].col_name) +
'</span><br><span class="color_gray">' + centralColumnList[db + '_' + table][i].col_type;
@ -3638,7 +3638,7 @@ AJAX.registerOnload('functions.js', function () {
}
var seeMore = '';
if (listSize > maxRows) {
seeMore = '<fieldset class="tblFooters text-center font_weight_bold">' +
seeMore = '<fieldset class="tblFooters text-center fw-bold">' +
'<a href=\'#\' id=\'seeMore\'>' + Messages.seeMore + '</a></fieldset>';
}
var centralColumnsDialog = '<div class=\'max_height_400\'>' +
@ -3674,7 +3674,7 @@ AJAX.registerOnload('functions.js', function () {
fields = '';
min = (listSize <= maxRows + resultPointer) ? listSize : maxRows + resultPointer;
for (i = resultPointer; i < min; i++) {
fields += '<tr><td><div><span class="font_weight_bold">' +
fields += '<tr><td><div><span class="fw-bold">' +
centralColumnList[db + '_' + table][i].col_name +
'</span><br><span class="color_gray">' +
centralColumnList[db + '_' + table][i].col_type;
@ -4327,7 +4327,7 @@ Functions.slidingMessage = function (msg, $object) {
if ($('#PMA_slidingMessage').length === 0) {
$('#page_content').prepend(
'<span id="PMA_slidingMessage" ' +
'class="pma_sliding_message"></span>'
'class="d-inline-block"></span>'
);
}
$obj = $('#PMA_slidingMessage');

View File

@ -1961,7 +1961,7 @@ AJAX.registerOnload('server/status/monitor.js', function () {
if (i === 0) {
$.each(rows[0], tempPushKey);
$table.append('<thead>' +
'<tr><th class="nowrap">' + cols.join('</th><th class="nowrap">') + '</th></tr>' +
'<tr><th class="text-nowrap">' + cols.join('</th><th class="text-nowrap">') + '</th></tr>' +
'</thead>'
);

View File

@ -856,7 +856,7 @@ class Routines
} else {
$retval .= "<input name='item_type' type='hidden'"
. " value='" . $routine['item_type'] . "'>\n"
. "<div class='font_weight_bold text-center w-50'>\n"
. "<div class='fw-bold text-center w-50'>\n"
. $routine['item_type'] . "\n"
. "</div>\n"
. "<input type='submit' name='routine_changetype'\n"
@ -1707,7 +1707,7 @@ class Routines
} elseif ($routine['item_param_type'][$i] === 'DATE') {
$class = 'datefield';
}
$retval .= "<td class='nowrap'>\n";
$retval .= "<td class='text-nowrap'>\n";
if (in_array($routine['item_param_type'][$i], ['ENUM', 'SET'])) {
if ($routine['item_param_type'][$i] === 'ENUM') {
$input_type = 'radio';

View File

@ -2256,7 +2256,7 @@ class Results
*/
private function buildEmptyDisplay($class, $conditionField, $meta, $align = '')
{
$classes = $this->addClass($class, $conditionField, $meta, 'nowrap');
$classes = $this->addClass($class, $conditionField, $meta, 'text-nowrap');
return $this->template->render('display/results/empty_display', [
'align' => $align,
@ -3336,7 +3336,7 @@ class Results
if (isset($GLOBALS['cfg']['RowActionType'])
&& $GLOBALS['cfg']['RowActionType'] === self::ACTION_LINK_CONTENT_ICONS
) {
$linkContent .= '<span class="nowrap">'
$linkContent .= '<span class="text-nowrap">'
. Generator::getImage(
$icon,
$display_text
@ -3345,7 +3345,7 @@ class Results
} elseif (isset($GLOBALS['cfg']['RowActionType'])
&& $GLOBALS['cfg']['RowActionType'] === self::ACTION_LINK_CONTENT_TEXT
) {
$linkContent .= '<span class="nowrap">' . $display_text . '</span>';
$linkContent .= '<span class="text-nowrap">' . $display_text . '</span>';
} else {
$linkContent .= Generator::getIcon(
$icon,
@ -3456,7 +3456,7 @@ class Results
''
);
} elseif ($column != '') {
$nowrap = ' nowrap';
$nowrap = ' text-nowrap';
$where_comparison = ' = ' . $column;
$cell = $this->getRowData(
@ -3787,7 +3787,7 @@ class Results
// do not wrap if date field type or if no-wrapping enabled by transform functions
// otherwise, preserve whitespaces and wrap
$nowrap = preg_match('@DATE|TIME@i', $meta->type)
|| $bool_nowrap ? 'nowrap' : 'pre_wrap';
|| $bool_nowrap ? 'text-nowrap' : 'pre_wrap';
$where_comparison = ' = \''
. $dbi->escapeString($column)

View File

@ -218,7 +218,7 @@ class Generator
}
// Sometimes use a span (we rely on this in js/sql.js). But for menu bar
// we don't need a span
$button = $menu_icon ? '' : '<span class="nowrap">';
$button = $menu_icon ? '' : '<span class="text-nowrap">';
if ($include_icon) {
$button .= self::getImage($icon, $alternate);
}

View File

@ -473,12 +473,12 @@ class InsertEdit
$column['first_timestamp'] = true;
}
$column['pma_type'] = $column['Type'];
$column['wrap'] = ' nowrap';
$column['wrap'] = ' text-nowrap';
break;
default:
$column['pma_type'] = $column['Type'];
$column['wrap'] = ' nowrap';
$column['wrap'] = ' text-nowrap';
break;
}
@ -1841,7 +1841,7 @@ class InsertEdit
$html_output = '<fieldset id="actions_panel">'
. '<table cellpadding="5" cellspacing="0" class="pma-table tdblock w-100">'
. '<tr>'
. '<td class="nowrap align-middle">'
. '<td class="text-nowrap align-middle">'
. $this->getSubmitTypeDropDown($where_clause, $tabindex, $tabindex_for_value)
. "\n";
@ -1850,7 +1850,7 @@ class InsertEdit
. '&nbsp;&nbsp;&nbsp;<strong>'
. __('and then') . '</strong>&nbsp;&nbsp;&nbsp;'
. '</td>'
. '<td class="nowrap align-middle">'
. '<td class="text-nowrap align-middle">'
. $this->getAfterInsertDropDown(
$where_clause,
$after_insert,

View File

@ -1,7 +1,3 @@
.nowrap {
white-space: nowrap;
}
.hide {
display: none;
}
@ -44,10 +40,6 @@ th {
display: none;
}
.nowrap {
white-space: nowrap;
}
.hide {
display: none;
}

View File

@ -1,6 +1,6 @@
<tr>
<input name="orig_col_name[{{ row_num }}]" type="hidden" value="{{ row['col_name'] }}">
<td name="col_name" class="nowrap">
<td name="col_name" class="text-nowrap">
{% include 'columns_definitions/column_name.twig' with {
'column_number': row_num,
'ci': 0,
@ -11,20 +11,20 @@
} only %}
</td>
<td name="col_type" class="nowrap">
<td name="col_type" class="text-nowrap">
<select class="column_type" name="field_type[{{ row_num }}]" id="field_{{ row_num }}_1">
{{ get_supported_datatypes(true, row['col_type']|upper) }}
</select>
</td>
<td class="nowrap" name="col_length">
<td class="text-nowrap" name="col_length">
<input id="field_{{ row_num }}_2" type="text" name="field_length[{{ row_num }}]" size="8" value="{{ row['col_length'] }}" class="textfield">
<p class="enum_notice" id="enum_notice_{{ row_num }}_2">
<a href="#" class="open_enum_editor">{% trans 'Edit ENUM/SET values' %}</a>
</p>
</td>
<td class="nowrap" name="col_default">
<td class="text-nowrap" name="col_default">
<select name="field_default_type[{{ row_num }}]" id="field_{{ row_num }}_3" class="default_type">
<option value="NONE"{{ meta['DefaultType'] is defined and meta['DefaultType'] == 'NONE' ? ' selected' }}>
{% trans %}None{% context %}for default{% endtrans %}
@ -46,7 +46,7 @@
{% endif %}
</td>
<td name="collation" class="nowrap">
<td name="collation" class="text-nowrap">
<select lang="en" dir="ltr" name="field_collation[{{ row_num }}]" id="field_{{ row_num }}_4">
<option value=""></option>
{% for charset in charsets %}
@ -61,7 +61,7 @@
</select>
</td>
<td class="nowrap" name="col_attribute">
<td class="text-nowrap" name="col_attribute">
{% include 'columns_definitions/column_attribute.twig' with {
'column_number': row_num,
'ci': 5,
@ -73,12 +73,12 @@
} only %}
</td>
<td class="nowrap" name="col_isNull">
<td class="text-nowrap" name="col_isNull">
<input name="field_null[{{ row_num }}]" id="field_{{ row_num }}_6" type="checkbox" value="YES" class="allow_null"
{{- row['col_isNull'] is not empty and row['col_isNull'] != 'NO' and row['col_isNull'] != 'NOT NULL' ? ' checked' }}>
</td>
<td class="nowrap" name="col_extra">
<td class="text-nowrap" name="col_extra">
<input name="col_extra[{{ row_num }}]" id="field_{{ row_num }}_7" type="checkbox" value="auto_increment"
{{- row['col_extra'] is not empty and row['col_extra'] == 'auto_increment' }}>
</td>

View File

@ -50,7 +50,7 @@
<tbody>
<tr>
<td></td>
<td name="col_name" class="nowrap">
<td name="col_name" class="text-nowrap">
{% include 'columns_definitions/column_name.twig' with {
'column_number': 0,
'ci': 0,
@ -62,18 +62,18 @@
'max_rows': max_rows,
} only %}
</td>
<td name="col_type" class="nowrap">
<td name="col_type" class="text-nowrap">
<select class="column_type" name="field_type[0]" id="field_0_1">
{{ get_supported_datatypes(true) }}
</select>
</td>
<td class="nowrap" name="col_length">
<td class="text-nowrap" name="col_length">
<input id="field_0_2" type="text" name="field_length[0]" size="8" value="" class="textfield">
<p class="enum_notice" id="enum_notice_0_2">
<a href="#" class="open_enum_editor">{% trans 'Edit ENUM/SET values' %}</a>
</p>
</td>
<td class="nowrap" name="col_default">
<td class="text-nowrap" name="col_default">
<select name="field_default_type[0]" id="field_0_3" class="default_type">
<option value="NONE">{% trans %}None{% context %}for default{% endtrans %}</option>
<option value="USER_DEFINED">{% trans 'As defined:' %}</option>
@ -86,7 +86,7 @@
<input type="text" name="field_default_value[0]" size="12" value="" class="textfield default_value">
{% endif %}
</td>
<td name="collation" class="nowrap">
<td name="collation" class="text-nowrap">
<select lang="en" dir="ltr" name="field_collation[0]" id="field_0_4">
<option value=""></option>
{% for charset in charsets %}
@ -100,7 +100,7 @@
{% endfor %}
</select>
</td>
<td class="nowrap" name="col_attribute">
<td class="text-nowrap" name="col_attribute">
{% include 'columns_definitions/column_attribute.twig' with {
'column_number': 0,
'ci': 5,
@ -111,10 +111,10 @@
'attribute_types': attribute_types,
} only %}
</td>
<td class="nowrap" name="col_isNull">
<td class="text-nowrap" name="col_isNull">
<input name="field_null[0]" id="field_0_6" type="checkbox" value="YES" class="allow_null">
</td>
<td class="nowrap" name="col_extra">
<td class="text-nowrap" name="col_extra">
<input name="col_extra[0]" id="field_0_7" type="checkbox" value="auto_increment">
</td>
<td>
@ -259,7 +259,7 @@
<tr data-rownum="{{ row_num }}" id="{{ 'f_' ~ row_num }}">
{{ get_hidden_inputs(db) }}
<input type="hidden" name="edit_save" value="save">
<td class="nowrap">
<td class="text-nowrap">
<input type="checkbox" class="checkall" name="selected_fld[]"
value="{{ row['col_name'] }}" id="{{ 'checkbox_row_' ~ row_num }}">
</td>
@ -273,7 +273,7 @@
<td id="{{ 'save_' ~ row_num }}" class="hide">
<input type="submit" data-rownum="{{ row_num }}" class="btn btn-primary edit_save_form" value="Save">
</td>
<td name="col_name" class="nowrap">
<td name="col_name" class="text-nowrap">
<span>{{ row['col_name'] }}</span>
<input name="orig_col_name" type="hidden" value="{{ row['col_name'] }}">
{% include 'columns_definitions/column_name.twig' with {
@ -289,20 +289,20 @@
'max_rows': max_rows
} only %}
</td>
<td name = "col_type" class="nowrap">
<td name = "col_type" class="text-nowrap">
<span>{{ row['col_type'] }}</span>
<select class="column_type" name="field_type[{{ row_num }}]" id="field_{{ row_num }}_1">
{{ get_supported_datatypes(true, types_upper[row_num]) }}
</select>
</td>
<td class="nowrap" name="col_length">
<td class="text-nowrap" name="col_length">
<span>{{ (row['col_length']?(row['col_length']):'') }}</span>
<input id="field_{{ row_num }}_2" type="text" name="field_length[{{ row_num }}]" size="8" value="{{ row['col_length'] }}" class="textfield">
<p class="enum_notice" id="enum_notice_{{ row_num }}_2">
<a href="#" class="open_enum_editor">{% trans 'Edit ENUM/SET values' %}</a>
</p>
</td>
<td class="nowrap" name="col_default">
<td class="text-nowrap" name="col_default">
{% if row['col_default'] is defined %}
<span>{{ row['col_default'] }}</span>
{% else %}
@ -328,7 +328,7 @@
<input type="text" name="field_default_value[{{ row_num }}]" size="12" value="{{ default_values[row_num] }}" class="textfield default_value">
{% endif %}
</td>
<td name="collation" class="nowrap">
<td name="collation" class="text-nowrap">
<span>{{ row['col_collation'] }}</span>
<select lang="en" dir="ltr" name="field_collation[{{ row_num }}]" id="field_{{ row_num }}_4">
<option value=""></option>
@ -344,7 +344,7 @@
{% endfor %}
</select>
</td>
<td class="nowrap" name="col_attribute">
<td class="text-nowrap" name="col_attribute">
<span>{{ row['col_attribute']?(row['col_attribute']):"" }}</span>
{% include 'columns_definitions/column_attribute.twig' with {
'column_number': row_num,
@ -356,12 +356,12 @@
'attribute_types': attribute_types,
} only %}
</td>
<td class="nowrap" name="col_isNull">
<td class="text-nowrap" name="col_isNull">
<span>{{ row['col_isNull'] ? 'Yes' | trans : 'No' | trans }}</span>
<input name="field_null[{{ row_num }}]" id="field_{{ row_num }}_6" type="checkbox" value="YES" class="allow_null"
{{- row['col_isNull'] is not empty and row['col_isNull'] != 'NO' and row['col_isNull'] != 'NOT NULL' ? ' checked' }}>
</td>
<td class="nowrap" name="col_extra">
<td class="text-nowrap" name="col_extra">
<span>{{ row['col_extra'] }}</span>
<input name="col_extra[{{ row_num }}]" id="field_{{ row_num }}_7" type="checkbox" value="auto_increment"
{{- row['col_extra'] is not empty and row['col_extra'] == 'auto_increment' ? ' checked' }}>

View File

@ -27,17 +27,17 @@
</tr>
{% for column in table.columns %}
<tr>
<td class="nowrap">
<td class="text-nowrap">
{{ column.name }}
{% if column.has_primary_key %}
<em>({% trans 'Primary' %})</em>
{% endif %}
</td>
<td lang="en" dir="ltr"{{ 'set' != column.type and 'enum' != column.type ? ' class="nowrap"' }}>
<td lang="en" dir="ltr"{{ 'set' != column.type and 'enum' != column.type ? ' class="text-nowrap"' }}>
{{ column.print_type }}
</td>
<td>{{ column.is_nullable ? 'Yes'|trans : 'No'|trans }}</td>
<td class="nowrap">
<td class="text-nowrap">
{% if column.default is null and column.is_nullable %}
<em>NULL</em>
{% else %}

View File

@ -46,7 +46,7 @@
title="{% trans 'See table structure' %}">
</td>
<td id="id_zag_{{ t_n_url }}"
class="tab_zag nowrap tab_zag_noquery"
class="tab_zag text-nowrap tab_zag_noquery"
table_name="{{ t_n_url }}"
query_set="{{ has_query ? 1 : 0 }}">
<span class="owner">{{ designerTable.getDatabaseName() }}</span>
@ -97,7 +97,7 @@
{% endif %}
<td width="10px" colspan="3" id="{{ t_n_url }}.
{{- tab_column[t_n]['COLUMN_NAME'][j]|url_encode }}">
<div class="nowrap">
<div class="text-nowrap">
{% set type = columns_type[t_n ~ '.' ~ tab_column[t_n]['COLUMN_NAME'][j]] %}
<img src="{{ theme.getImgPath(type) }}.png" alt="*">
{{ tab_column[t_n]['COLUMN_NAME'][j] }} : {{ tab_column[t_n]['TYPE'][j] }}

View File

@ -268,7 +268,7 @@ var designerConfig = {{ designer_config|raw }};
<table width="168" class="pma-table text-center" cellpadding="2" cellspacing="0">
<thead>
<tr>
<td colspan="2" class="text-center nowrap">
<td colspan="2" class="text-center text-nowrap">
<strong>
{% trans 'Create relationship' %}
</strong>
@ -277,14 +277,14 @@ var designerConfig = {{ designer_config|raw }};
</thead>
<tbody id="foreign_relation">
<tr>
<td colspan="2" class="text-center nowrap">
<td colspan="2" class="text-center text-nowrap">
<strong>
FOREIGN KEY
</strong>
</td>
</tr>
<tr>
<td width="58" class="nowrap">
<td width="58" class="text-nowrap">
on delete
</td>
<td width="102">
@ -308,7 +308,7 @@ var designerConfig = {{ designer_config|raw }};
</td>
</tr>
<tr>
<td class="nowrap">
<td class="text-nowrap">
on update
</td>
<td>
@ -334,7 +334,7 @@ var designerConfig = {{ designer_config|raw }};
</tbody>
<tbody>
<tr>
<td colspan="2" class="text-center nowrap">
<td colspan="2" class="text-center text-nowrap">
<input type="button" id="ok_new_rel_panel" class="btn btn-secondary butt"
name="Button" value="{% trans 'OK' %}">
<input type="button" id="cancel_new_rel_panel"
@ -378,14 +378,14 @@ var designerConfig = {{ designer_config|raw }};
<td class="input_tab">
<table width="100%" class="pma-table text-center" cellpadding="2" cellspacing="0">
<tr>
<td colspan="3" class="text-center nowrap">
<td colspan="3" class="text-center text-nowrap">
<strong>
{% trans 'Delete relationship' %}
</strong>
</td>
</tr>
<tr>
<td colspan="3" class="text-center nowrap">
<td colspan="3" class="text-center text-nowrap">
<input id="del_button" name="Button" type="button"
class="btn btn-secondary butt" value="{% trans 'Delete' %}">
<input id="cancel_button" type="button" class="btn btn-secondary butt"
@ -430,20 +430,20 @@ var designerConfig = {{ designer_config|raw }};
<table width="168" class="pma-table text-center" cellpadding="2" cellspacing="0">
<thead>
<tr>
<td colspan="2" rowspan="2" id="option_col_name" class="text-center nowrap">
<td colspan="2" rowspan="2" id="option_col_name" class="text-center text-nowrap">
</td>
</tr>
</thead>
<tbody id="where">
<tr>
<td class="text-center nowrap">
<td class="text-center text-nowrap">
<b>
WHERE
</b>
</td>
</tr>
<tr>
<td width="58" class="nowrap">
<td width="58" class="text-nowrap">
{% trans 'Relationship operator' %}
</td>
<td width="102">
@ -482,7 +482,7 @@ var designerConfig = {{ designer_config|raw }};
</td>
</tr>
<tr>
<td class="nowrap">
<td class="text-nowrap">
{% trans 'Value' %}
<br>
{% trans 'subquery' %}
@ -492,14 +492,14 @@ var designerConfig = {{ designer_config|raw }};
</td>
</tr>
<tr>
<td class="text-center nowrap">
<td class="text-center text-nowrap">
<b>
{% trans 'Rename to' %}
</b>
</td>
</tr>
<tr>
<td width="58" class="nowrap">
<td width="58" class="text-nowrap">
{% trans 'New name' %}
</td>
<td width="102">
@ -507,14 +507,14 @@ var designerConfig = {{ designer_config|raw }};
</td>
</tr>
<tr>
<td class="text-center nowrap">
<td class="text-center text-nowrap">
<b>
{% trans 'Aggregate' %}
</b>
</td>
</tr>
<tr>
<td width="58" class="nowrap">
<td width="58" class="text-nowrap">
{% trans 'Operator' %}
</td>
<td width="102">
@ -541,7 +541,7 @@ var designerConfig = {{ designer_config|raw }};
</td>
</tr>
<tr>
<td width="58" class="text-center nowrap">
<td width="58" class="text-center text-nowrap">
<b>
GROUP BY
</b>
@ -551,7 +551,7 @@ var designerConfig = {{ designer_config|raw }};
</td>
</tr>
<tr>
<td width="58" class="text-center nowrap">
<td width="58" class="text-center text-nowrap">
<b>
ORDER BY
</b>
@ -571,14 +571,14 @@ var designerConfig = {{ designer_config|raw }};
</td>
</tr>
<tr>
<td class="text-center nowrap">
<td class="text-center text-nowrap">
<b>
HAVING
</b>
</td>
</tr>
<tr>
<td width="58" class="nowrap">
<td width="58" class="text-nowrap">
{% trans 'Operator' %}
</td>
<td width="102">
@ -608,7 +608,7 @@ var designerConfig = {{ designer_config|raw }};
</td>
</tr>
<tr>
<td width="58" class="nowrap">
<td width="58" class="text-nowrap">
{% trans 'Relationship operator' %}
</td>
<td width="102">
@ -647,7 +647,7 @@ var designerConfig = {{ designer_config|raw }};
</td>
</tr>
<tr>
<td width="58" class="nowrap">
<td width="58" class="text-nowrap">
{% trans 'Value' %}
<br>
{% trans 'subquery' %}
@ -659,7 +659,7 @@ var designerConfig = {{ designer_config|raw }};
</tbody>
<tbody>
<tr>
<td colspan="2" class="text-center nowrap">
<td colspan="2" class="text-center text-nowrap">
<input type="hidden" id="ok_add_object_db_and_table_name_url" />
<input type="hidden" id="ok_add_object_db_name" />
<input type="hidden" id="ok_add_object_table_name" />
@ -708,7 +708,7 @@ var designerConfig = {{ designer_config|raw }};
<table width="168" class="pma-table text-center" cellpadding="2" cellspacing="0">
<thead>
<tr>
<td colspan="2" class="text-center nowrap">
<td colspan="2" class="text-center text-nowrap">
<strong>
{% trans 'Rename to' %}
</strong>
@ -717,7 +717,7 @@ var designerConfig = {{ designer_config|raw }};
</thead>
<tbody id="rename_to">
<tr>
<td width="58" class="nowrap">
<td width="58" class="text-nowrap">
{% trans 'New name' %}
</td>
<td width="102">
@ -727,7 +727,7 @@ var designerConfig = {{ designer_config|raw }};
</tbody>
<tbody>
<tr>
<td colspan="2" class="text-center nowrap">
<td colspan="2" class="text-center text-nowrap">
<input type="button" id="ok_edit_rename" class="btn btn-secondary butt"
name="Button" value="{% trans 'OK' %}">
<input id="query_rename_to_button" type="button"
@ -774,7 +774,7 @@ var designerConfig = {{ designer_config|raw }};
<table width="168" class="pma-table text-center" cellpadding="2" cellspacing="0">
<thead>
<tr>
<td colspan="2" class="text-center nowrap">
<td colspan="2" class="text-center text-nowrap">
<strong>
HAVING
</strong>
@ -783,7 +783,7 @@ var designerConfig = {{ designer_config|raw }};
</thead>
<tbody id="rename_to">
<tr>
<td width="58" class="nowrap">
<td width="58" class="text-nowrap">
{% trans 'Operator' %}
</td>
<td width="102">
@ -814,7 +814,7 @@ var designerConfig = {{ designer_config|raw }};
</tr>
<tr>
<tr>
<td width="58" class="nowrap">
<td width="58" class="text-nowrap">
{% trans 'Operator' %}
</td>
<td width="102">
@ -853,7 +853,7 @@ var designerConfig = {{ designer_config|raw }};
</td>
</tr>
<tr>
<td class="nowrap">
<td class="text-nowrap">
{% trans 'Value' %}
<br>
{% trans 'subquery' %}
@ -866,7 +866,7 @@ var designerConfig = {{ designer_config|raw }};
</tbody>
<tbody>
<tr>
<td colspan="2" class="text-center nowrap">
<td colspan="2" class="text-center text-nowrap">
<input type="button" id="ok_edit_having" class="btn btn-secondary butt"
name="Button" value="{% trans 'OK' %}">
<input id="query_having_button" type="button"
@ -913,7 +913,7 @@ var designerConfig = {{ designer_config|raw }};
<table width="168" class="pma-table text-center" cellpadding="2" cellspacing="0">
<thead>
<tr>
<td colspan="2" class="text-center nowrap">
<td colspan="2" class="text-center text-nowrap">
<strong>
{% trans 'Aggregate' %}
</strong>
@ -922,7 +922,7 @@ var designerConfig = {{ designer_config|raw }};
</thead>
<tbody>
<tr>
<td width="58" class="nowrap">
<td width="58" class="text-nowrap">
{% trans 'Operator' %}
</td>
<td width="102">
@ -951,7 +951,7 @@ var designerConfig = {{ designer_config|raw }};
</tbody>
<tbody>
<tr>
<td colspan="2" class="text-center nowrap">
<td colspan="2" class="text-center text-nowrap">
<input type="button" id="ok_edit_Aggr" class="btn btn-secondary butt"
name="Button" value="{% trans 'OK' %}">
<input id="query_Aggregate_Button" type="button"
@ -998,7 +998,7 @@ var designerConfig = {{ designer_config|raw }};
<table width="168" class="pma-table text-center" cellpadding="2" cellspacing="0">
<thead>
<tr>
<td colspan="2" class="text-center nowrap">
<td colspan="2" class="text-center text-nowrap">
<strong>
WHERE
</strong>
@ -1007,7 +1007,7 @@ var designerConfig = {{ designer_config|raw }};
</thead>
<tbody id="rename_to">
<tr>
<td width="58" class="nowrap">
<td width="58" class="text-nowrap">
{% trans 'Operator' %}
</td>
<td width="102">
@ -1046,7 +1046,7 @@ var designerConfig = {{ designer_config|raw }};
</td>
</tr>
<tr>
<td class="nowrap">
<td class="text-nowrap">
{% trans 'Value' %}
<br>
{% trans 'subquery' %}
@ -1058,7 +1058,7 @@ var designerConfig = {{ designer_config|raw }};
</tbody>
<tbody>
<tr>
<td colspan="2" class="text-center nowrap">
<td colspan="2" class="text-center text-nowrap">
<input type="button" id="ok_edit_where" class="btn btn-secondary butt"
name="Button" value="{% trans 'OK' %}">
<input id="query_where_button" type="button" class="btn btn-secondary butt" name="Button"

View File

@ -35,7 +35,7 @@
</select>
{% else %}
<input name="item_type" type="hidden" value="{{ event.item_type }}">
<div class="font_weight_bold text-center w-50">
<div class="fw-bold text-center w-50">
{{ event.item_type }}
</div>
<input type="submit" name="item_changetype" class="w-50" value="{{ 'Change to %s'|trans|format(event.item_type_toggle) }}">
@ -44,7 +44,7 @@
</tr>
<tr class="onetime_event_row{{ event.item_type != 'ONE TIME' ? ' hide' }}">
<td>{% trans 'Execute at' %}</td>
<td class="nowrap">
<td class="text-nowrap">
<input type="text" name="item_execute_at" value="{{ event.item_execute_at }}" class="datetimefield">
</td>
</tr>
@ -61,13 +61,13 @@
</tr>
<tr class="recurring_event_row{{ event.item_type != 'RECURRING' ? ' hide' }}">
<td>{% trans %}Start{% context %}Start of recurring event{% endtrans %}</td>
<td class="nowrap">
<td class="text-nowrap">
<input type="text" name="item_starts" value="{{ event.item_starts }}" class="datetimefield">
</td>
</tr>
<tr class="recurring_event_row{{ event.item_type != 'RECURRING' ? ' hide' }}">
<td>{% trans %}End{% context %}End of recurring event{% endtrans %}</td>
<td class="nowrap">
<td class="text-nowrap">
<input type="text" name="item_ends" value="{{ event.item_ends }}" class="datetimefield">
</td>
</tr>

View File

@ -1,7 +1,7 @@
<td class="value nowrap">
<td class="value text-nowrap">
<table class="table table-borderless table-sm">
<tr>
<td class="value nowrap p-0">
<td class="value text-nowrap p-0">
<small>{% trans 'Ins:' %}</small>
<input type="checkbox" name="criteriaRowInsert[{{ row_index }}]" aria-label="{% trans 'Insert' %}">
</td>
@ -13,7 +13,7 @@
</td>
</tr>
<tr>
<td class="value nowrap p-0">
<td class="value text-nowrap p-0">
<small>{% trans 'Del:' %}</small>
<input type="checkbox" name="criteriaRowDelete[{{ row_index }}]" aria-label="{% trans 'Delete' %}">
</td>

View File

@ -115,7 +115,7 @@
</td>
{% if not (properties_num_columns > 1) %}
<td class="nowrap">
<td class="text-nowrap">
{% if current_table['ENGINE'] is not empty %}
{{ current_table['ENGINE'] }}
{% elseif table_is_view %}
@ -123,7 +123,7 @@
{% endif %}
</td>
{% if collation|length > 0 %}
<td class="nowrap">
<td class="text-nowrap">
{{ collation|raw }}
</td>
{% endif %}
@ -142,7 +142,7 @@
{% if not (show_charset > 1) %}
{% if charset|length > 0 %}
<td class="nowrap">
<td class="text-nowrap">
{{ charset|raw }}
</td>
{% endif %}
@ -182,10 +182,10 @@
{% elseif table_is_view %}
<td class="value tbl_rows font-monospace text-end">-</td>
<td class="nowrap">
<td class="text-nowrap">
{% trans 'View' %}
</td>
<td class="nowrap">---</td>
<td class="text-nowrap">---</td>
{% if is_show_stats %}
<td class="value tbl_size font-monospace text-end">-</td>
<td class="value tbl_overhead font-monospace text-end">-</td>

View File

@ -9,7 +9,7 @@
{% if edit.url is not empty %}
<td class="text-center print_ignore edit_row_anchor{{ not edit.clause_is_unique ? ' nonunique' }}">
<span class="nowrap">
<span class="text-nowrap">
{{ link_or_button(edit.url, edit.string) }}
{% if where_clause is not empty %}
<input type="hidden" class="where_clause" value="{{ where_clause }}">
@ -20,7 +20,7 @@
{% if copy.url is not empty %}
<td class="text-center print_ignore">
<span class="nowrap">
<span class="text-nowrap">
{{ link_or_button(copy.url, copy.string) }}
{% if where_clause is not empty %}
<input type="hidden" class="where_clause" value="{{ where_clause }}">
@ -31,7 +31,7 @@
{% if delete.url is not empty %}
<td class="text-center print_ignore{{ is_ajax ? ' ajax' }}">
<span class="nowrap">
<span class="text-nowrap">
{{ link_or_button(delete.url, delete.string, {'class': 'delete_row requireConfirm' ~ (is_ajax ? ' ajax') }) }}
{% if js_conf is not empty %}
<div class="hide">{{ js_conf }}</div>
@ -42,7 +42,7 @@
{% elseif position == 'right' %}
{% if delete.url is not empty %}
<td class="text-center print_ignore{{ is_ajax ? ' ajax' }}">
<span class="nowrap">
<span class="text-nowrap">
{{ link_or_button(delete.url, delete.string, {'class': 'delete_row requireConfirm' ~ (is_ajax ? ' ajax') }) }}
{% if js_conf is not empty %}
<div class="hide">{{ js_conf }}</div>
@ -53,7 +53,7 @@
{% if copy.url is not empty %}
<td class="text-center print_ignore">
<span class="nowrap">
<span class="text-nowrap">
{{ link_or_button(copy.url, copy.string) }}
{% if where_clause is not empty %}
<input type="hidden" class="where_clause" value="{{ where_clause }}">
@ -64,7 +64,7 @@
{% if edit.url is not empty %}
<td class="text-center print_ignore edit_row_anchor{{ not edit.clause_is_unique ? ' nonunique' }}">
<span class="nowrap">
<span class="text-nowrap">
{{ link_or_button(edit.url, edit.string) }}
{% if where_clause is not empty %}
<input type="hidden" class="where_clause" value="{{ where_clause }}">

View File

@ -16,7 +16,7 @@
{% endif %}
{% endfor %}
<td>
<a href="{{ url('/server/privileges', {'showall': 1}) }}" class="nowrap">
<a href="{{ url('/server/privileges', {'showall': 1}) }}" class="text-nowrap">
{% trans 'Show all' %}
</a>
</td>

View File

@ -51,7 +51,7 @@
<td>{{ server.name }}</td>
<td>{{ server.auth_type }}</td>
<td>{{ server.dsn }}</td>
<td class="nowrap">
<td class="text-nowrap">
<small>
<a href="{{ get_common(server.params.edit) }}">
{% trans 'Edit' %}

View File

@ -1,4 +1,4 @@
<td{{ nowrap ? ' class="nowrap"' }}>
<td{{ nowrap ? ' class="text-nowrap"' }}>
{{ is_selected ? '<strong>' }}
<a class="foreign_value" data-key="{{ keyname }}" href="#" title="
{%- trans 'Use this value' %}{{ title is not empty ? ': ' ~ title }}">

View File

@ -53,7 +53,7 @@
<input type="checkbox" class="checkall" name="selected_fld[]" value="{{ row['Field'] }}" id="checkbox_row_{{ rownum }}">
</td>
<td class="text-end">{{ rownum }}</td>
<th class="nowrap">
<th class="text-nowrap">
<label for="checkbox_row_{{ rownum }}">
{% if displayed_fields[rownum].comment is defined %}
<span class="commented_column" title="{{ displayed_fields[rownum].comment }}">{{ displayed_fields[rownum].text }}</span>
@ -63,7 +63,7 @@
{{ displayed_fields[rownum].icon|raw }}
</label>
</th>
<td{{ 'set' != extracted_columnspec['type'] and 'enum' != extracted_columnspec['type'] ? ' class="nowrap"' }}>
<td{{ 'set' != extracted_columnspec['type'] and 'enum' != extracted_columnspec['type'] ? ' class="text-nowrap"' }}>
<bdo dir="ltr" lang="en">
{{ extracted_columnspec['displayed_type']|raw }}
{% if relation_commwork and relation_mimework and browse_mime
@ -77,9 +77,9 @@
<dfn title="{{ collations[row['Collation']].description }}">{{ collations[row['Collation']].name }}</dfn>
{% endif %}
</td>
<td class="column_attribute nowrap">{{ attributes[rownum] }}</td>
<td class="column_attribute text-nowrap">{{ attributes[rownum] }}</td>
<td>{{ row['Null'] == 'YES' ? 'Yes'|trans : 'No'|trans }}</td>
<td class="nowrap">
<td class="text-nowrap">
{% if row['Default'] is not null %}
{% if extracted_columnspec['type'] == 'bit' %}
{{ row['Default']|convert_bit_default_value }}
@ -97,7 +97,7 @@
{{ comments }}
</td>
{% endif %}
<td class="nowrap">{{ row['Extra']|upper }}</td>
<td class="text-nowrap">{{ row['Extra']|upper }}</td>
{% if not tbl_is_view and not db_is_system_schema %}
<td class="edit text-center print_ignore">
<a class="change_column_anchor ajax" href="{{ url('/table/structure/change', {
@ -129,11 +129,11 @@
<ul class="table-structure-actions resizable-menu">
{% if hide_structure_actions %}
<li class="submenu shown">
<a href="#" class="tab nowrap">{{ get_icon('b_more', 'More'|trans) }}</a>
<a href="#" class="tab text-nowrap">{{ get_icon('b_more', 'More'|trans) }}</a>
<ul>
{% endif %}
<li class="primary nowrap">
<li class="primary text-nowrap">
{% if type == 'text' or type == 'blob' or tbl_storage_engine == 'ARCHIVE' or (primary and primary.hasColumn(field_name)) %}
{{ get_icon('bd_primary', 'Primary'|trans) }}
{% else %}
@ -148,7 +148,7 @@
{% endif %}
</li>
<li class="add_unique unique nowrap">
<li class="add_unique unique text-nowrap">
{% if type == 'text' or type == 'blob' or tbl_storage_engine == 'ARCHIVE' or field_name in columns_with_unique_index %}
{{ get_icon('bd_unique', 'Unique'|trans) }}
{% else %}
@ -163,7 +163,7 @@
{% endif %}
</li>
<li class="add_index nowrap">
<li class="add_index text-nowrap">
{% if type == 'text' or type == 'blob' or tbl_storage_engine == 'ARCHIVE' %}
{{ get_icon('bd_index', 'Index'|trans) }}
{% else %}
@ -188,7 +188,7 @@
'multipolygon',
'geomtrycollection'
] %}
<li class="spatial nowrap">
<li class="spatial text-nowrap">
{% if type == 'text' or type == 'blob' or tbl_storage_engine == 'ARCHIVE' or (type not in spatial_types and (tbl_storage_engine == 'MYISAM' or mysql_int_version >= 50705)) %}
{{ get_icon('bd_spatial', 'Spatial'|trans) }}
{% else %}
@ -204,7 +204,7 @@
</li>
{# FULLTEXT is possible on TEXT, CHAR and VARCHAR #}
<li class="fulltext nowrap">
<li class="fulltext text-nowrap">
{% if tbl_storage_engine is not empty and (
tbl_storage_engine == 'MYISAM'
or tbl_storage_engine == 'ARIA'
@ -225,7 +225,7 @@
</li>
{# Distinct value action #}
<li class="browse nowrap">
<li class="browse text-nowrap">
<a href="{{ url('/sql') }}" data-post="{{ get_common({
'db': db,
'table': table,
@ -240,7 +240,7 @@
</a>
</li>
{% if central_columns_work %}
<li class="browse nowrap">
<li class="browse text-nowrap">
{% if row['Field'] in central_list %}
<a href="#" class="central_columns remove_button">
{{ get_icon('centralColumns_delete', 'Remove from central columns'|trans) }}

View File

@ -15,7 +15,7 @@
<td><small>{{ entry.date }}</small></td>
<td><small>{{ entry.username }}</small></td>
<td>{{ entry.formated_statement|raw }}</td>
<td class="nowrap">
<td class="text-nowrap">
<a class="delete_entry_anchor ajax" href="{{ url('/table/tracking') }}" data-post="
{{- entry.url_params|raw }}">
{{ drop_image_or_text|raw }}

View File

@ -17,7 +17,7 @@
<table class="pma-table rte_table">
{% if view['operation'] == 'create' %}
<tr>
<td class="nowrap"><label for="or_replace">OR REPLACE</label></td>
<td class="text-nowrap"><label for="or_replace">OR REPLACE</label></td>
<td>
<input type="checkbox" name="view[or_replace]" id="or_replace"
{% if (view['or_replace']) %} checked="checked" {% endif %}
@ -27,7 +27,7 @@
{% endif %}
<tr>
<td class="nowrap"><label for="algorithm">ALGORITHM</label></td>
<td class="text-nowrap"><label for="algorithm">ALGORITHM</label></td>
<td>
<select name="view[algorithm]" id="algorithm">
{% for option in view_algorithm_options %}
@ -42,12 +42,12 @@
</tr>
<tr>
<td class="nowrap">{% trans 'Definer' %}</td>
<td class="text-nowrap">{% trans 'Definer' %}</td>
<td><input type="text" maxlength="100" size="50" name="view[definer]" value="{{ view['definer'] }}"></td>
</tr>
<tr>
<td class="nowrap">SQL SECURITY</td>
<td class="text-nowrap">SQL SECURITY</td>
<td>
<select name="view[sql_security]">
<option value=""></option>
@ -62,7 +62,7 @@
{% if view['operation'] == 'create' %}
<tr>
<td class="nowrap">{% trans 'VIEW name' %}</td>
<td class="text-nowrap">{% trans 'VIEW name' %}</td>
<td>
<input type="text" size="20" name="view[name]" onfocus="this.select()" maxlength="64" value="{{ view['name'] }}">
</td>
@ -76,14 +76,14 @@
{% endif %}
<tr>
<td class="nowrap">{% trans 'Column names' %}</td>
<td class="text-nowrap">{% trans 'Column names' %}</td>
<td>
<input type="text" maxlength="100" size="50" name="view[column_names]" onfocus="this.select()" value="{{ view['column_names'] }}">
</td>
</tr>
<tr>
<td class="nowrap">AS</td>
<td class="text-nowrap">AS</td>
<td>
<textarea name="view[as]" rows="15" cols="40" dir="{{ text_dir }}" onclick="Functions.selectContent(this, sqlBoxLocked, true)">{{ view['as'] }}</textarea><br>
<input type="button" value="Format" id="format" class="btn btn-secondary button sqlbutton">
@ -92,7 +92,7 @@
</tr>
<tr>
<td class="nowrap">WITH CHECK OPTION</td>
<td class="text-nowrap">WITH CHECK OPTION</td>
<td>
<select name="view[with]">
<option value=""></option>

View File

@ -982,7 +982,7 @@ class ResultsTest extends AbstractTestCase
'',
'<td data-decimals="0" data-type="string" '
. 'data-originallength="11" '
. 'class="grid_edit nowrap transformed">foo bar baz</td>' . "\n",
. 'class="grid_edit text-nowrap transformed">foo bar baz</td>' . "\n",
],
[
'all',
@ -1007,7 +1007,7 @@ class ResultsTest extends AbstractTestCase
'',
'<td data-decimals="0" data-type="datetime" '
. 'data-originallength="19" '
. 'class="grid_edit nowrap">2020-09-20 16:35:00</td>' . "\n",
. 'class="grid_edit text-nowrap">2020-09-20 16:35:00</td>' . "\n",
],
];
}

View File

@ -112,7 +112,7 @@ class GeneratorTest extends AbstractTestCase
$GLOBALS['cfg']['ActionLinksMode'] = 'text';
$this->assertEquals(
'<span class="nowrap"></span>',
'<span class="text-nowrap"></span>',
Generator::getIcon('b_comment')
);
}
@ -125,7 +125,7 @@ class GeneratorTest extends AbstractTestCase
$GLOBALS['cfg']['ActionLinksMode'] = 'icons';
$this->assertEquals(
'<span class="nowrap"><img src="themes/dot.gif" title="" alt="" class="icon ic_b_comment"></span>',
'<span class="text-nowrap"><img src="themes/dot.gif" title="" alt="" class="icon ic_b_comment"></span>',
Generator::getIcon('b_comment')
);
}
@ -139,7 +139,7 @@ class GeneratorTest extends AbstractTestCase
$alternate_text = 'alt_str';
$this->assertEquals(
'<span class="nowrap"><img src="themes/dot.gif" title="'
'<span class="text-nowrap"><img src="themes/dot.gif" title="'
. $alternate_text . '" alt="' . $alternate_text
. '" class="icon ic_b_comment"></span>',
Generator::getIcon('b_comment', $alternate_text)
@ -157,7 +157,7 @@ class GeneratorTest extends AbstractTestCase
// Here we are checking for an icon embedded inside a span (i.e not a menu
// bar icon
$this->assertEquals(
'<span class="nowrap"><img src="themes/dot.gif" title="'
'<span class="text-nowrap"><img src="themes/dot.gif" title="'
. $alternate_text . '" alt="' . $alternate_text
. '" class="icon ic_b_comment">&nbsp;' . $alternate_text . '</span>',
Generator::getIcon('b_comment', $alternate_text, true, false)

View File

@ -501,7 +501,7 @@ class InsertEditTest extends AbstractTestCase
$this->assertEquals(
$result['wrap'],
' nowrap'
' text-nowrap'
);
$this->assertEquals(
@ -666,7 +666,7 @@ class InsertEditTest extends AbstractTestCase
$this->assertEquals(
[
'date',
' nowrap',
' text-nowrap',
true,
],
$this->callFunction(
@ -685,7 +685,7 @@ class InsertEditTest extends AbstractTestCase
$this->assertEquals(
[
'date',
' nowrap',
' text-nowrap',
false,
],
$this->callFunction(
@ -704,7 +704,7 @@ class InsertEditTest extends AbstractTestCase
$this->assertEquals(
[
'num',
' nowrap',
' text-nowrap',
false,
],
$this->callFunction(
@ -723,7 +723,7 @@ class InsertEditTest extends AbstractTestCase
$this->assertEquals(
[
'num',
' nowrap',
' text-nowrap',
false,
],
$this->callFunction(
@ -2238,7 +2238,7 @@ class InsertEditTest extends AbstractTestCase
$GLOBALS['cfg']['ActionLinksMode'] = 'icons';
$GLOBALS['cfg']['LinkLengthLimit'] = 2;
$this->assertStringContainsString(
'<a href="#" target="_blank"><span class="nowrap"><img src="themes/dot.'
'<a href="#" target="_blank"><span class="text-nowrap"><img src="themes/dot.'
. 'gif" title="Edit/Insert" alt="Edit/Insert" class="icon ic_b_edit">'
. '</span></a>',
$this->callFunction(

View File

@ -700,10 +700,6 @@ td.disabled {
color: #aaa;
}
.nowrap {
white-space: nowrap;
}
.pre_wrap {
white-space: pre-wrap;
}
@ -802,10 +798,6 @@ label.col-3.d-flex.align-items-center {
width: 30px;
}
.font_weight_bold {
font-weight: bold;
}
.color_gray {
color: gray;
}
@ -814,10 +806,6 @@ label.col-3.d-flex.align-items-center {
max-height: 400px;
}
.pma_sliding_message {
display: inline-block;
}
li.last.database {
margin-bottom: 15px;
}

View File

@ -10,10 +10,6 @@
display: none;
}
.nowrap {
white-space: nowrap;
}
.hide {
display: none;
}

View File

@ -846,10 +846,6 @@ td.disabled {
color: #aaa;
}
.nowrap {
white-space: nowrap;
}
.pre_wrap {
white-space: pre-wrap;
}
@ -858,10 +854,6 @@ td.disabled {
display: none;
}
.font_weight_bold {
font-weight: bold;
}
/* specific elements */
ul.tabs {

View File

@ -10,10 +10,6 @@
display: none;
}
.nowrap {
white-space: nowrap;
}
.hide {
display: none;
}

View File

@ -525,10 +525,6 @@ td.disabled {
background-color: #ccc;
}
.nowrap {
white-space: nowrap;
}
.pre_wrap {
white-space: pre-wrap;
}
@ -643,10 +639,6 @@ form.login label {
width: 30px;
}
.font_weight_bold {
font-weight: bold;
}
.color_gray {
color: gray;
}
@ -655,10 +647,6 @@ form.login label {
max-height: 400px;
}
.pma_sliding_message {
display: inline-block;
}
li.last.database {
margin-bottom: 20px !important;
}

View File

@ -760,10 +760,6 @@ div.tools a:hover,
color: #aaa;
}
.nowrap {
white-space: nowrap;
}
.pre_wrap {
white-space: pre-wrap;
}
@ -871,10 +867,6 @@ label.col-3.d-flex.align-items-center {
width: 30px;
}
.font_weight_bold {
font-weight: bold;
}
.color_gray {
color: gray;
}
@ -883,10 +875,6 @@ label.col-3.d-flex.align-items-center {
max-height: 400px;
}
.pma_sliding_message {
display: inline-block;
}
li.last.database {
margin-bottom: 15px !important;
}

View File

@ -10,10 +10,6 @@
display: none;
}
.nowrap {
white-space: nowrap;
}
.hide {
display: none;
}