nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing HTML markup

Browse Source
This commit is contained in:
lorilee
2010-07-28 15:00:36 -07:00
parent 566c7cc9c8
commit 1faaa80b51
6 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/functions.js
View File

@@ -1867,7 +1867,9 @@ $(document).ready(function() {
var left_offset = cell_right_edge_offset - $(".structure_actions_dropdown").innerWidth(); var left_offset = cell_right_edge_offset - $(".structure_actions_dropdown").innerWidth();
$.each($(".structure_actions_dropdown"), function() { $.each($(".structure_actions_dropdown"), function() {
$(this).offset({ left: left_offset }); // The top offset must be set for IE even if it didn't change
var top_offset = $(this).parent().offset().top + $(this).parent().innerHeight();
$(this).offset({ top: top_offset, left: left_offset });
}); });
// When "more" is hovered over, show the hidden actions // When "more" is hovered over, show the hidden actions

2
libraries/common.lib.php
View File

@@ -491,7 +491,7 @@ function PMA_showHint($message, $bbcode = false, $type = 'notice')
// footnotemarker used in js/tooltip.js // footnotemarker used in js/tooltip.js
return '<sup class="footnotemarker" id="footnote_sup_' . $nr . '_' . $instance . '">' . $nr . '</sup>' . return '<sup class="footnotemarker" id="footnote_sup_' . $nr . '_' . $instance . '">' . $nr . '</sup>' .
'<img class="footnotemarker" id="footnote_sup_' . $nr . '_' . $instance . '" src="' . '<img class="footnotemarker" id="footnote_sup_' . $nr . '_' . $instance . '" src="' .
$GLOBALS['pmaThemeImage'] . 'b_help.png" />'; $GLOBALS['pmaThemeImage'] . 'b_help.png" alt="tooltip" />';
} }
/** /**

2
libraries/display_export.lib.php
View File

@@ -62,7 +62,7 @@ if (! empty($sql_query)) {
<div class="exportoptions" id="header"> <div class="exportoptions" id="header">
<h2> <h2>
<img src="<?php echo $GLOBALS['pmaThemeImage'];?>b_export.png" /> <img src="<?php echo $GLOBALS['pmaThemeImage'];?>b_export.png" alt="export" />
<?php <?php
if($export_type == 'server') { if($export_type == 'server') {
echo __('Exporting databases in the current server'); echo __('Exporting databases in the current server');

2
libraries/display_import.lib.php
View File

@@ -123,7 +123,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") {
<div class="exportoptions" id="header"> <div class="exportoptions" id="header">
<h2> <h2>
<img src="<?php echo $GLOBALS['pmaThemeImage'];?>b_import.png" /> <img src="<?php echo $GLOBALS['pmaThemeImage'];?>b_import.png" alt="import" />
<?php <?php
if($import_type == 'server') { if($import_type == 'server') {
echo __('Importing into the current server'); echo __('Importing into the current server');

2
main.php
View File

@@ -130,7 +130,7 @@ if ($GLOBALS['cfg']['ThemeManager']) {
// see js/main_custom_color.js // see js/main_custom_color.js
echo '<li id="li_custom_color" class="hide">'; echo '<li id="li_custom_color" class="hide">';
echo PMA_escapeJsString(__('Background color')) . ': '; echo PMA_escapeJsString(__('Background color')) . ': ';
echo '<input type="submit" name="custom_color_choose" value="' . __('Choose...') . '"'; echo '<input type="submit" name="custom_color_choose" value="' . __('Choose...') . '" />';
echo '<form name="colorform" id="colorform" method="post" action="index.php" target="_parent">'; echo '<form name="colorform" id="colorform" method="post" action="index.php" target="_parent">';
echo PMA_generate_common_hidden_inputs(); echo PMA_generate_common_hidden_inputs();
echo '<input type="hidden" id="custom_color" name="custom_color" value="" />'; echo '<input type="hidden" id="custom_color" name="custom_color" value="" />';

42
tbl_structure.php
View File

@@ -160,15 +160,15 @@ $titles['BrowseDistinctValues'] = PMA_getIcon('b_browse.png', __('Browse distinc
// hidden action titles (image and string) // hidden action titles (image and string)
$hidden_titles = array(); $hidden_titles = array();
$hidden_titles['BrowseDistinctValues'] = PMA_getIcon('b_browse.png', __('Browse distinct values'), true, true); $hidden_titles['BrowseDistinctValues'] = PMA_getIcon('b_browse.png', __('Browse distinct values'), false, true);
$hidden_titles['Primary'] = PMA_getIcon('b_primary.png', __('Primary'), true, true); $hidden_titles['Primary'] = PMA_getIcon('b_primary.png', __('Primary'), false, true);
$hidden_titles['NoPrimary'] = PMA_getIcon('bd_primary.png', __('Primary'), true, true); $hidden_titles['NoPrimary'] = PMA_getIcon('bd_primary.png', __('Primary'), false, true);
$hidden_titles['Index'] = PMA_getIcon('b_index.png', __('Index'), true, true); $hidden_titles['Index'] = PMA_getIcon('b_index.png', __('Index'), false, true);
$hidden_titles['NoIndex'] = PMA_getIcon('bd_index.png', __('Index'), true, true); $hidden_titles['NoIndex'] = PMA_getIcon('bd_index.png', __('Index'), false, true);
$hidden_titles['Unique'] = PMA_getIcon('b_unique.png', __('Unique'), true, true); $hidden_titles['Unique'] = PMA_getIcon('b_unique.png', __('Unique'), false, true);
$hidden_titles['NoUnique'] = PMA_getIcon('bd_unique.png', __('Unique'), true, true); $hidden_titles['NoUnique'] = PMA_getIcon('bd_unique.png', __('Unique'), false, true);
$hidden_titles['IdxFulltext'] = PMA_getIcon('b_ftext.png', __('Fulltext'), true, true); $hidden_titles['IdxFulltext'] = PMA_getIcon('b_ftext.png', __('Fulltext'), false, true);
$hidden_titles['NoIdxFulltext'] = PMA_getIcon('bd_ftext.png', __('Fulltext'), true, true); $hidden_titles['NoIdxFulltext'] = PMA_getIcon('bd_ftext.png', __('Fulltext'), false, true);
/** /**
* Displays the table structure ('show table' works correct since 3.23.03) * Displays the table structure ('show table' works correct since 3.23.03)
@@ -178,7 +178,16 @@ $hidden_titles['NoIdxFulltext'] = PMA_getIcon('bd_ftext.png', __('Fulltex
$i = 0; $i = 0;
?> ?>
<form method="post" action="tbl_structure.php" name="fieldsForm" id="fieldsForm"> <form method="post" action="tbl_structure.php" name="fieldsForm" id="fieldsForm">
<?php echo PMA_generate_common_hidden_inputs($db, $table); ?> <?php echo PMA_generate_common_hidden_inputs($db, $table);
echo '<input type="hidden" name="table_type" value=';
if($db_is_information_schema) {
echo '"information_schema" />';
} else if ($tbl_is_view) {
echo '"view" />';
} else {
echo '"table" />';
} ?>
<table id="tablestructure" class="data"> <table id="tablestructure" class="data">
<thead> <thead>
<tr> <tr>
@@ -202,14 +211,7 @@ $i = 0;
<?php <?php
unset($i); unset($i);
echo '<input type="hidden" name="table_type" value=';
if($db_is_information_schema) {
echo '"information_schema" />';
} else if ($tbl_is_view) {
echo '"view" />';
} else {
echo '"table" />';
}
// table body // table body
// prepare comments // prepare comments
@@ -465,8 +467,8 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
echo "\n"; echo "\n";
} // end if (! $tbl_is_view && ! $db_is_information_schema) } // end if (! $tbl_is_view && ! $db_is_information_schema)
?> ?>
<td class="more_opts" id="<?php echo $rownum; ?>"> <td class="more_opts" id="more_opts<?php echo $rownum; ?>">
More <img src="<?php echo $pmaThemeImage . 'more.png'; ?>"> More <img src="<?php echo $pmaThemeImage . 'more.png'; ?>" alt="show more actions" />
<div class="structure_actions_dropdown" id="row_<?php echo $rownum; ?>"> <div class="structure_actions_dropdown" id="row_<?php echo $rownum; ?>">
<div class="action_browse"> <div class="action_browse">