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-04-12 11:00:16 +02:00
commit 9996628f21
19 changed files with 24 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation.html
View File

@ -2302,12 +2302,6 @@ setfacl -d -m "g:www-data:rwx" tmp
<a href="#faq6_27">format string expansion</a>.
</dd>
<dt id="cfg_ErrorIconic">$cfg['ErrorIconic'] boolean</dt>
<dd>Uses icons for warnings, errors and informations.</dd>
<dt id="cfg_MainPageIconic">$cfg['MainPageIconic'] boolean</dt>
<dd>Uses icons on main page in lists and menu tabs.</dd>
<dt id="cfg_ReplaceHelpImg">$cfg['ReplaceHelpImg'] boolean</dt>
<dd>Shows a help button instead of the &quot;Documentation&quot; message.
</dd>

5
libraries/common.lib.php
View File

@ -1772,9 +1772,8 @@ function PMA_generate_html_tab($tab, $url_params = array(), $base_dir = '')
$tab['link'] .= $tab['fragment'];
}
// display icon, even if iconic is disabled but the link-text is missing
if (($GLOBALS['cfg']['MainPageIconic'] || empty($tab['text']))
&& isset($tab['icon'])
// display icon
if (isset($tab['icon'])
) {
// avoid generating an alt tag, because it only illustrates
// the text that follows and if browser does not display

14
libraries/config.default.php
View File

@ -2527,20 +2527,6 @@ $cfg['TitleServer'] = '@HTTP_HOST@ / @VSERVER@ | @PHPMYADMIN@';
*/
$cfg['TitleDefault'] = '@HTTP_HOST@ | @PHPMYADMIN@';
/**
* show some icons for warning, error and information messages (true|false)?
*
* @global boolean $cfg['ErrorIconic']
*/
$cfg['ErrorIconic'] = true;
/**
* show icons in list on main page and on menu tabs (true|false)?
*
* @global boolean $cfg['MainPageIconic']
*/
$cfg['MainPageIconic'] = true;
/**
* show help button instead of Documentation text (true|false)?
*

3
libraries/config/messages.inc.php
View File

@ -65,8 +65,6 @@ $strConfigEditInWindow_desc = __('Edit SQL queries in popup window');
$strConfigEditInWindow_name = __('Edit in window');
$strConfigError_Handler_display_name = __('Display errors');
$strConfigError_Handler_gather_name = __('Gather errors');
$strConfigErrorIconic_desc = __('Show icons for warning, error and information messages');
$strConfigErrorIconic_name = __('Iconic errors');
$strConfigExecTimeLimit_desc = __('Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no limit)');
$strConfigExecTimeLimit_name = __('Maximum execution time');
$strConfigExport_asfile_name = __('Save as file');
@ -305,7 +303,6 @@ $strConfigLoginCookieValidity_desc = __('Define how long (in seconds) a login co
$strConfigLoginCookieValidity_name = __('Login cookie validity');
$strConfigLongtextDoubleTextarea_desc = __('Double size of textarea for LONGTEXT columns');
$strConfigLongtextDoubleTextarea_name = __('Bigger textarea for LONGTEXT');
$strConfigMainPageIconic_name = __('Use icons on main page');
$strConfigMaxCharactersInDisplayedSQL_desc = __('Maximum number of characters used when a SQL query is displayed');
$strConfigMaxCharactersInDisplayedSQL_name = __('Maximum displayed SQL length');
$strConfigMaxDbList_cmt = __('Users cannot set a higher value');

2
libraries/config/setup.forms.php
View File

@ -128,7 +128,6 @@ $forms['Features']['Other_core_settings'] = array(
'VersionCheck',
'NaturalOrder',
'InitialSlidersState',
'ErrorIconic',
'ReplaceHelpImg',
'MaxDbList',
'MaxTableList',
@ -187,7 +186,6 @@ $forms['Left_frame']['Left_tables'] = array(
'ShowTooltip',
'ShowTooltipAliasTB');
$forms['Main_frame']['Startup'] = array(
'MainPageIconic',
'ShowCreateDb' => ':group',
'SuggestDBName',
':group:end',

2
libraries/config/user_preferences.forms.php
View File

@ -26,7 +26,6 @@ $forms['Features']['General'] = array(
'VersionCheck',
'NaturalOrder',
'InitialSlidersState',
'ErrorIconic',
'LoginCookieValidity',
'ReplaceHelpImg',
'Servers/1/only_db', // saves to Server/only_db
@ -97,7 +96,6 @@ $forms['Left_frame']['Left_tables'] = array(
'ShowTooltip',
'ShowTooltipAliasTB');
$forms['Main_frame']['Startup'] = array(
'MainPageIconic',
'ShowCreateDb' => ':group',
'SuggestDBName',
':group:end',

2
libraries/display_create_database.lib.php
View File

@ -39,7 +39,7 @@ if ($is_create_db_priv) {
<strong><?php echo __('Create database') . ':&nbsp;' . PMA_showMySQLDocu('SQL-Syntax', 'CREATE_DATABASE'); ?></strong><br />
<?php
echo '<span class="noPrivileges">'
. ($cfg['ErrorIconic'] ? PMA_getImage('s_error2.png', '', array('hspace' => 2, 'border' => 0, 'align' => 'middle')) : '')
. PMA_getImage('s_error2.png', '', array('hspace' => 2, 'border' => 0, 'align' => 'middle'))
. '' . __('No Privileges') .'</span>';
} // end create db form or message
?>

39
libraries/navigation_header.inc.php
View File

@ -55,57 +55,34 @@ if ($GLOBALS['cfg']['LeftDisplayLogo']) {
<?php
echo '<a href="main.php?' . $query_url . '"'
.' title="' . __('Home') . '">'
.($GLOBALS['cfg']['MainPageIconic']
? PMA_getImage('b_home.png', __('Home'))
: __('Home'))
. PMA_getImage('b_home.png', __('Home'))
.'</a>' . "\n";
// if we have chosen server
if ($server != 0) {
// Logout for advanced authentication
if ($GLOBALS['cfg']['Server']['auth_type'] != 'config') {
echo ($GLOBALS['cfg']['MainPageIconic'] ? '' : ' - ');
echo '<a href="index.php?' . $query_url . '&amp;old_usr='
.urlencode($PHP_AUTH_USER) . '" target="_parent"'
.' title="' . __('Log out') . '" >'
.($GLOBALS['cfg']['MainPageIconic']
? PMA_getImage('s_loggoff.png', __('Log out'))
: __('Log out'))
. PMA_getImage('s_loggoff.png', __('Log out'))
.'</a>' . "\n";
} // end if ($GLOBALS['cfg']['Server']['auth_type'] != 'config'
$anchor = 'querywindow.php?' . PMA_generate_common_url($db, $table);
if ($GLOBALS['cfg']['MainPageIconic']) {
$query_frame_link_text = PMA_getImage('b_selboard.png', __('Query window'));
} else {
echo '<br />' . "\n";
$query_frame_link_text = __('Query window');
}
echo '<a href="' . $anchor . '&amp;no_js=true"'
.' title="' . __('Query window') . '"';
echo ' onclick="if (window.parent.open_querywindow()) return false;"';
echo '>' . $query_frame_link_text . '</a>' . "\n";
echo '>' . PMA_getImage('b_selboard.png', __('Query window')) . '</a>' . "\n";
} // end if ($server != 0)
echo ' <a href="Documentation.html" target="documentation"'
.' title="' . __('phpMyAdmin documentation') . '" >';
if ($GLOBALS['cfg']['MainPageIconic']) {
echo PMA_getImage('b_docs.png', __('phpMyAdmin documentation'));
} else {
echo '<br />' . __('phpMyAdmin documentation');
}
echo PMA_getImage('b_docs.png', __('phpMyAdmin documentation'));
echo '</a>';
$documentation_link = PMA_showMySQLDocu('', '', true);
if ($GLOBALS['cfg']['MainPageIconic']) {
echo $documentation_link . "\n";
} else {
preg_match('/<a[^>]*>/', $documentation_link, $matches);
$link = $matches[0];
echo substr($link, 0, strlen($link) - 1) . ' title="' . __('Documentation') . '" >'
. '<br />' . __('Documentation') . '</a>';
}
echo PMA_showMySQLDocu('', '', true) . "\n";
$params = array('uniqid' => uniqid());
if (!empty($GLOBALS['db'])) {
@ -113,11 +90,7 @@ if ($GLOBALS['cfg']['LeftDisplayLogo']) {
}
echo '<a href="navigation.php?' . PMA_generate_common_url($params)
. '" title="' . __('Reload navigation frame') . '" target="frame_navigation">';
if ($GLOBALS['cfg']['MainPageIconic']) {
echo PMA_getImage('s_reload.png', __('Reload navigation frame'));
} else {
echo '<br />' . __('Reload navigation frame');
}
echo PMA_getImage('s_reload.png', __('Reload navigation frame'));
echo '</a>';
echo '</div>' . "\n";

2
libraries/user_preferences.lib.php
View File

@ -234,7 +234,7 @@ function PMA_userprefs_redirect(array $forms, array $old_settings, $file_name, $
array_diff_assoc($old_settings, $new_settings)
+ array_diff_assoc($new_settings, $old_settings)
);
$check_keys = array('NaturalOrder', 'MainPageIconic', 'DefaultTabDatabase',
$check_keys = array('NaturalOrder', 'DefaultTabDatabase',
'Server/hide_db', 'Server/only_db');
$check_keys = array_merge(
$check_keys, $forms['Left_frame']['Left_frame'],

2
server_binlog.php
View File

@ -73,7 +73,7 @@ if (empty($_REQUEST['dontlimitchars'])) {
* Displays the sub-page heading
*/
echo '<h2>' . "\n"
. ($GLOBALS['cfg']['MainPageIconic'] ? PMA_getImage('s_tbl.png') : '')
. PMA_getImage('s_tbl.png')
. ' ' . __('Binary log') . "\n"
. '</h2>' . "\n";

4
server_collations.php
View File

@ -26,9 +26,7 @@ require 'libraries/server_links.inc.php';
* Displays the sub-page heading
*/
echo '<h2>' . "\n"
. ' ' . ($GLOBALS['cfg']['MainPageIconic']
? PMA_getImage('s_asci.png')
: '')
. ' ' . PMA_getImage('s_asci.png')
. '' . __('Character Sets and Collations') . "\n"
. '</h2>' . "\n";

6
server_databases.php
View File

@ -94,7 +94,7 @@ if ((isset($_REQUEST['drop_selected_dbs']) || isset($_REQUEST['query_type']))
if ($mult_btn == __('Yes')) {
$number_of_databases = count($selected);
} else {
$number_of_databases = 0;
$number_of_databases = 0;
}
$message = PMA_Message::success(_ngettext('%1$d database has been dropped successfully.', '%1$d databases have been dropped successfully.', $number_of_databases));
$message->addParam($number_of_databases);
@ -113,9 +113,7 @@ require 'libraries/server_links.inc.php';
* Displays the sub-page heading
*/
echo '<h2>' . "\n"
. ($GLOBALS['cfg']['MainPageIconic']
? PMA_getImage('s_db.png')
: '')
. PMA_getImage('s_db.png')
. ($dbstats ? __('Databases statistics') : __('Databases')) . "\n"
.'</h2>' . "\n";

4
server_engines.php
View File

@ -33,7 +33,7 @@ if (empty($_REQUEST['engine'])
* Displays the sub-page heading
*/
echo '<h2>' . "\n"
. ($GLOBALS['cfg']['MainPageIconic'] ? PMA_getImage('b_engine.png') : '')
. PMA_getImage('b_engine.png')
. "\n" . __('Storage Engines') . "\n"
. '</h2>' . "\n";
@ -82,7 +82,7 @@ if (empty($_REQUEST['engine'])
$engine_plugin = PMA_StorageEngine::getEngine($_REQUEST['engine']);
echo '<h2>' . "\n"
. ($GLOBALS['cfg']['MainPageIconic'] ? PMA_getImage('b_engine.png') : '')
. PMA_getImage('b_engine.png')
. ' ' . htmlspecialchars($engine_plugin->getTitle()) . "\n"
. ' ' . PMA_showMySQLDocu('', $engine_plugin->getMysqlHelpPage()) . "\n"
. '</h2>' . "\n\n";

10
server_plugins.php
View File

@ -32,9 +32,7 @@ require 'libraries/server_links.inc.php';
* Displays the sub-page heading
*/
echo '<h2>' . "\n"
. ($GLOBALS['cfg']['MainPageIconic']
? '<img class="icon" src="' . $pmaThemeImage . 'b_engine.png"'
.' width="16" height="16" alt="" />' : '')
. PMA_getImage('b_engine.png')
. "\n" . __('Plugins') . "\n"
. '</h2>' . "\n";
@ -91,10 +89,8 @@ pma_theme_image = '<?php echo $GLOBALS['pmaThemeImage']; ?>';
<caption class="tblHeaders">
<a class="top" href="#serverinfo"><?php
echo __('Begin');
echo $GLOBALS['cfg']['MainPageIconic']
? '<img src="' . $GLOBALS['pmaThemeImage'] .
's_asc.png" width="11" height="9" align="middle" alt="" />'
: ''; ?></a>
echo PMA_getImage('s_asc.png');
?></a>
<?php echo htmlspecialchars($plugin_type); ?>
</caption>
<thead>

4
server_status.php
View File

@ -786,9 +786,7 @@ require 'libraries/server_links.inc.php';
/**
* Displays the sub-page heading
*/
if ($GLOBALS['cfg']['MainPageIconic']) {
echo PMA_getImage('s_status.png');
}
echo PMA_getImage('s_status.png');
echo __('Runtime Information');

6
server_synchronize.php
View File

@ -1222,11 +1222,7 @@ if (! isset($_REQUEST['submit_connect'])
/**
* Displays the sub-page heading
*/
echo '<h2>' . ($GLOBALS['cfg']['MainPageIconic']
? PMA_getImage('s_sync.png')
: '')
. __('Synchronize')
.'</h2>';
echo '<h2>' . PMA_getImage('s_sync.png') . __('Synchronize') .'</h2>';
echo '<div id="serverstatus">
<form name="connection_form" id="connection_form" method="post" action="server_synchronize.php"

3
server_variables.php
View File

@ -87,8 +87,7 @@ require 'libraries/server_links.inc.php';
/**
* Displays the sub-page heading
*/
echo '<h2>' . "\n"
. ($cfg['MainPageIconic'] ? PMA_getImage('s_vars.png') : '')
echo '<h2>' . PMA_getImage('s_vars.png')
. '' . __('Server variables and settings') . "\n"
. PMA_showMySQLDocu('server_system_variables', 'server_system_variables')
. '</h2>' . "\n";

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

@ -460,7 +460,6 @@ div.error,
div.footnotes {
margin: 0.3em 0 0 0;
border: 2px solid;
<?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
background-repeat: no-repeat;
<?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
background-position: 10px 50%;
@ -469,9 +468,6 @@ div.footnotes {
background-position: 99% 50%;
padding: 0.1em 46px 0.1em 0.1em;
<?php } ?>
<?php } else { ?>
padding: 0.3em;
<?php } ?>
}
.success {
@ -481,7 +477,6 @@ div.footnotes {
h1.success,
div.success {
border-color: #00FF00;
<?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_success.png);
background-repeat: no-repeat;
<?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
@ -491,7 +486,6 @@ div.success {
background-position: 99% 50%;
padding: 0.2em 35px 0.2em 0.2em;
<?php } ?>
<?php } ?>
}
.success h1 {
border-color: #00FF00;
@ -505,7 +499,6 @@ h1.notice,
div.notice,
div.footnotes {
border-color: #FFD700;
<?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_notice.png);
background-repeat: no-repeat;
<?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
@ -515,7 +508,6 @@ div.footnotes {
background-position: 99% 50%;
padding: 0.2em 35px 0.2em 0.2em;
<?php } ?>
<?php } ?>
}
.notice h1 {
border-color: #FFD700;
@ -529,7 +521,6 @@ div.footnotes {
h1.error,
div.error {
border-color: #ff0000;
<?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_error.png);
background-repeat: no-repeat;
<?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
@ -539,7 +530,6 @@ div.error {
background-position: 99% 50%;
padding: 0.2em 35px 0.2em 0.2em;
<?php } ?>
<?php } ?>
}
div.error h1 {
border-color: #ff0000;
@ -555,7 +545,6 @@ fieldset.confirmation legend {
border-left: 0.1em solid #FF0000;
border-right: 0.1em solid #FF0000;
font-weight: bold;
<?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_really.png);
background-repeat: no-repeat;
<?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
@ -565,7 +554,6 @@ fieldset.confirmation legend {
background-position: 97% 50%;
padding: 0.2em 25px 0.2em 0.2em;
<?php } ?>
<?php } ?>
}
/* end messageboxes */
@ -1279,7 +1267,6 @@ div#queryboxcontainer div#bookmarkoptions {
/* END main page */
<?php if ($GLOBALS['cfg']['MainPageIconic']) { ?>
/* iconic view for ul items */
li#li_create_database {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_newdb.png);
@ -1361,7 +1348,6 @@ li#li_user_preferences {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_tblops.png);
}
/* END iconic view for ul items */
<?php } /* end if $GLOBALS['cfg']['MainPageIconic'] */ ?>
#body_browse_foreigners {
@ -3112,7 +3098,7 @@ h2.active {
color: black;
font-weight: normal;
}
#foreignkeychk {
align:left;
position:absolute;

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

@ -684,7 +684,6 @@ div.error,
div.footnotes {
margin: .5em 0 1.3em 0;
border: 1px solid;
<?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
background-repeat: no-repeat;
<?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
background-position: 10px 50%;
@ -693,9 +692,6 @@ div.footnotes {
background-position: 99% 50%;
padding: 10px 35px 10px 10px;
<?php } ?>
<?php } else { ?>
padding: .3em;
<?php } ?>
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
@ -721,7 +717,6 @@ div.footnotes {
h1.success,
div.success {
border-color: #a2d246;
<?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_success.png);
background-repeat: no-repeat;
<?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
@ -729,7 +724,6 @@ div.success {
<?php } else { ?>
background-position: 99% 50%;
<?php } ?>
<?php } ?>
}
.success h1 {
border-color: #00FF00;
@ -745,7 +739,6 @@ h1.notice,
div.notice,
div.footnotes {
border-color: #3a6c7e;
<?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_notice.png);
background-repeat: no-repeat;
<?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
@ -753,7 +746,6 @@ div.footnotes {
<?php } else { ?>
background-position: 99% 50%;
<?php } ?>
<?php } ?>
}
.notice h1 {
@ -769,7 +761,6 @@ div.footnotes {
h1.error,
div.error {
border-color: #333;
<?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_error.png);
background-repeat: no-repeat;
<?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
@ -777,7 +768,6 @@ div.error {
<?php } else { ?>
background-position: 99% 50%;
<?php } ?>
<?php } ?>
}
div.error h1 {
@ -1485,7 +1475,6 @@ table#serverVariables td {
p.notice {
margin: 1.5em 0;
border: 1px solid #000;
<?php if ($GLOBALS['cfg']['ErrorIconic']) { ?>
background-repeat: no-repeat;
<?php if ($GLOBALS['text_dir'] === 'ltr') { ?>
background-position: 10px 50%;
@ -1494,9 +1483,6 @@ p.notice {
background-position: 99% 50%;
padding: 25px 10px 10px 10px
<?php } ?>
<?php } else { ?>
padding: .3em;
<?php } ?>
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border-radius: 5px;
@ -1669,7 +1655,6 @@ div#queryboxcontainer div#bookmarkoptions {
/* END main page */
<?php if ($GLOBALS['cfg']['MainPageIconic']) { ?>
/* iconic view for ul items */
li#li_create_database {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_newdb.png);
@ -1751,7 +1736,6 @@ li#li_user_preferences {
list-style-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_tblops.png);
}
/* END iconic view for ul items */
<?php } /* end if $GLOBALS['cfg']['MainPageIconic'] */ ?>
#body_browse_foreigners {
@ -3641,7 +3625,7 @@ h2.active {
color: black;
font-weight: normal;
}
#foreignkeychk {
align:left;
position:absolute;