move styles into css
This commit is contained in:
@@ -648,14 +648,23 @@ li#li_flush_privileges {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#selflink {
|
#selflink {
|
||||||
float: right;
|
|
||||||
clear: both;
|
clear: both;
|
||||||
|
display: block;
|
||||||
|
margin-top: 1em;
|
||||||
|
margin-bottom: 1em;
|
||||||
|
width: 100%;
|
||||||
|
border-top: 0.1em solid silver;
|
||||||
|
text-align: <?php echo $right; ?>;
|
||||||
}
|
}
|
||||||
|
|
||||||
#table_innodb_bufferpool_usage,
|
#table_innodb_bufferpool_usage,
|
||||||
#table_innodb_bufferpool_activity {
|
#table_innodb_bufferpool_activity {
|
||||||
float: <?php echo $left; ?>;
|
float: <?php echo $left; ?>;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#div_mysql_charset_collations table {
|
||||||
|
float: <?php echo $left; ?>;
|
||||||
|
}
|
||||||
<?php
|
<?php
|
||||||
} // end styles 2.7.1
|
} // end styles 2.7.1
|
||||||
|
|
||||||
|
@@ -2,6 +2,9 @@
|
|||||||
/* $Id$ */
|
/* $Id$ */
|
||||||
// vim: expandtab sw=4 ts=4 sts=4:
|
// vim: expandtab sw=4 ts=4 sts=4:
|
||||||
|
|
||||||
|
/**
|
||||||
|
* requirements
|
||||||
|
*/
|
||||||
require_once('./libraries/common.lib.php');
|
require_once('./libraries/common.lib.php');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -20,7 +23,9 @@ require('./libraries/server_links.inc.php');
|
|||||||
* Displays the sub-page heading
|
* Displays the sub-page heading
|
||||||
*/
|
*/
|
||||||
echo '<h2>' . "\n"
|
echo '<h2>' . "\n"
|
||||||
. ' ' . ($GLOBALS['cfg']['MainPageIconic'] ? '<img class="icon" src="'. $GLOBALS['pmaThemeImage'] . 's_asci.png" alt="" />' : '')
|
. ' ' . ($GLOBALS['cfg']['MainPageIconic']
|
||||||
|
? '<img class="icon" src="'. $GLOBALS['pmaThemeImage'] . 's_asci.png" alt="" />'
|
||||||
|
: '')
|
||||||
. '' . $strCharsetsAndCollations . "\n"
|
. '' . $strCharsetsAndCollations . "\n"
|
||||||
. '</h2>' . "\n";
|
. '</h2>' . "\n";
|
||||||
|
|
||||||
@@ -43,17 +48,10 @@ require_once('./libraries/mysql_charsets.lib.php');
|
|||||||
/**
|
/**
|
||||||
* Outputs the result
|
* Outputs the result
|
||||||
*/
|
*/
|
||||||
echo '<table border="0">' . "\n"
|
echo '<div id="div_mysql_charset_collations">' . "\n"
|
||||||
. ' <tr>' . "\n"
|
. '<table class="data">' . "\n"
|
||||||
. ' <td valign="top">' . "\n"
|
. '<tr><th>' . $strCollation . '</th>' . "\n"
|
||||||
. ' <table border="0" cellpadding="2" cellspacing="1">' . "\n"
|
. ' <th>' . $strDescription . '</th>' . "\n"
|
||||||
. ' <tr>' . "\n"
|
|
||||||
. ' <th>' . "\n"
|
|
||||||
. ' ' . $strCollation . "\n"
|
|
||||||
. ' </th>' . "\n"
|
|
||||||
. ' <th>' . "\n"
|
|
||||||
. ' ' . $strDescription . "\n"
|
|
||||||
. ' </th>' . "\n"
|
|
||||||
. '</tr>' . "\n";
|
. '</tr>' . "\n";
|
||||||
|
|
||||||
$i = 0;
|
$i = 0;
|
||||||
@@ -63,44 +61,39 @@ foreach ($mysql_charsets as $current_charset) {
|
|||||||
if ($i >= $table_row_count / 2) {
|
if ($i >= $table_row_count / 2) {
|
||||||
$i = 0;
|
$i = 0;
|
||||||
echo '</table>' . "\n"
|
echo '</table>' . "\n"
|
||||||
. ' </td>' . "\n"
|
. '<table class="data">' . "\n"
|
||||||
. ' <td valign="top">' . "\n"
|
. '<tr><th>' . $strCollation . '</th>' . "\n"
|
||||||
. ' <table border="0" cellpadding="2" cellspacing="1">' . "\n"
|
. ' <th>' . $strDescription . '</th>' . "\n"
|
||||||
. ' <tr>' . "\n"
|
|
||||||
. ' <th>' . "\n"
|
|
||||||
. ' ' . $strCollation . "\n"
|
|
||||||
. ' </th>' . "\n"
|
|
||||||
. ' <th>' . "\n"
|
|
||||||
. ' ' . $strDescription . "\n"
|
|
||||||
. ' </th>' . "\n"
|
|
||||||
. '</tr>' . "\n";
|
. '</tr>' . "\n";
|
||||||
}
|
}
|
||||||
$i++;
|
$i++;
|
||||||
echo ' <tr>' . "\n"
|
echo '<tr><th colspan="2" align="right">' . "\n"
|
||||||
. ' <th colspan="2" align="right">' . "\n"
|
. ' ' . htmlspecialchars($current_charset) . "\n"
|
||||||
. ' <b>' . htmlspecialchars($current_charset) . '</b>' . "\n"
|
. (empty($mysql_charsets_descriptions[$current_charset])
|
||||||
. (empty($mysql_charsets_descriptions[$current_charset]) ? '' : ' (<i>' . htmlspecialchars($mysql_charsets_descriptions[$current_charset]) . '</i>) ' . "\n")
|
? ''
|
||||||
|
: ' (<i>' . htmlspecialchars(
|
||||||
|
$mysql_charsets_descriptions[$current_charset]) . '</i>)' . "\n")
|
||||||
. ' </th>' . "\n"
|
. ' </th>' . "\n"
|
||||||
. '</tr>' . "\n";
|
. '</tr>' . "\n";
|
||||||
$useBgcolorOne = TRUE;
|
$odd_row = true;
|
||||||
foreach ($mysql_collations[$current_charset] as $current_collation) {
|
foreach ($mysql_collations[$current_charset] as $current_collation) {
|
||||||
$i++;
|
$i++;
|
||||||
echo ' <tr' . ($mysql_collations_available[$current_collation] ? '' : ' class="disabled"') . '>' . "\n"
|
echo '<tr class="'
|
||||||
. ' <td bgcolor="' . ($mysql_default_collations[$current_charset] == $current_collation ? $cfg['BrowseMarkerColor'] : ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo'])) . '">' . "\n"
|
. ( $odd_row ? 'odd' : 'even' )
|
||||||
. ' ' . htmlspecialchars($current_collation) . ' ' . "\n"
|
. ($mysql_default_collations[$current_charset] == $current_collation
|
||||||
. ' </td>' . "\n"
|
? ' marked'
|
||||||
. ' <td bgcolor="' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '">' . "\n"
|
: '')
|
||||||
. ' ' . PMA_getCollationDescr($current_collation) . ' ' . "\n"
|
. ($mysql_collations_available[$current_collation] ? '' : ' disabled')
|
||||||
. ' </td>' . "\n"
|
. '">' . "\n"
|
||||||
|
. ' <td>' . htmlspecialchars($current_collation) . '</td>' . "\n"
|
||||||
|
. ' <td>' . PMA_getCollationDescr($current_collation) . '</td>' . "\n"
|
||||||
. '</tr>' . "\n";
|
. '</tr>' . "\n";
|
||||||
$useBgcolorOne = !$useBgcolorOne;
|
$odd_row = !$odd_row;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
unset($table_row_count);
|
unset($table_row_count);
|
||||||
echo '</table>' . "\n"
|
echo '</table>' . "\n"
|
||||||
. ' </td>' . "\n"
|
. '</div>' . "\n";
|
||||||
. ' </tr>' . "\n"
|
|
||||||
. '</table>' . "\n";
|
|
||||||
|
|
||||||
require_once('./libraries/footer.inc.php');
|
require_once('./libraries/footer.inc.php');
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user