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

redesign phase 4

Browse Source
This commit is contained in:
Marc Delisle
2004-06-18 20:02:27 +00:00
parent b4e74d987a
commit 919bfd6646
8 changed files with 123 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -5,6 +5,13 @@ phpMyAdmin - Changelog
$Id$
$Source$
2004-06-18 Marc Delisle <lem9@users.sourceforge.net>
* themes/original/img/item*.png, themes/original/css/theme_right.css.php,
libraries/common.lib.php, libraries/display_export.lib.php,
db_details_structure.php, tbl_select.php:
fix IE font size problem, redesign search and export pages,
thanks to Michael Keck (mkkeck)
2004-06-17 Alexander M. Turek <me@derrabus.de>
* libraries/dbi/mysql.dbi.php: Removed debug code.
* libraries/dbi/mysqli.dbi.php: If connecting fails, we don't know the

5
db_details_structure.php
View File

@@ -750,7 +750,7 @@ if (PMA_MYSQL_INT_VERSION >= 40101) {
. PMA_generate_common_hidden_inputs($db, $table, 3)
. PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_COLLATION, 'db_collation', 'select_db_collation', $db_collation, FALSE, 3)
. ' </td><td align="right">'
. ' <input type="submit" name="submitcollation" value="' . $strGo . '" style="vertical-align: middle" />&nbsp;' . "\n"
. ' <input type="submit" name="submitcollation" value="' . $strGo . '" style="vertical-align: middle" />' . "\n"
. ' </td></tr>' . "\n"
. ' </form>' . "\n"
. ' ' . "\n\n";
@@ -758,7 +758,8 @@ if (PMA_MYSQL_INT_VERSION >= 40101) {
if ($num_tables > 0
&& !$cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == FALSE) {
echo '<tr><th colspan="3" class="tblHeadError"><div class="errorhead">' . $strError . '</div></th></tr>'
echo '<tr><td colspan="3"><img src="images/spacer.gif" width="1" height="1" border="0" alt="" /></td></tr>'
. '<tr><th colspan="3" class="tblHeadError"><div class="errorhead">' . $strError . '</div></th></tr>'
. '<tr><td colspan="3" class="tblError">'
. sprintf(wordwrap($strRelationNotWorking,65,'<br />'), '<a href="' . $cfg['PmaAbsoluteUri'] . 'chk_rel.php?' . $url_query . '">', '</a>')
. '</td></tr>';

8
libraries/common.lib.php
View File

@@ -312,7 +312,7 @@ if (!isset($_COOKIE['pma_theme']) || empty($_COOKIE['pma_theme'])){
include($tmp_color_file);
}
} else {
$pmaThemeImage = './images/';
$pmaThemeImage = './' . $cfg['ThemePath'] . '/original/img/';
}
} else {
$GLOBALS['theme'] = $_COOKIE['pma_theme'];
@@ -323,7 +323,7 @@ if (!isset($_COOKIE['pma_theme']) || empty($_COOKIE['pma_theme'])){
}
}
if (!is_dir($pmaThemeImage)) {
$pmaThemeImage = './images/';
$pmaThemeImage = './' . $cfg['ThemePath'] . '/original/img/';
}
// end theme manager
@@ -811,9 +811,9 @@ function PMA_setFontSizes()
{
global $font_size, $font_biggest, $font_bigger, $font_smaller, $font_smallest;
// IE (<6)/Opera (<7) for win case: needs smaller fonts than anyone else
// IE (<7)/Opera (<7) for win case: needs smaller fonts than anyone else
if (PMA_USR_OS == 'Win'
&& ((PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER < 6)
&& ((PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER < 7)
|| (PMA_USR_BROWSER_AGENT == 'OPERA' && PMA_USR_BROWSER_VER < 7))) {
$font_size = 'x-small';
$font_biggest = 'large';

4
libraries/display_export.lib.php
View File

@@ -541,8 +541,10 @@ if (!$hide_structure) { ?>
if (isset($table) && !empty($table) && !isset($num_tables)) {
?>
<tr>
<td colspan="3" bgcolor="<?php echo $cfg['BgcolorOne']; ?>" align="center">
<td colspan="3" align="center">
<div style="background-color: <?php echo $cfg['BgcolorOne']; ?>; padding: 3px; margin: 1px;">
<b><?php echo sprintf($strDumpXRows , '<input type="text" name="limit_to" size="5" value="' . (isset($unlim_num_rows)?$unlim_num_rows: PMA_countRecords($db, $table, TRUE)) . '" class="textfield" style="vertical-align: middle" onfocus="this.select()" style="vertical-align: middle; text-align: center;" />' , '<input type="text" name="limit_from" value="0" size="5" class="textfield" style="vertical-align: middle" onfocus="this.select()" style="vertical-align: middle; text-align: center;" />') . "\n"; ?></b>
</div>
</td>
</tr>
<?php

144
tbl_select.php
View File

@@ -122,29 +122,105 @@ function PMA_tbl_select_operator(f, index, multiple) {
<?php echo PMA_generate_common_hidden_inputs($db, $table); ?>
<input type="hidden" name="goto" value="<?php echo $goto; ?>" />
<input type="hidden" name="back" value="tbl_select.php" />
<p style="margin-left: 30px;">
<?php echo $strSelectFields; ?><br />
<select name="param[]" size="<?php echo min($fields_cnt, 10); ?>" multiple="multiple">
<table border="0" cellpadding="0" cellspacing="0">
<tr>
<td valign="top">
<table border="0" cellpadding="3" cellspacing="0">
<tr>
<th align="left" colspan="2">
<?php echo $strSelectFields; ?>
</th>
</tr>
<tr>
<td bgcolor="<?php echo $cfg['BgcolorOne']; ?>">
<select name="param[]" size="<?php echo min($fields_cnt, 10); ?>" multiple="multiple" align="left">
<?php
echo "\n";
// Displays the list of the fields
for ($i = 0 ; $i < $fields_cnt; $i++) {
echo ' <option value="' . htmlspecialchars($fields_list[$i]) . '" selected="selected">' . htmlspecialchars($fields_list[$i]) . '</option>' . "\n";
echo ' '
. '<option value="' . htmlspecialchars($fields_list[$i]) . '" selected="selected">' . htmlspecialchars($fields_list[$i]) . '</option>' . "\n";
}
?>
</select><br />
<input type="checkbox" name="distinct" value="DISTINCT" id="oDistinct" /> <label for="oDistinct">DISTINCT</label></p>
<ul>
<li>
<?php echo $strLimitNumRows . "\n"; ?>
<input type="text" size="4" name="session_max_rows" value="<?php echo $cfg['MaxRows']; ?>" class="textfield" />
</li>
<li>
<?php echo $strAddSearchConditions; ?><br />
<input type="text" name="where" class="textfield" />&nbsp;
<?php echo PMA_showMySQLDocu('Reference', 'Functions') . "\n"; ?>
<br /><br />
<?php echo '<i>' . $strOr . '</i> ' . $strDoAQuery; ?><br />
</select>
</td>
<td valign="bottom" bgcolor="<?php echo $cfg['BgcolorOne']; ?>">
<input type="checkbox" name="distinct" value="DISTINCT" id="oDistinct" /> <label for="oDistinct">DISTINCT</label>
</td>
</tr>
</table>
</td>
<td nowrap="nowrap" width="50">&nbsp;</td>
<td valign="top">
<table border="0" cellpadding="3" cellspacing="0">
<tr>
<th align="left">
<?php echo $strLimitNumRows . "\n"; ?>:
</th>
</tr>
<tr>
<td bgcolor="<?php echo $cfg['BgcolorOne']; ?>">
<input type="text" size="4" name="session_max_rows" value="<?php echo $cfg['MaxRows']; ?>" class="textfield" />
</td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
<tr>
<th align="left">
<?php echo $strDisplayOrder; ?>
</th>
</tr>
<tr>
<td bgcolor="<?php echo $cfg['BgcolorOne']; ?>">
<select name="orderField" style="vertical-align: middle">
<option value="--nil--"></option>
<?php
echo "\n";
for ($i = 0; $i < $fields_cnt; $i++) {
echo ' ';
echo '<option value="' . htmlspecialchars($fields_list[$i]) . '">' . htmlspecialchars($fields_list[$i]) . '</option>' . "\n";
} // end for
?>
</select><br />
<input type="radio" name="order" value="ASC" checked="checked" id="sortASC" />
<label for="sortASC"><?php echo $strAscending; ?></label><br />
<input type="radio" name="order" value="DESC" id="sortDESC" />
<label for="sortDESC"><?php echo $strDescending; ?></label>
</td>
</tr>
</table>
</td>
</tr>
</table>
<table border="0" cellpadding="3" cellspacing="0">
<tr>
<td colspan="2">&nbsp;</td>
</tr>
<tr>
<th align="left" class="tblHeaders" colspan="2">
<?php echo $strAddSearchConditions; ?>
<?php echo PMA_showMySQLDocu('Reference', 'Functions') . "\n"; ?>
</th>
</tr>
<tr>
<td>
<input type="text" name="where" class="textfield" size="64" />
</td>
<td align="right">
<input type="submit" name="submit" value="<?php echo $strGo; ?>" />
</td>
</tr>
<tr>
<td colspan="2">&nbsp;</td>
</tr>
<tr>
<th align="left" class="tblHeaders" colspan="2">
<?php echo '<i>' . $strOr . '</i> ' . $strDoAQuery; ?>
</th>
</tr>
<tr>
<td colspan="2">
<table border="<?php echo $cfg['Border']; ?>" cellpadding="2" cellspacing="1">
<tr>
<th><?php echo $strField; ?></th>
@@ -159,7 +235,7 @@ function PMA_tbl_select_operator(f, index, multiple) {
$bgcolor = ($i % 2) ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo'];
?>
<tr>
<td bgcolor="<?php echo $bgcolor; ?>"><?php echo htmlspecialchars($fields_list[$i]); ?></td>
<td bgcolor="<?php echo $bgcolor; ?>"><b><?php echo htmlspecialchars($fields_list[$i]); ?></b></td>
<td bgcolor="<?php echo $bgcolor; ?>"><?php echo $fields_type[$i]; ?></td>
<?php echo PMA_MYSQL_INT_VERSION >= 40100 ? '<td bgcolor="' . $bgcolor . '">' . $fields_collation[$i] . '</td>' . "\n" : ''; ?>
<td bgcolor="<?php echo $bgcolor; ?>">
@@ -245,29 +321,15 @@ function PMA_tbl_select_operator(f, index, multiple) {
echo "\n";
?>
</table>
</li>
<li>
<?php echo $strDisplayOrder; ?><br />
<select name="orderField" style="vertical-align: middle">
<option value="--nil--"></option>
<?php
echo "\n";
for ($i = 0; $i < $fields_cnt; $i++) {
echo ' ';
echo '<option value="' . htmlspecialchars($fields_list[$i]) . '">' . htmlspecialchars($fields_list[$i]) . '</option>' . "\n";
} // end for
?>
</select>
<input type="radio" name="order" value="ASC" checked="checked" />
<?php echo $strAscending; ?>&nbsp;
<input type="radio" name="order" value="DESC" />
<?php echo $strDescending; ?>
</li>
</ul>
&nbsp;&nbsp;&nbsp;&nbsp;
<input type="hidden" name="max_number_of_fields" value="<?php echo $fields_cnt; ?>" />
<input type="submit" name="submit" value="<?php echo $strGo; ?>" />
</td>
</tr>
<tr>
<td nowrap="nowrap" colspan="2" align="right">
<input type="hidden" name="max_number_of_fields" value="<?php echo $fields_cnt; ?>" />
<input type="submit" name="submit" value="<?php echo $strGo; ?>" />
</td>
</tr>
</table>
</form>
<?php
require_once('./footer.inc.php');

6
themes/original/css/theme_right.css.php
View File

@@ -6,7 +6,7 @@ body {
<?php
if ($GLOBALS['cfg']['RightBgImage'] == '') {
// calls from a css file are relative to itself, so use ../images
echo ' background-image: url(../images/vertical_line.png);' . "\n"
echo ' background-image: url(../themes/original/img/vertical_line.png);' . "\n"
. ' background-repeat: repeat-y;' . "\n";
} else {
echo ' background-image: url(' . $GLOBALS['cfg']['RightBgImage'] . ');' . "\n";
@@ -191,7 +191,7 @@ div.errorhead {
color: #ffffff;
text-align: left;
<?php if ($cfg['ErrorIconic'] && isset($js_isDOM) && $js_isDOM != '0') { ?>
background-image: url(../images/s_error.png);
background-image: url(../themes/original/img/s_error.png);
background-repeat: no-repeat;
background-position: 5px 50%;
padding: 0px 0px 0px 25px;
@@ -264,7 +264,7 @@ div.tblWarn {
margin: 0px 1px 0px 2px;
}
.serverinfo div{
background-image: url(../images/item_ltr.png);
background-image: url(../themes/original/img/item_ltr.png);
background-repeat: no-repeat;
background-position: 50% 50%;
width: 20px;

BIN
themes/original/img/item_ltr.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 189 B

After

Width:  |  Height:  |  Size: 136 B

BIN
themes/original/img/item_rtl.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 187 B

After

Width:  |  Height:  |  Size: 136 B