').html(value.recommendation).text());
- $tbody.append($tr = $('
' +
+ $tbody.append($tr = $(' ' +
value.issue + ' ' + rc_stripped + ' '));
even = !even;
$tr.data('rule', value);
diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js
index bd107e5b6b..10e365e292 100644
--- a/js/server_status_monitor.js
+++ b/js/server_status_monitor.js
@@ -1690,7 +1690,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
* to group queries ignoring data in WHERE clauses
*/
function filterQueries(varFilterChange) {
- var odd_row = false, cell, textFilter;
+ var cell, textFilter;
var val = $('#filterQueryText').val();
if (val.length === 0) {
@@ -1791,16 +1791,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
} else {
totalSum += parseInt($t.next().text(), 10);
rowSum++;
-
- odd_row = ! odd_row;
$t.parent().css('display', '');
- if (odd_row) {
- $t.parent().addClass('odd');
- $t.parent().removeClass('even');
- } else {
- $t.parent().addClass('even');
- $t.parent().removeClass('odd');
- }
}
hide = false;
diff --git a/js/server_status_sorter.js b/js/server_status_sorter.js
index b0891c1688..3f90108b9c 100644
--- a/js/server_status_sorter.js
+++ b/js/server_status_sorter.js
@@ -6,7 +6,6 @@ function initTableSorter(tabid) {
$table = $('#serverstatusqueriesdetails');
opts = {
sortList: [[3, 1]],
- widgets: ['fast-zebra'],
headers: {
1: { sorter: 'fancyNumber' },
2: { sorter: 'fancyNumber' }
@@ -67,17 +66,4 @@ $(function () {
},
type: "numeric"
});
-
- // faster zebra widget: no row visibility check, faster css class switching, no cssChildRow check
- $.tablesorter.addWidget({
- id: "fast-zebra",
- format: function (table) {
- $("tr:even", table.tBodies[0])
- .removeClass(table.config.widgetZebra.css[0])
- .addClass(table.config.widgetZebra.css[1]);
- $("tr:odd", table.tBodies[0])
- .removeClass(table.config.widgetZebra.css[1])
- .addClass(table.config.widgetZebra.css[0]);
- }
- });
});
diff --git a/js/server_status_variables.js b/js/server_status_variables.js
index 47956f8464..c06952c4ee 100644
--- a/js/server_status_variables.js
+++ b/js/server_status_variables.js
@@ -21,7 +21,6 @@ AJAX.registerOnload('server_status_variables.js', function () {
var textFilter = null;
var alertFilter = $('#filterAlert').prop('checked');
var categoryFilter = $('#filterCategory').find(':selected').val();
- var odd_row = false;
var text = ''; // Holds filter text
/* 3 Filtering functions */
@@ -88,21 +87,12 @@ AJAX.registerOnload('server_status_variables.js', function () {
$('#linkSuggestions').css('display', 'none');
}
- odd_row = false;
$('#serverstatusvariables').find('th.name').each(function () {
if ((textFilter === null || textFilter.exec($(this).text())) &&
(! alertFilter || $(this).next().find('span.attention').length > 0) &&
(categoryFilter.length === 0 || $(this).parent().hasClass('s_' + categoryFilter))
) {
- odd_row = ! odd_row;
$(this).parent().css('display', '');
- if (odd_row) {
- $(this).parent().addClass('odd');
- $(this).parent().removeClass('even');
- } else {
- $(this).parent().addClass('even');
- $(this).parent().removeClass('odd');
- }
} else {
$(this).parent().css('display', 'none');
}
diff --git a/js/server_variables.js b/js/server_variables.js
index 5967cffd46..a80c647f38 100644
--- a/js/server_variables.js
+++ b/js/server_variables.js
@@ -50,7 +50,7 @@ AJAX.registerOnload('server_variables.js', function () {
/* Filters the rows by the user given regexp */
function filterVariables(textFilter) {
- var mark_next = false, $row, odd_row = false;
+ var mark_next = false, $row;
$('#serverVariables').find('.var-row').not('.var-header').each(function () {
$row = $(this);
if (mark_next || textFilter === null ||
@@ -59,14 +59,7 @@ AJAX.registerOnload('server_variables.js', function () {
// If current global value is different from session value
// (has class diffSession), then display that one too
mark_next = $row.hasClass('diffSession') && ! mark_next;
-
- odd_row = ! odd_row;
$row.css('display', '');
- if (odd_row) {
- $row.addClass('odd').removeClass('even');
- } else {
- $row.addClass('even').removeClass('odd');
- }
} else {
$row.css('display', 'none');
}
diff --git a/js/tbl_relation.js b/js/tbl_relation.js
index 2d0ec5dc37..21ee030837 100644
--- a/js/tbl_relation.js
+++ b/js/tbl_relation.js
@@ -173,8 +173,7 @@ AJAX.registerOnload('tbl_relation.js', function () {
event.stopPropagation();
var $prev_row = $(this).closest('tr').prev('tr');
- var odd_even = ($prev_row.attr('class') == 'odd') ? 'even' : 'odd';
- var $new_row = $prev_row.clone(true, true).attr('class', odd_even);
+ var $new_row = $prev_row.clone(true, true);
// Update serial number.
var curr_index = $new_row
diff --git a/libraries/DbQbe.php b/libraries/DbQbe.php
index 91d08adec7..3e72717090 100644
--- a/libraries/DbQbe.php
+++ b/libraries/DbQbe.php
@@ -463,7 +463,7 @@ class DbQbe
*/
private function _getColumnNamesRow()
{
- $html_output = '
';
+ $html_output = ' ';
$html_output .= '' . __('Column:') . ' ';
$new_column_count = 0;
for (
@@ -509,7 +509,7 @@ class DbQbe
*/
private function _getColumnAliasRow()
{
- $html_output = ' ';
+ $html_output = ' ';
$html_output .= '' . __('Alias:') . ' ';
$new_column_count = 0;
@@ -562,7 +562,7 @@ class DbQbe
*/
private function _getSortRow()
{
- $html_output = ' ';
+ $html_output = ' ';
$html_output .= '' . __('Sort:') . ' ';
$new_column_count = 0;
@@ -626,7 +626,7 @@ class DbQbe
*/
private function _getSortOrder()
{
- $html_output = ' ';
+ $html_output = ' ';
$html_output .= '' . __('Sort order:') . ' ';
$new_column_count = 0;
@@ -675,7 +675,7 @@ class DbQbe
*/
private function _getShowRow()
{
- $html_output = ' ';
+ $html_output = ' ';
$html_output .= '' . __('Show:') . ' ';
$new_column_count = 0;
for (
@@ -724,7 +724,7 @@ class DbQbe
*/
private function _getCriteriaInputboxRow()
{
- $html_output = ' ';
+ $html_output = ' ';
$html_output .= '' . __('Criteria:') . ' ';
$new_column_count = 0;
for (
@@ -901,7 +901,7 @@ class DbQbe
*/
private function _getModifyColumnsRow()
{
- $html_output = ' ';
+ $html_output = ' ';
$html_output .= '' . __('Modify:') . ' ';
$new_column_count = 0;
for (
@@ -1064,7 +1064,6 @@ class DbQbe
{
$html_output = '';
$new_row_count = 0;
- $odd_row = true;
$checked_options = array();
for (
$row_index = 0;
@@ -1076,8 +1075,7 @@ class DbQbe
) {
$checked_options['or'] = ' checked="checked"';
$checked_options['and'] = '';
- $html_output .= ' ';
+ $html_output .= ' ';
$html_output .= $this->_getInsDelAndOrCell(
$new_row_count, $checked_options
);
@@ -1086,7 +1084,6 @@ class DbQbe
);
$new_row_count++;
$html_output .= ' ';
- $odd_row =! $odd_row;
} // end if
if (isset($this->_criteriaRowDelete[$row_index])
&& $this->_criteriaRowDelete[$row_index] == 'on'
@@ -1106,8 +1103,7 @@ class DbQbe
$checked_options['or'] = ' checked="checked"';
$checked_options['and'] = '';
}
- $html_output .= '
';
+ $html_output .= ' ';
$html_output .= $this->_getInsDelAndOrCell(
$new_row_count, $checked_options
);
@@ -1116,7 +1112,6 @@ class DbQbe
);
$new_row_count++;
$html_output .= ' ';
- $odd_row =! $odd_row;
} // end for
$this->_new_row_count = $new_row_count;
return $html_output;
diff --git a/libraries/DbSearch.php b/libraries/DbSearch.php
index 383c918905..1caf9f6f39 100644
--- a/libraries/DbSearch.php
+++ b/libraries/DbSearch.php
@@ -272,7 +272,6 @@ class DbSearch
. '';
$num_search_result_total = 0;
- $odd_row = true;
// For each table selected as search criteria
foreach ($this->_criteriaTables as $each_table) {
// Gets the SQL statements
@@ -282,9 +281,8 @@ class DbSearch
$num_search_result_total += $res_cnt;
// Gets the result row's HTML for a table
$html_output .= $this->_getResultsRow(
- $each_table, $newsearchsqls, $odd_row, $res_cnt
+ $each_table, $newsearchsqls, $res_cnt
);
- $odd_row = ! $odd_row;
} // end for
$html_output .= '';
// Displays total number of matches
@@ -309,12 +307,11 @@ class DbSearch
*
* @param string $each_table One of the tables on which search was performed
* @param array $newsearchsqls Contains SQL queries
- * @param bool $odd_row For displaying contrasting table rows
* @param integer $res_cnt Number of results found
*
* @return string HTML row
*/
- private function _getResultsRow($each_table, $newsearchsqls, $odd_row, $res_cnt)
+ private function _getResultsRow($each_table, $newsearchsqls, $res_cnt)
{
$this_url_params = array(
'db' => $GLOBALS['db'],
@@ -324,7 +321,7 @@ class DbSearch
'is_js_confirmed' => 0,
);
// Start forming search results row
- $html_output = '
';
+ $html_output = ' ';
// Displays results count for a table
$html_output .= '';
$html_output .= sprintf(
diff --git a/libraries/DisplayResults.php b/libraries/DisplayResults.php
index e3182e214b..ec324e9c89 100644
--- a/libraries/DisplayResults.php
+++ b/libraries/DisplayResults.php
@@ -2747,8 +2747,6 @@ class DisplayResults
// table being displayed has one or more keys; but to display
// delete/edit options correctly for tables without keys.
- $odd_row = true;
-
$whereClauseMap = $this->__get('whereClauseMap');
while ($row = $GLOBALS['dbi']->fetchRow($dt_result)) {
@@ -2768,11 +2766,10 @@ class DisplayResults
if ($GLOBALS['cfg']['BrowseMarkerEnable'] != true) {
$tr_class[] = 'nomarker';
}
- $tr_class[] = ($odd_row ? 'odd' : 'even');
- $odd_row = ! $odd_row;
// pointer code part
- $table_body_html .= ' ';
+ $classes = (empty($tr_class) ? ' ' : 'class="' . implode(' ', $tr_class) . '"');
+ $table_body_html .= ' ';
// 1. Prepares the row
diff --git a/libraries/Index.php b/libraries/Index.php
index 0ebb2d9363..6949cd5954 100644
--- a/libraries/Index.php
+++ b/libraries/Index.php
@@ -692,11 +692,10 @@ class Index
$r .= '';
$r .= ' ';
- $odd_row = true;
foreach ($indexes as $index) {
$row_span = ' rowspan="' . $index->getColumnCount() . '" ';
- $r .= '';
+ $r .= ' ';
if (! $print_mode) {
$this_params = $GLOBALS['url_params'];
@@ -767,7 +766,7 @@ class Index
foreach ($index->getColumns() as $column) {
if ($column->getSeqInIndex() > 1) {
- $r .= ' ';
+ $r .= ' ';
}
$r .= '' . htmlspecialchars($column->getName());
if ($column->getSubPart()) {
@@ -792,7 +791,6 @@ class Index
$r .= ' ';
} // end foreach $index['Sequences']
- $odd_row = ! $odd_row;
} // end while
$r .= ' ';
$r .= '';
diff --git a/libraries/StorageEngine.php b/libraries/StorageEngine.php
index 71aa8ef0bc..07c7dcc11c 100644
--- a/libraries/StorageEngine.php
+++ b/libraries/StorageEngine.php
@@ -242,11 +242,10 @@ class StorageEngine
*/
public function getHtmlVariables()
{
- $odd_row = false;
$ret = '';
foreach ($this->getVariablesStatus() as $details) {
- $ret .= '
' . "\n"
+ $ret .= ' ' . "\n"
. ' ' . "\n";
if (! empty($details['desc'])) {
$ret .= ' '
@@ -271,7 +270,6 @@ class StorageEngine
}
$ret .= ' ' . "\n"
. ' ' . "\n";
- $odd_row = ! $odd_row;
}
if (! $ret) {
diff --git a/libraries/browse_foreigners.lib.php b/libraries/browse_foreigners.lib.php
index e47aaa8888..beea48c5ea 100644
--- a/libraries/browse_foreigners.lib.php
+++ b/libraries/browse_foreigners.lib.php
@@ -12,7 +12,6 @@ use PMA\libraries\URL;
*
* @param integer $horizontal_count the current horizontal count
* @param string $header table header
- * @param boolean $odd_row for the row background color
* @param array $keys all the keys
* @param integer $indexByKeyname index by keyname
* @param array $descriptions descriptions
@@ -21,7 +20,7 @@ use PMA\libraries\URL;
*
* @return string $html the generated html
*/
-function PMA_getHtmlForOneKey($horizontal_count, $header, $odd_row, $keys,
+function PMA_getHtmlForOneKey($horizontal_count, $header, $keys,
$indexByKeyname, $descriptions, $indexByDescription, $current_value
) {
$horizontal_count++;
@@ -36,7 +35,6 @@ function PMA_getHtmlForOneKey($horizontal_count, $header, $odd_row, $keys,
) {
$output .= $header;
$horizontal_count = 0;
- $odd_row = true;
}
// key names and descriptions for the left section,
@@ -62,8 +60,7 @@ function PMA_getHtmlForOneKey($horizontal_count, $header, $odd_row, $keys,
$leftKeynameIsSelected = $leftKeyname == $current_value;
}
- $output .= '
';
- $odd_row = ! $odd_row;
+ $output .= ' $value) {
list(
$html,
$horizontal_count,
- $odd_row,
$indexByDescription
) = PMA_getHtmlForOneKey(
- $horizontal_count, $header, $odd_row, $keys, $indexByKeyname,
+ $horizontal_count, $header, $keys, $indexByKeyname,
$descriptions, $indexByDescription, $current_value
);
$output .= $html;
diff --git a/libraries/central_columns.lib.php b/libraries/central_columns.lib.php
index bbd81f19aa..c5294eaf21 100644
--- a/libraries/central_columns.lib.php
+++ b/libraries/central_columns.lib.php
@@ -827,16 +827,14 @@ function PMA_getHTMLforAddCentralColumn($total_rows, $pos, $db)
*
* @param array $row array contains complete information of
* a particular row of central list table
- * @param boolean $odd_row set true if the row is at odd number position
* @param int $row_num position the row in the table
* @param string $db current database
*
* @return string html of a particular row in the central columns table.
*/
-function PMA_getHTMLforCentralColumnsTableRow($row, $odd_row, $row_num, $db)
+function PMA_getHTMLforCentralColumnsTableRow($row, $row_num, $db)
{
- $tableHtml = ' '
+ $tableHtml = ' '
. URL::getHiddenInputs(
$db
)
@@ -1000,14 +998,13 @@ function PMA_getHTMLforCentralColumnsTableRow($row, $odd_row, $row_num, $db)
*
* @param array $row array contains complete information of
* a particular row of central list table
- * @param boolean $odd_row set true if the row is at odd number position
* @param int $row_num position the row in the table
*
* @return string html of a particular row in the central columns table.
*/
-function PMA_getHTMLforCentralColumnsEditTableRow($row, $odd_row, $row_num)
+function PMA_getHTMLforCentralColumnsEditTableRow($row, $row_num)
{
- $tableHtml = ' '
+ $tableHtml = ' '
. ''
@@ -1394,14 +1391,12 @@ function PMA_getHTMLforEditingPage($selected_fld,$selected_db)
$columns_list = implode("','", $selected_fld_safe);
$columns_list = "'" . $columns_list . "'";
$list_detail_cols = PMA_findExistingColNames($selected_db, $columns_list, true);
- $odd_row = false;
$row_num = 0;
foreach ($list_detail_cols as $row) {
$tableHtmlRow = PMA_getHTMLforCentralColumnsEditTableRow(
- $row, $odd_row, $row_num
+ $row, $row_num
);
$html .= $tableHtmlRow;
- $odd_row = !$odd_row;
$row_num++;
}
$html .= '';
diff --git a/libraries/controllers/database/DatabaseStructureController.php b/libraries/controllers/database/DatabaseStructureController.php
index 30ded389c5..0acf452f5a 100644
--- a/libraries/controllers/database/DatabaseStructureController.php
+++ b/libraries/controllers/database/DatabaseStructureController.php
@@ -386,7 +386,6 @@ class DatabaseStructureController extends DatabaseController
$overhead_size = 0;
$hidden_fields = array();
- $odd_row = true;
$overall_approx_rows = false;
foreach ($this->_tables as $keyname => $current_table) {
// Get valid statistics whatever is the table type
@@ -586,7 +585,6 @@ class DatabaseStructureController extends DatabaseController
&& ($row_count % $num_columns) == 0
) {
$row_count = 1;
- $odd_row = true;
$this->response->addHTML(
' '
@@ -615,7 +613,6 @@ class DatabaseStructureController extends DatabaseController
array(
'db' => $this->db,
'curr' => $i,
- 'odd_row' => $odd_row,
'table_is_view' => $table_is_view,
'current_table' => $current_table,
'browse_table_label' => $browse_table_label,
@@ -654,7 +651,6 @@ class DatabaseStructureController extends DatabaseController
)
);
- $odd_row = ! $odd_row;
$overall_approx_rows = $overall_approx_rows || $approx_rows;
} // end foreach
diff --git a/libraries/controllers/server/ServerBinlogController.php b/libraries/controllers/server/ServerBinlogController.php
index b099015c6d..74fd565b76 100644
--- a/libraries/controllers/server/ServerBinlogController.php
+++ b/libraries/controllers/server/ServerBinlogController.php
@@ -246,17 +246,13 @@ class ServerBinlogController extends Controller
private function _getAllLogItemInfo($result, $dontlimitchars)
{
$html = "";
- $odd_row = true;
while ($value = $this->dbi->fetchAssoc($result)) {
$html .= Template::get('server/binlog/log_row')->render(
array(
- 'odd_row' => $odd_row,
'value' => $value,
'dontlimitchars' => $dontlimitchars,
)
);
-
- $odd_row = !$odd_row;
}
return $html;
}
diff --git a/libraries/controllers/server/ServerDatabasesController.php b/libraries/controllers/server/ServerDatabasesController.php
index bdd459cf65..3d867f47d0 100644
--- a/libraries/controllers/server/ServerDatabasesController.php
+++ b/libraries/controllers/server/ServerDatabasesController.php
@@ -433,16 +433,13 @@ class ServerDatabasesController extends Controller
*/
private function _getHtmlForTableBody($column_order, $replication_types)
{
- $odd_row = true;
$html = '
' . "\n";
foreach ($this->_databases as $current) {
- $tr_class = $odd_row ? 'odd' : 'even';
- $tr_class .= ' db-row';
+ $tr_class = ' db-row';
if ($this->dbi->isSystemSchema($current['SCHEMA_NAME'], true)) {
$tr_class .= ' noclick';
}
- $odd_row = ! $odd_row;
$generated_html = $this->_buildHtmlForDb(
$current,
diff --git a/libraries/controllers/server/ServerVariablesController.php b/libraries/controllers/server/ServerVariablesController.php
index 92520ff968..60dbd7a110 100644
--- a/libraries/controllers/server/ServerVariablesController.php
+++ b/libraries/controllers/server/ServerVariablesController.php
@@ -323,12 +323,10 @@ class ServerVariablesController extends Controller
$static_variables = $this->_getStaticSystemVariables();
$output = '';
- $odd_row = true;
foreach ($serverVars as $name => $value) {
$has_session_value = isset($serverVarsSession[$name])
&& $serverVarsSession[$name] != $value;
- $row_class = ($odd_row ? ' odd' : ' even')
- . ($has_session_value ? ' diffSession' : '');
+ $row_class = ($has_session_value ? ' diffSession' : '');
$docLink = isset($this->variable_doc_links[$name])
? $this->variable_doc_links[$name] : null;
@@ -364,7 +362,6 @@ class ServerVariablesController extends Controller
);
}
- $odd_row = ! $odd_row;
}
return $output;
diff --git a/libraries/engines/Innodb.php b/libraries/engines/Innodb.php
index cdcb6dc77e..88eb4eb990 100644
--- a/libraries/engines/Innodb.php
+++ b/libraries/engines/Innodb.php
@@ -185,7 +185,7 @@ class Innodb extends StorageEngine
. ' ' . "\n"
. ' ' . "\n"
. ' ' . "\n"
- . ' ' . "\n"
+ . ' ' . "\n"
. ' ' . __('Free pages') . ' ' . "\n"
. ' '
. Util::formatNumber(
@@ -194,7 +194,7 @@ class Innodb extends StorageEngine
)
. ' ' . "\n"
. ' ' . "\n"
- . ' ' . "\n"
+ . ' ' . "\n"
. ' ' . __('Dirty pages') . ' ' . "\n"
. ' '
. Util::formatNumber(
@@ -203,7 +203,7 @@ class Innodb extends StorageEngine
)
. ' ' . "\n"
. ' ' . "\n"
- . ' ' . "\n"
+ . ' ' . "\n"
. ' ' . __('Pages containing data') . ' ' . "\n"
. ' '
. Util::formatNumber(
@@ -212,7 +212,7 @@ class Innodb extends StorageEngine
) . "\n"
. ' ' . "\n"
. ' ' . "\n"
- . ' ' . "\n"
+ . ' ' . "\n"
. ' ' . __('Pages to be flushed') . ' ' . "\n"
. ' '
. Util::formatNumber(
@@ -221,7 +221,7 @@ class Innodb extends StorageEngine
) . "\n"
. ' ' . "\n"
. ' ' . "\n"
- . ' ' . "\n"
+ . ' ' . "\n"
. ' ' . __('Busy pages') . ' ' . "\n"
. ' '
. Util::formatNumber(
@@ -233,7 +233,7 @@ class Innodb extends StorageEngine
// not present at least since MySQL 5.1.40
if (isset($status['Innodb_buffer_pool_pages_latched'])) {
- $output .= ' '
+ $output .= ' '
. ' ' . __('Latched pages') . ' '
. ' '
. Util::formatNumber(
@@ -251,7 +251,7 @@ class Innodb extends StorageEngine
. ' ' . __('Buffer Pool Activity') . "\n"
. ' ' . "\n"
. ' ' . "\n"
- . ' ' . "\n"
+ . ' ' . "\n"
. ' ' . __('Read requests') . ' ' . "\n"
. ' '
. Util::formatNumber(
@@ -260,7 +260,7 @@ class Innodb extends StorageEngine
) . "\n"
. ' ' . "\n"
. ' ' . "\n"
- . ' ' . "\n"
+ . ' ' . "\n"
. ' ' . __('Write requests') . ' ' . "\n"
. ' '
. Util::formatNumber(
@@ -269,7 +269,7 @@ class Innodb extends StorageEngine
) . "\n"
. ' ' . "\n"
. ' ' . "\n"
- . ' ' . "\n"
+ . ' ' . "\n"
. ' ' . __('Read misses') . ' ' . "\n"
. ' '
. Util::formatNumber(
@@ -278,7 +278,7 @@ class Innodb extends StorageEngine
) . "\n"
. ' ' . "\n"
. ' ' . "\n"
- . ' ' . "\n"
+ . ' ' . "\n"
. ' ' . __('Write waits') . ' ' . "\n"
. ' '
. Util::formatNumber(
@@ -287,7 +287,7 @@ class Innodb extends StorageEngine
) . "\n"
. ' ' . "\n"
. ' ' . "\n"
- . ' ' . "\n"
+ . ' ' . "\n"
. ' ' . __('Read misses in %') . ' ' . "\n"
. ' '
. ($status['Innodb_buffer_pool_read_requests'] == 0
@@ -302,7 +302,7 @@ class Innodb extends StorageEngine
) . ' %') . "\n"
. ' ' . "\n"
. ' ' . "\n"
- . ' ' . "\n"
+ . ' ' . "\n"
. ' ' . __('Write waits in %') . ' ' . "\n"
. ' '
. ($status['Innodb_buffer_pool_write_requests'] == 0
diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php
index 39404c5084..fdd10f528f 100644
--- a/libraries/insert_edit.lib.php
+++ b/libraries/insert_edit.lib.php
@@ -532,7 +532,6 @@ function PMA_getNullifyCodeForNullColumn($column, $foreigners, $foreignData)
* @param string $data description of the column field
* @param string $special_chars special characters
* @param array $foreignData data about the foreign keys
- * @param boolean $odd_row whether row is odd
* @param array $paramTableDbArray array containing $table and $db
* @param integer $rownumber the row number
* @param array $titles An HTML IMG tag for a particular icon from
@@ -558,7 +557,7 @@ function PMA_getNullifyCodeForNullColumn($column, $foreigners, $foreignData)
*/
function PMA_getValueColumn($column, $backup_field, $column_name_appendix,
$onChangeClause, $tabindex, $tabindex_for_value, $idindex, $data,
- $special_chars, $foreignData, $odd_row, $paramTableDbArray, $rownumber,
+ $special_chars, $foreignData, $paramTableDbArray, $rownumber,
$titles, $text_dir, $special_chars_encoded, $vkey,
$is_upload, $biggest_max_file_size,
$default_char_editing, $no_support_types, $gis_data_types, $extracted_columnspec,
@@ -587,8 +586,7 @@ function PMA_getValueColumn($column, $backup_field, $column_name_appendix,
) {
$html_output = ' ';
$html_output .= ' ';
- $html_output .= ''
- . '';
+ $html_output .= ' ' . '';
$html_output .= PMA_getTextarea(
$column, $backup_field, $column_name_appendix, $onChangeClause,
$tabindex, $tabindex_for_value, $idindex, $text_dir,
@@ -2652,16 +2650,15 @@ function PMA_getHtmlForIgnoreOption($row_id, $checked = true)
/**
* Function to get html for the function option
*
- * @param bool $odd_row whether odd row or not
* @param array $column column
* @param string $column_name_appendix column name appendix
*
* @return String
*/
-function PMA_getHtmlForFunctionOption($odd_row, $column, $column_name_appendix)
+function PMA_getHtmlForFunctionOption($column, $column_name_appendix)
{
$longDoubleTextArea = $GLOBALS['cfg']['LongtextDoubleTextarea'];
- return ' '
+ return ' '
. '';
+ $html .= ' ';
$html .= ' ';
$html .= htmlspecialchars($variable);
$html .= ' ';
@@ -584,8 +583,6 @@ function PMA_getHtmlForReplicationStatusTable($type, $hidden = false, $title = t
$html .= ' ';
$html .= ' ';
-
- $odd_row = ! $odd_row;
}
$html .= ' ';
@@ -622,14 +619,11 @@ function PMA_getHtmlForReplicationSlavesTable($hidden = false)
$html .= ' ';
$html .= '
';
- $odd_row = true;
foreach ($data as $slave) {
- $html .= ' ';
+ $html .= ' ';
$html .= ' ' . $slave['Server_id'] . ' ';
$html .= ' ' . $slave['Host'] . ' ';
$html .= ' ';
-
- $odd_row = ! $odd_row;
}
$html .= ' ';
diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index fc7607b377..1b3e2cde4f 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -2389,19 +2389,18 @@ function PMA_getListOfPrivilegesAndComparedPrivileges()
* Get the HTML for routine based privileges
*
* @param string $db database name
- * @param string $odd_row row styling
* @param string $index_checkbox starting index for rows to be added
*
* @return string $html_output
*/
-function PMA_getHtmlTableBodyForSpecificDbRoutinePrivs($db, $odd_row, $index_checkbox)
+function PMA_getHtmlTableBodyForSpecificDbRoutinePrivs($db, $index_checkbox)
{
$sql_query = 'SELECT * FROM `mysql`.`procs_priv` WHERE Db = \'' . $GLOBALS['dbi']->escapeString($db) . '\';';
$res = $GLOBALS['dbi']->query($sql_query);
$html_output = '';
while ($row = $GLOBALS['dbi']->fetchAssoc($res)) {
- $html_output .= '
';
+ $html_output .= ' ';
$html_output .= ''
. __('No user found.')
. ''
@@ -2706,7 +2703,7 @@ function PMA_getHtmlTableBodyForSpecificDbOrTablePrivs($privMap, $db)
foreach ($privMap as $current_user => $val) {
foreach ($val as $current_host => $current_privileges) {
$nbPrivileges = count($current_privileges);
- $html_output .= '';
+ $html_output .= ' ';
$value = htmlspecialchars($current_user . '' . $current_host);
$html_output .= '';
+ $html_output .= '';
}
}
return $html_output;
@@ -3696,14 +3689,13 @@ function PMA_getHtmlTableBodyForUserRights($db_rights)
$user_group_count = PMA_getUserGroupCount();
}
- $odd_row = true;
$index_checkbox = 0;
$html_output = '';
foreach ($db_rights as $user) {
ksort($user);
foreach ($user as $host) {
$index_checkbox++;
- $html_output .= ' '
+ $html_output .= ' '
. "\n";
$html_output .= ''
. ' ';
- $odd_row = ! $odd_row;
}
}
return $html_output;
diff --git a/libraries/server_status.lib.php b/libraries/server_status.lib.php
index b126bfd784..ea485f9565 100644
--- a/libraries/server_status.lib.php
+++ b/libraries/server_status.lib.php
@@ -150,7 +150,7 @@ function PMA_getHtmlForServerStateTraffic($ServerStatusData)
$retval .= ' ';
$retval .= '';
$retval .= '';
- $retval .= '';
+ $retval .= ' ';
$retval .= '' . __('Received') . ' ';
$retval .= '';
$retval .= implode(
@@ -169,7 +169,7 @@ function PMA_getHtmlForServerStateTraffic($ServerStatusData)
);
$retval .= ' ';
$retval .= ' ';
- $retval .= '';
+ $retval .= ' ';
$retval .= '' . __('Sent') . ' ';
$retval .= '';
$retval .= implode(
@@ -188,7 +188,7 @@ function PMA_getHtmlForServerStateTraffic($ServerStatusData)
);
$retval .= ' ';
$retval .= ' ';
- $retval .= '';
+ $retval .= ' ';
$retval .= '' . __('Total') . ' ';
$retval .= '';
$bytes_received = $ServerStatusData->status['Bytes_received'];
@@ -236,7 +236,7 @@ function PMA_getHtmlForServerStateConnections($ServerStatusData)
$retval .= ' ';
$retval .= '';
$retval .= ' ';
- $retval .= '';
+ $retval .= ' ';
$retval .= '' . __('Max. concurrent connections') . ' ';
$retval .= '';
$retval .= PMA\libraries\Util::formatNumber(
@@ -246,7 +246,7 @@ function PMA_getHtmlForServerStateConnections($ServerStatusData)
$retval .= ' --- ';
$retval .= '--- ';
$retval .= ' ';
- $retval .= '';
+ $retval .= ' ';
$retval .= '' . __('Failed attempts') . ' ';
$retval .= '';
$retval .= PMA\libraries\Util::formatNumber(
@@ -273,7 +273,7 @@ function PMA_getHtmlForServerStateConnections($ServerStatusData)
}
$retval .= ' ';
$retval .= ' ';
- $retval .= '';
+ $retval .= ' ';
$retval .= '' . __('Aborted') . ' ';
$retval .= '';
$retval .= PMA\libraries\Util::formatNumber(
@@ -300,7 +300,7 @@ function PMA_getHtmlForServerStateConnections($ServerStatusData)
}
$retval .= ' ';
$retval .= ' ';
- $retval .= '';
+ $retval .= ' ';
$retval .= '' . __('Total') . ' ';
$retval .= '';
$retval .= PMA\libraries\Util::formatNumber(
diff --git a/libraries/server_status_processes.lib.php b/libraries/server_status_processes.lib.php
index c03404974e..ce9f10a921 100644
--- a/libraries/server_status_processes.lib.php
+++ b/libraries/server_status_processes.lib.php
@@ -192,14 +192,11 @@ function PMA_getHtmlForServerProcesslist()
$retval .= '';
$retval .= ' ';
- $odd_row = true;
while ($process = $GLOBALS['dbi']->fetchAssoc($result)) {
$retval .= PMA_getHtmlForServerProcessItem(
$process,
- $odd_row,
$show_full_sql
);
- $odd_row = ! $odd_row;
}
$retval .= ' ';
$retval .= '';
@@ -251,12 +248,11 @@ function PMA_getHtmlForProcessListFilter()
* Prints Every Item of Server Process
*
* @param array $process data of Every Item of Server Process
- * @param bool $odd_row display odd row or not
* @param bool $show_full_sql show full sql or not
*
* @return string
*/
-function PMA_getHtmlForServerProcessItem($process, $odd_row, $show_full_sql)
+function PMA_getHtmlForServerProcessItem($process, $show_full_sql)
{
// Array keys need to modify due to the way it has used
// to display column values
@@ -278,7 +274,7 @@ function PMA_getHtmlForServerProcessItem($process, $odd_row, $show_full_sql)
);
$kill_process = 'server_status_processes.php' . URL::getCommon($url_params);
- $retval = '';
+ $retval = ' ';
$retval .= ''
. __('Kill') . ' ' . $process['Id'] . ' ';
diff --git a/libraries/server_status_queries.lib.php b/libraries/server_status_queries.lib.php
index b81f90679e..2bbbaafe15 100644
--- a/libraries/server_status_queries.lib.php
+++ b/libraries/server_status_queries.lib.php
@@ -77,8 +77,6 @@ function PMA_getHtmlForServerStatusQueriesDetails($ServerStatusData)
// reverse sort by value to show most used statements first
arsort($used_queries);
- $odd_row = true;
-
//(- $ServerStatusData->status['Connections']);
$perc_factor = 100 / $total_queries;
@@ -103,7 +101,6 @@ function PMA_getHtmlForServerStatusQueriesDetails($ServerStatusData)
$query_sum = array_sum($used_queries);
$other_sum = 0;
foreach ($used_queries as $name => $value) {
- $odd_row = !$odd_row;
// For the percentage column, use Questions - Connections, because
// the number of connections is not an item of the Query types
// but is included in Questions. Then the total of the percentages is 100.
@@ -115,9 +112,7 @@ function PMA_getHtmlForServerStatusQueriesDetails($ServerStatusData)
} else {
$chart_json[$name] = $value;
}
- $retval .= ' ';
+ $retval .= ' ';
$retval .= '' . htmlspecialchars($name) . ' ';
$retval .= '';
$retval .= htmlspecialchars(
diff --git a/libraries/server_status_variables.lib.php b/libraries/server_status_variables.lib.php
index 60ec7d589e..0b4d6356d0 100644
--- a/libraries/server_status_variables.lib.php
+++ b/libraries/server_status_variables.lib.php
@@ -221,11 +221,8 @@ function PMA_getHtmlForRenderVariables($ServerStatusData, $alerts, $strShowStatu
$retval .= '';
$retval .= ' ';
- $odd_row = false;
foreach ($ServerStatusData->status as $name => $value) {
- $odd_row = !$odd_row;
- $retval .= 'allocationMap[$name])
?' s_' . $ServerStatusData->allocationMap[$name]
: '')
. '">';
diff --git a/templates/columns_definitions/table_fields_definitions.phtml b/templates/columns_definitions/table_fields_definitions.phtml
index 568583ed5b..a300040f52 100644
--- a/templates/columns_definitions/table_fields_definitions.phtml
+++ b/templates/columns_definitions/table_fields_definitions.phtml
@@ -121,10 +121,8 @@
-
-
-
+
render($content_row); ?>
diff --git a/templates/database/structure/structure_table_row.phtml b/templates/database/structure/structure_table_row.phtml
index 7ec665bf87..d8af414b84 100644
--- a/templates/database/structure/structure_table_row.phtml
+++ b/templates/database/structure/structure_table_row.phtml
@@ -1,4 +1,4 @@
-
id="row_tbl_">
-
-
+
-
diff --git a/templates/server/engines/engines.phtml b/templates/server/engines/engines.phtml
index b0062f296e..5b57979488 100644
--- a/templates/server/engines/engines.phtml
+++ b/templates/server/engines/engines.phtml
@@ -6,10 +6,8 @@
-
$details): ?>
@@ -19,7 +17,6 @@
-
diff --git a/templates/server/plugins/section.phtml b/templates/server/plugins/section.phtml
index c9d4d8b050..019e1f1da2 100644
--- a/templates/server/plugins/section.phtml
+++ b/templates/server/plugins/section.phtml
@@ -13,9 +13,8 @@
-
-
+
@@ -27,7 +26,6 @@
-
\ No newline at end of file
diff --git a/templates/table/index_form.phtml b/templates/table/index_form.phtml
index 594973b0e5..331c601014 100644
--- a/templates/table/index_form.phtml
+++ b/templates/table/index_form.phtml
@@ -128,7 +128,7 @@
- getColumns() as $column): ?>
-
+
@@ -184,13 +184,12 @@
-
+
@@ -223,7 +222,6 @@
diff --git a/templates/table/relation/common_form.phtml b/templates/table/relation/common_form.phtml
index 27ee64f394..ddb0a333a9 100644
--- a/templates/table/relation/common_form.phtml
+++ b/templates/table/relation/common_form.phtml
@@ -34,13 +34,12 @@
-
+
$one_key): ?>
render(
array(
'one_key' => $one_key,
- 'odd_row' => $odd_row,
'columns' => $columns,
'i' => $i++,
'options_array' => $options_array,
@@ -48,13 +47,12 @@
'db' => $db
)
);
- $odd_row = ! $odd_row;?>
+ ?>
render(
array(
'one_key' => array(),
- 'odd_row' => $odd_row,
'columns' => $columns,
'i' => $i++,
'options_array' => $options_array,
@@ -92,18 +90,16 @@
. ' FOREIGN KEY relation exists.')); ?>
-
render(
array(
'save_row' => $save_row,
'i' => $i,
- 'odd_row' => $odd_row,
'existrel' => $existrel,
'db' => $db
)
);
- $odd_row = ! $odd_row; ?>
+ ?>
diff --git a/templates/table/relation/foreign_key_row.phtml b/templates/table/relation/foreign_key_row.phtml
index aec621474e..67f6d836fb 100644
--- a/templates/table/relation/foreign_key_row.phtml
+++ b/templates/table/relation/foreign_key_row.phtml
@@ -67,7 +67,7 @@ if ($foreign_db) {
}
}
?>
-
+
diff --git a/templates/table/relation/internal_relational_row.phtml b/templates/table/relation/internal_relational_row.phtml
index b5b7a50c06..47bc45f972 100644
--- a/templates/table/relation/internal_relational_row.phtml
+++ b/templates/table/relation/internal_relational_row.phtml
@@ -43,7 +43,7 @@ if ($foreign_db && $foreign_table) {
$columns = $table_obj->getUniqueColumns(false, false);
}
?>
-
+
-
-
+
+
render(array(
diff --git a/templates/table/search/rows_zoom.phtml b/templates/table/search/rows_zoom.phtml
index 78703450f4..4ab0ec5962 100644
--- a/templates/table/search/rows_zoom.phtml
+++ b/templates/table/search/rows_zoom.phtml
@@ -1,5 +1,4 @@
-
-
+
diff --git a/templates/table/search/zoom_result_form.phtml b/templates/table/search/zoom_result_form.phtml
index 91f89b2990..e3b34f584d 100644
--- a/templates/table/search/zoom_result_form.phtml
+++ b/templates/table/search/zoom_result_form.phtml
@@ -36,7 +36,6 @@
-
-
-
+