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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Michal Čihař 2012-03-12 09:13:26 +01:00
commit 20fedfa139
8 changed files with 985 additions and 867 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
db_operations.php
View File

@ -23,6 +23,18 @@ require_once './libraries/mysql_charsets.lib.php';
$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.16.custom.js';
$GLOBALS['js_include'][] = 'db_operations.js';
/**
* Sets globals from $_REQUEST (we're using GET on ajax, POST otherwise)
*/
$request_params = array(
'drop_if_exists'
);
foreach ($request_params as $one_request_param) {
if (isset($_REQUEST[$one_request_param])) {
$GLOBALS[$one_request_param] = $_REQUEST[$one_request_param];
}
}
/**
* Rename/move or copy database
*/

13
import_status.php
View File

@ -8,6 +8,19 @@
require_once './libraries/common.inc.php';
require_once './libraries/display_import_ajax.lib.php';
/**
* Sets globals from $_GET
*/
$get_params = array(
'message',
'id'
);
foreach ($get_params as $one_get_param) {
if (isset($_GET[$one_get_param])) {
$GLOBALS[$one_get_param] = $_GET[$one_get_param];
}
}
// AJAX requests can't be cached!
PMA_no_cache_header();

4
libraries/schema/Pdf_Relation_Schema.class.php
View File

@ -1130,7 +1130,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
{
global $db, $pdf, $orientation, $paper;
// TOC
$pdf->addpage($GLOBALS['orientation']);
$pdf->addpage($_POST['orientation']);
$pdf->Cell(0, 9, __('Table of contents'), 1, 0, 'C');
$pdf->Ln(15);
$i = 1;
@ -1175,7 +1175,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema
foreach ($alltables as $table) {
$z++;
$pdf->SetAutoPageBreak(true, 15);
$pdf->addpage($GLOBALS['orientation']);
$pdf->addpage($_POST['orientation']);
$pdf->Bookmark($table);
$pdf->SetAlias('{' . sprintf("%02d", $z) . '}', $pdf->PageNo());
$pdf->PMA_links['RT'][$table]['-'] = $pdf->AddLink();

122
themes/pmahomme/css/theme_left.css.php
View File

@ -24,13 +24,13 @@ input, select, textarea {
body {
<?php if (! empty($GLOBALS['cfg']['FontFamily'])) { ?>
font-family: <?php echo $GLOBALS['cfg']['FontFamily']; ?>;
font-family: <?php echo $GLOBALS['cfg']['FontFamily']; ?>;
<?php } ?>
background: url(./themes/pmahomme/img/left_nav_bg.png) repeat-y right 0% #f3f3f3;
border-right: 1px solid #aaa;
color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
margin: 0;
padding: 0;
background: url(./themes/pmahomme/img/left_nav_bg.png) repeat-y right 0% #f3f3f3;
border-right: 1px solid #aaa;
color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
margin: 0;
padding: 0;
}
a img {
@ -40,37 +40,37 @@ a img {
a:link,
a:visited,
a:active {
text-decoration: none;
color: #0000FF;
text-decoration: none;
color: #0000FF;
}
ul {
margin:0;
margin: 0;
}
form {
margin: 0;
padding: 0;
display: inline;
margin: 0;
padding: 0;
display: inline;
}
select#select_server,
select#lightm_db {
width: 100%;
width: 100%;
}
/* buttons in some browsers (eg. Konqueror) are block elements,
this breaks design */
button {
display: inline;
display: inline;
}
/******************************************************************************/
/* classes */
.navi_dbName {
font-weight: bold;
color: <?php echo $GLOBALS['cfg']['NaviDatabaseNameColor']; ?>;
font-weight: bold;
color: <?php echo $GLOBALS['cfg']['NaviDatabaseNameColor']; ?>;
}
/******************************************************************************/
@ -92,14 +92,14 @@ div#recentTableList select {
div#pmalogo,
div#leftframelinks,
div#databaseList {
text-align: center;
margin: 5px 10px 0px 10px;
text-align: center;
margin: 5px 10px 0px 10px;
}
ul#databaseList {
margin: 0.8em 0px;
padding-bottom: 0.5em;
padding-<?php echo $left; ?>: 0.3em;
margin: .8em 0px;
padding-bottom: .5em;
padding-<?php echo $left; ?>: .3em;
font-style: italic;
}
@ -117,14 +117,14 @@ ul#databaseList a {
}
div#navidbpageselector {
margin: 0.1em;
margin: .1em;
text-align: center;
}
div#navidbpageselector a,
div#navidbpageselector select{
color: #333;
margin: 0.2em;
margin: .2em;
}
ul#databaseList ul {
@ -149,15 +149,15 @@ ul#databaseList li.selected a {
}
div#leftframelinks .icon {
padding: 0;
margin: 0;
padding: 0;
margin: 0;
}
div#reloadlink a img,
div#leftframelinks a img.icon {
margin: 0.3em;
margin-top: 0.7em;
border: 0;
margin: .3em;
margin-top: .7em;
border: 0;
}
div#leftframelinks a:hover img {
@ -180,31 +180,31 @@ div#leftframelinks a:hover img {
div#left_tableList {margin:10px 10px 0 10px;}
div#left_tableList ul {
list-style-type: none;
list-style-type: none;
list-style-position: outside;
margin: 0;
padding: 0;
margin: 0;
padding: 0;
}
div#left_tableList ul ul {
font-size: 100%;
font-size: 100%;
}
div#left_tableList a {
color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
text-decoration: none;
color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
text-decoration: none;
}
div#left_tableList a:hover {
background: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
text-decoration: underline;
background: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
text-decoration: underline;
}
div#left_tableList li {
margin: 0;
padding: 2px 0;
white-space: nowrap;
margin: 0;
padding: 2px 0;
white-space: nowrap;
}
#newtable {
@ -234,12 +234,12 @@ div#left_tableList li {
}
select{
-moz-border-radius:2px 2px 2px 2px;
-moz-box-shadow:0 1px 2px #DDDDDD;
border:1px solid #aaa;
color:#333333;
padding:3px;
background:url(./themes/pmahomme/img/input_bg.gif);
-moz-border-radius: 2px 2px 2px 2px;
-moz-box-shadow: 0 1px 2px #DDDDDD;
border: 1px solid #aaa;
color: #333;
padding: 3px;
background: url(themes/pmahomme/img/input_bg.gif);
}
<?php if ($GLOBALS['cfg']['BrowseMarkerColor']) { ?>
@ -254,32 +254,32 @@ div#left_tableList > ul li.marked {
<?php if ($GLOBALS['cfg']['LeftPointerEnable']) { ?>
div#left_tableList > ul li:hover > a,
div#left_tableList > ul li:hover {
background: #e4e4e4;
color: <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>;
background: #e4e4e4;
color: <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>;
}
<?php } ?>
div#left_tableList img {
padding: 0;
vertical-align: middle;
padding: 0;
vertical-align: middle;
}
div#left_tableList ul ul {
margin-<?php echo $left; ?>: 0;
padding-<?php echo $left; ?>: 0.1em;
border-<?php echo $left; ?>: 0.1em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
padding-bottom: 0.1em;
border-bottom: 0.1em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
margin-<?php echo $left; ?>: 0;
padding-<?php echo $left; ?>: .1em;
border-<?php echo $left; ?>: .1em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
padding-bottom: .1em;
border-bottom: .1em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
}
/* for the servers list in navi panel */
#serverinfo .item {
white-space: nowrap;
color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
white-space: nowrap;
color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
}
#serverinfo a:hover {
background: <?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>;
color: <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>;
background: <?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>;
color: <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>;
}
#reloadlink {
clear: both;
@ -304,9 +304,9 @@ div#left_tableList ul ul {
#fast_filter {
width: 85%;
padding: 0.1em;
padding: .1em;
}
#fast_filter.gray {
color: gray;
}
}

18
themes/pmahomme/css/theme_print.css.php
View File

@ -9,8 +9,8 @@
?>
/* For printview */
body, table, th, td {
color: #000000;
background-color: #ffffff;
color: #000;
background-color: #fff;
}
img {
@ -18,23 +18,21 @@ img {
}
table, th, td {
border-width: 0.1em;
border-color: #000000;
border-style: solid;
border: .1em solid #000;
}
table {
border-collapse: collapse;
border-spacing: 0;
border-collapse: collapse;
border-spacing: 0;
}
th, td {
padding: 0.2em;
padding: .2em;
}
th {
font-weight: bold;
background-color: #e5e5e5;
font-weight: bold;
background-color: #e5e5e5;
}
.hide {

1639
themes/pmahomme/css/theme_right.css.php
View File

File diff suppressed because it is too large Load Diff

32
themes/pmahomme/layout.inc.php
View File

@ -15,38 +15,38 @@
$GLOBALS['cfg']['NaviWidth'] = 200;
// foreground (text) color for the navi frame
$GLOBALS['cfg']['NaviColor'] = '#000000';
$GLOBALS['cfg']['NaviColor'] = '#000';
// background for the navi frame
$GLOBALS['cfg']['NaviBackground'] = '#D0DCE0';
// foreground (text) color of the pointer in navi frame
$GLOBALS['cfg']['NaviPointerColor'] = '#000000';
$GLOBALS['cfg']['NaviPointerColor'] = '#000';
// background of the pointer in navi frame
$GLOBALS['cfg']['NaviPointerBackground'] = '#9999CC';
$GLOBALS['cfg']['NaviPointerBackground'] = '#99c';
// text color of the selected database name (when showing the table list)
$GLOBALS['cfg']['NaviDatabaseNameColor'] = '#0000FF';
$GLOBALS['cfg']['NaviDatabaseNameColor'] = '#00f';
/**
* main frame
*/
// foreground (text) color for the main frame
$GLOBALS['cfg']['MainColor'] = '#000000';
$GLOBALS['cfg']['MainColor'] = '#000';
// background for the main frame
$GLOBALS['cfg']['MainBackground'] = '#F5F5F5';
// foreground (text) color of the pointer in browse mode
$GLOBALS['cfg']['BrowsePointerColor'] = '#000000';
$GLOBALS['cfg']['BrowsePointerColor'] = '#000';
// background of the pointer in browse mode
$GLOBALS['cfg']['BrowsePointerBackground'] = '#CCFFCC';
$GLOBALS['cfg']['BrowsePointerBackground'] = '#cfc';
// foreground (text) color of the marker (visually marks row by clicking on it) in browse mode
$GLOBALS['cfg']['BrowseMarkerColor'] = '#000000';
$GLOBALS['cfg']['BrowseMarkerColor'] = '#000';
// background of the marker (visually marks row by clicking on it) in browse mode
$GLOBALS['cfg']['BrowseMarkerBackground'] = '#FFCC99';
$GLOBALS['cfg']['BrowseMarkerBackground'] = '#fc9';
/**
* fonts
@ -70,7 +70,7 @@ $GLOBALS['cfg']['Border'] = 0;
// table header and footer color
$GLOBALS['cfg']['ThBackground'] = '#D3DCE3';
// table header and footer background
$GLOBALS['cfg']['ThColor'] = '#000000';
$GLOBALS['cfg']['ThColor'] = '#000';
// table data row background
$GLOBALS['cfg']['BgOne'] = '#E5E5E5';
// table data row background, alternate
@ -99,10 +99,10 @@ $GLOBALS['cfg']['SQP']['fmtColor'] = array(
'digit_float' => 'aqua',
'punct' => 'fuchsia',
'alpha' => '',
'alpha_columnType' => '#FF9900',
'alpha_columnAttrib' => '#0000FF',
'alpha_reservedWord' => '#990099',
'alpha_functionName' => '#FF0000',
'alpha_columnType' => '#f90',
'alpha_columnAttrib' => '#00f',
'alpha_reservedWord' => '#909',
'alpha_functionName' => '#f00',
'alpha_identifier' => 'black',
'alpha_charset' => '#6495ed',
'alpha_variable' => '#800000',
@ -119,10 +119,10 @@ $GLOBALS['cfg']['SQP']['fmtColor'] = array(
$GLOBALS['cfg']['chartColor'] = array(
'gradientIntensity' => 50,
// The style of the chart title.
'titleColor' => '#000000',
'titleColor' => '#000',
'titleBgColor' => '#E5E5E5',
// Chart border (0 for no border)
'border' => '#CCCCCC',
'border' => '#ccc',
// Chart background color.
'bgColor' => '#FBFBFB',
// when graph area gradient is used, this is the color of the graph

12
themes/sprites.css.php
View File

@ -15,12 +15,12 @@ $bg = $_SESSION['PMA_Theme']->getImgPath() . 'sprites.png';
?>
/* Icon sprites */
.icon, .footnotemarker {
margin: 0 0.3em;
padding: 0 !important;
width: 16px;
height: 16px;
background-image: url('<?php echo $bg; ?>') !important;
background-repeat: no-repeat !important;
margin: 0 .3em;
padding: 0 !important;
width: 16px;
height: 16px;
background-image: url('<?php echo $bg; ?>') !important;
background-repeat: no-repeat !important;
background-position: top left !important;
}