Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

pma spritify part 2

  • Loading branch information...
commit 3b3a9fc7624f857b3ff5f599eee9473a42d71feb 1 parent bf23143
Tyron Madlener tyronx authored
Showing with 158 additions and 168 deletions.
  1. +2 −2 db_operations.php
  2. +1 −1  js/db_search.js
  3. +1 −1  js/db_structure.js
  4. +4 −4 js/functions.js
  5. +2 −2 js/navigation.js
  6. +4 −4 js/server_status.js
  7. +2 −1  js/server_synchronize.js
  8. +3 −3 js/server_variables.js
  9. +8 −8 js/sql.js
  10. +1 −1  libraries/auth/cookie.auth.lib.php
  11. +4 −4 libraries/common.lib.php
  12. +1 −1  libraries/config/FormDisplay.tpl.php
  13. +4 −4 libraries/db_structure.lib.php
  14. +1 −1  libraries/display_create_database.lib.php
  15. +1 −1  libraries/display_create_table.lib.php
  16. +1 −1  libraries/display_export.lib.php
  17. +1 −1  libraries/display_import.lib.php
  18. +6 −6 libraries/display_tbl.lib.php
  19. +1 −1  libraries/footer.inc.php
  20. +5 −5 libraries/header.inc.php
  21. +5 −8 libraries/navigation_header.inc.php
  22. +1 −2  libraries/schema/User_Schema.class.php
  23. +1 −2  libraries/sql_query_form.lib.php
  24. +6 −9 navigation.php
  25. +3 −3 pmd/scripts/history.js
  26. +5 −5 querywindow.php
  27. +1 −1  server_binlog.php
  28. +1 −1  server_collations.php
  29. +3 −4 server_databases.php
  30. +2 −4 server_engines.php
  31. +1 −1  server_replication.php
  32. +1 −2  server_synchronize.php
  33. +1 −1  server_variables.php
  34. +1 −1  sql.php
  35. +2 −2 tbl_create.php
  36. +7 −7 tbl_structure.php
  37. +1 −1  tbl_tracking.php
  38. +31 −43 test/theme.php
  39. 0  themes/{pmahomme/img/cleardot.gif → dot.gif}
  40. +20 −7 themes/pmahomme/css/theme_left.css.php
  41. +12 −12 themes/pmahomme/css/theme_right.css.php
  42. BIN  themes/pmahomme/img/iconsprites.png
4 db_operations.php
View
@@ -433,7 +433,7 @@
<fieldset class="caution">
<legend><?php
if ($cfg['PropertiesIconic']) {
- echo '<img class="icon ic-b_deltbl" src="themes/dot.gif" alt="" />';
+ echo '<img class="icon ic_b_deltbl" src="themes/dot.gif" alt="" />';
}
echo __('Remove database');
?></legend>
@@ -479,7 +479,7 @@
<legend>
<?php
if ($cfg['PropertiesIconic']) {
- echo '<img class="icon ic-b_edit" src="themes/dot.gif" alt="" />';
+ echo '<img class="icon ic_b_edit" src="themes/dot.gif" alt="" />';
}
echo __('Copy database to') . ':';
$drop_clause = 'DROP TABLE / DROP VIEW';
2  js/db_search.js
View
@@ -87,7 +87,7 @@ $(document).ready(function() {
});
/** Hide the table link in the initial search result */
- $("#table-info").prepend('<img id="table-image" src="./themes/original/img/s_tbl.png" />').hide();
+ $("#table-info").prepend('<img id="table-image" class="icon ic_s_tbl" src="./themes/dot.gif" />').hide();
/** Hide the browse and deleted results in the new search criteria */
$('#buttonGo').click(function(){
2  js/db_structure.js
View
@@ -213,7 +213,7 @@ $(document).ready(function() {
PMA_ajaxShowMessage(data.message);
//Fetch inner span of this anchor
//and replace the icon with its disabled version
- var span = $this_anchor.html().replace(/b_empty.png/, 'bd_empty.png');
+ var span = $this_anchor.html().replace(/ic_b_empty/, 'ic_bd_empty');
PMA_adjustTotals($this_anchor);
//To disable further attempts to truncate the table,
8 js/functions.js
View
@@ -2286,10 +2286,10 @@ function initTooltips() {
$(".footnotes").css("padding", "0px");
// Replace the superscripts with the help icon
- $("sup[class='footnotemarker']").hide();
- $("img[class='footnotemarker']").show();
+ $("sup[class~='footnotemarker']").hide();
+ $("img[class~='footnotemarker']").show();
- $("img[class='footnotemarker']").each(function() {
+ $("img[class~='footnotemarker']").each(function() {
var span_id = $(this).attr("id");
span_id = span_id.split("_")[1];
var tooltip_text = $(".footnotes span[id='footnote_" + span_id + "']").html();
@@ -2375,7 +2375,7 @@ $(function() {
});
var img = topmenu.find('li:first-child img');
if (img.length) {
- img.clone().attr('src', img.attr('src').replace(/\/[^\/]+$/, '/b_more.png')).prependTo(link);
+ img.clone().attr('class', 'icon ic_b_more').prependTo(link);
}
var submenu = $('<li />', {'class': 'submenu'})
.append(link)
4 js/navigation.js
View
@@ -28,13 +28,13 @@ function toggle(id, only_open) {
if (el.style.display == 'none' || only_open) {
el.style.display = '';
if (img) {
- img.src = image_minus;
+ img.className = 'icon ic_b_minus';
img.alt = '-';
}
} else {
el.style.display = 'none';
if (img) {
- img.src = image_plus;
+ img.className = 'icon ic_b_plus';
img.alt = '+';
}
}
8 js/server_status.js
View
@@ -439,7 +439,7 @@ $(function() {
});
$('#serverstatusqueriesdetails tr:first th')
- .append('<img class="sortableIcon" src="' + pmaThemeImage + 'cleardot.gif" alt="">');
+ .append('<img class="icon sortableIcon" src="themes/dot.gif" alt="">');
break;
@@ -453,7 +453,7 @@ $(function() {
});
$('#serverstatusvariables tr:first th')
- .append('<img class="sortableIcon" src="' + pmaThemeImage + 'cleardot.gif" alt="">');
+ .append('<img class="icon sortableIcon" src="themes/dot.gif" alt="">');
break;
}
@@ -944,7 +944,7 @@ $(function() {
if(! runtime.redrawCharts)
$(this).html('<img src="themes/dot.gif" class="icon ic_play" alt="" /> ' + PMA_messages['strResumeMonitor']);
else {
- $(this).html('<img src="themes/dot.gif" class="icon ic_play" alt="" /> ' + PMA_messages['strPauseMonitor']);
+ $(this).html('<img src="themes/dot.gif" class="icon ic_pause" alt="" /> ' + PMA_messages['strPauseMonitor']);
if(runtime.charts == null) {
initGrid();
$('a[href="#settingsPopup"]').show();
@@ -1559,7 +1559,7 @@ $(function() {
});
$('div#logTable table thead th')
- .append('<img class="sortableIcon" src="' + pmaThemeImage + 'cleardot.gif" alt="">');
+ .append('<img class="icon sortableIcon" src="themes/dot.gif" alt="">');
$('#loadingLogsDialog').html('<p>' + PMA_messages['strLogDataLoaded'] + '</p>');
3  js/server_synchronize.js
View
@@ -96,7 +96,8 @@ function showDetails(i, update_size, insert_size, remove_size, insert_index, rem
insert_rows.align = "center";
var tick_image = document.createElement("img");
- tick_image.src = pmaThemeImage + "s_success.png";
+ tick_image.src = 'themes/dot.gif';
+ tick_image.className = "icon ic_s_success";
if (update_size == '' && insert_size == '' && remove_size == '') {
/**
6 js/server_variables.js
View
@@ -54,9 +54,9 @@ $(function() {
var charWidth;
// Global vars
- editLink = '<a href="#" class="editLink" onclick="return editVariable(this);"><img src="'+pmaThemeImage+'b_edit.png" alt="" width="16" height="16"> '+PMA_messages['strEdit']+'</a>';
- saveLink = '<a href="#" class="saveLink"><img src="'+pmaThemeImage+'b_save.png" alt="" width="16" height="16"> '+PMA_messages['strSave']+'</a> ';
- cancelLink = '<a href="#" class="cancelLink"><img src="'+pmaThemeImage+'b_close.png" alt="" width="16" height="16"> '+PMA_messages['strCancel']+'</a> ';
+ editLink = '<a href="#" class="editLink" onclick="return editVariable(this);"><img class="icon ic_b_edit" src="themes/dot.gif" alt=""> '+PMA_messages['strEdit']+'</a>';
+ saveLink = '<a href="#" class="saveLink"><img class="icon ic_b_save" src="themes/dot.gif" alt=""> '+PMA_messages['strSave']+'</a> ';
+ cancelLink = '<a href="#" class="cancelLink"><img class="icon ic_b_close" src="themes/dot.gif" alt=""> '+PMA_messages['strCancel']+'</a> ';
$.ajaxSetup({
16 js/sql.js
View
@@ -65,8 +65,8 @@ function appendInlineAnchor() {
var $img_object = $cloned_anchor.find('img').attr('title', PMA_messages['strInlineEdit']);
if ($img_object.length != 0) {
- var img_src = $img_object.attr('src').replace(/b_edit/,'b_inline_edit');
- $img_object.attr('src', img_src);
+ var img_class = $img_object.attr('class').replace(/b_edit/,'b_inline_edit');
+ $img_object.attr('class', img_class);
$cloned_anchor.find('a').attr('href', '#');
var $edit_span = $cloned_anchor.find('span:contains("' + PMA_messages['strEdit'] + '")');
var $span = $cloned_anchor.find('a').find('span');
@@ -85,8 +85,8 @@ function appendInlineAnchor() {
// the link was too big so <input type="image"> is there
$img_object = $cloned_anchor.find('input:image').attr('title', PMA_messages['strInlineEdit']);
if ($img_object.length > 0) {
- var img_src = $img_object.attr('src').replace(/b_edit/,'b_inline_edit');
- $img_object.attr('src', img_src);
+ var img_class = $img_object.attr('class').replace(/b_edit/,'b_inline_edit');
+ $img_object.attr('class', img_class);
}
$cloned_anchor
.find('.clickprevimage')
@@ -459,8 +459,8 @@ $(document).ready(function() {
// If icons are displayed. See $cfg['PropertiesIconic']
if ($img_object.length > 0) {
$img_object.attr('title', PMA_messages['strSave']);
- var img_src = $img_object.attr('src').replace(/b_inline_edit/,'b_save');
- $img_object.attr('src', img_src);
+ var img_class = $img_object.attr('class').replace(/b_inline_edit/,'b_save');
+ $img_object.attr('class', img_class);
$this_children.prepend($img_object);
}
@@ -479,8 +479,8 @@ $(document).ready(function() {
// If icons are displayed. See $cfg['PropertiesIconic']
if ($img_object.length > 0) {
$img_object.attr('title', PMA_messages['strHide']);
- var img_src = $img_object.attr('src').replace(/b_save/,'b_close');
- $img_object.attr('src', img_src);
+ var img_class = $img_object.attr('class').replace(/b_save/,'b_close');
+ $img_object.attr('class', img_class);
$hide_span.prepend($img_object);
}
2  libraries/auth/cookie.auth.lib.php
View
@@ -131,7 +131,7 @@ function PMA_auth()
// Defines the charset to be used
header('Content-Type: text/html; charset=utf-8');
// Defines the "item" image depending on text direction
- $item_img = $GLOBALS['pmaThemeImage'] . 'item_' . $GLOBALS['text_dir'] . '.png';
+ $item_img = 'ic_item_' . $GLOBALS['text_dir'];
/* HTML header; do not show here the PMA version to improve security */
$page_title = 'phpMyAdmin ';
8 libraries/common.lib.php
View
@@ -1510,7 +1510,7 @@ function PMA_localisedDate($timestamp = -1, $format = '')
* @return string html code for one tab, a link if valid otherwise a span
* @access public
*/
-function PMA_generate_html_tab($tab, $url_params = array())
+function PMA_generate_html_tab($tab, $url_params = array(), $base_dir='')
{
// default values
$defaults = array(
@@ -1572,7 +1572,7 @@ function PMA_generate_html_tab($tab, $url_params = array())
// avoid generating an alt tag, because it only illustrates
// the text that follows and if browser does not display
// images, the text is duplicated
- $image = '<img class="icon %1$s" src="themes/dot.gif"'
+ $image = '<img class="icon %1$s" src="' . $base_dir . 'themes/dot.gif"'
.' width="16" height="16" alt="" />%2$s';
$tab['text'] = sprintf($image, htmlentities($tab['icon']), $tab['text']);
}
@@ -1608,7 +1608,7 @@ function PMA_generate_html_tab($tab, $url_params = array())
* @param string $url_params
* @return string html-code for tab-navigation
*/
-function PMA_generate_html_tabs($tabs, $url_params)
+function PMA_generate_html_tabs($tabs, $url_params, $base_dir='')
{
$tag_id = 'topmenu';
$tab_navigation =
@@ -1616,7 +1616,7 @@ function PMA_generate_html_tabs($tabs, $url_params)
.'<ul id="' . htmlentities($tag_id) . '">' . "\n";
foreach ($tabs as $tab) {
- $tab_navigation .= PMA_generate_html_tab($tab, $url_params);
+ $tab_navigation .= PMA_generate_html_tab($tab, $url_params, $base_dir);
}
$tab_navigation .=
2  libraries/config/FormDisplay.tpl.php
View
@@ -234,7 +234,7 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
}
if ($is_setup_script && isset($opts['userprefs_comment']) && $opts['userprefs_comment']) {
?>
- <a class="userprefs-comment" title="<?php echo htmlspecialchars($opts['userprefs_comment']) ?>"><img alt="comment" class="icon ic-b_tblops" src="<?php echo $base_dir; ?>themes/dot.gif" /></a>
+ <a class="userprefs-comment" title="<?php echo htmlspecialchars($opts['userprefs_comment']) ?>"><img alt="comment" class="icon ic_b_tblops" src="<?php echo $base_dir; ?>themes/dot.gif" /></a>
<?php
}
if (isset($opts['setvalue']) && $opts['setvalue']) {
8 libraries/db_structure.lib.php
View
@@ -96,17 +96,17 @@ function PMA_SortableTableHeader($title, $sort, $initial_sort_order = 'ASC')
// current sort order is ASC
$order_img = ' <img class="icon ic_s_asc" src="themes/dot.gif" alt="'. __('Ascending') . '" title="'. __('Ascending') . '" id="sort_arrow" />';
// but on mouse over, show the reverse order (DESC)
- $order_link_params['onmouseover'] = 'if($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_desc.png\'); }';
+ $order_link_params['onmouseover'] = 'if($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_desc\'); }';
// on mouse out, show current sort order (ASC)
- $order_link_params['onmouseout'] = 'if($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_asc.png\'); }';
+ $order_link_params['onmouseout'] = 'if($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_asc\'); }';
} else {
$future_sort_order = 'ASC';
// current sort order is DESC
$order_img = ' <img class="icon ic_s_desc" src="themes/dot.gif" alt="'. __('Descending') . '" title="'. __('Descending') . '" id="sort_arrow" />';
// but on mouse over, show the reverse order (ASC)
- $order_link_params['onmouseover'] = 'if(document.getElementById(\'sort_arrow\')){ document.getElementById(\'sort_arrow\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_asc.png\'; }';
+ $order_link_params['onmouseover'] = 'if($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_asc\'); }';
// on mouse out, show current sort order (DESC)
- $order_link_params['onmouseout'] = 'if(document.getElementById(\'sort_arrow\')){ document.getElementById(\'sort_arrow\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_desc.png\'; }';
+ $order_link_params['onmouseout'] = 'if($(\'#sort_arrow\').length > 0) { $(\'#sort_arrow\').attr(\'class\',\'icon ic_s_desc\'); }';
}
}
2  libraries/display_create_database.lib.php
View
@@ -39,7 +39,7 @@
<strong><?php echo __('Create database') . ':&nbsp;' . PMA_showMySQLDocu('SQL-Syntax', 'CREATE_DATABASE'); ?></strong><br />
<?php
echo '<span class="noPrivileges">'
- . ($cfg['ErrorIconic'] ? '<img src="' . $pmaThemeImage . 's_error2.png" alt="" width="11" height="11" hspace="2" border="0" align="middle" />' : '')
+ . ($cfg['ErrorIconic'] ? '<img class="icon ic_s_error2" src="themes/dot.gif" alt="" hspace="2" border="0" align="middle" />' : '')
. '' . __('No Privileges') .'</span>';
} // end create db form or message
?>
2  libraries/display_create_table.lib.php
View
@@ -41,7 +41,7 @@
<legend>
<?php
if ($GLOBALS['cfg']['PropertiesIconic']) {
- echo '<img class="icon" src="' . $pmaThemeImage . 'b_newtbl.png" width="16" height="16" alt="" />';
+ echo '<img class="icon ic_b_newtbl" src="themes/dot.gif" alt="" />';
}
echo sprintf(__('Create table on database %s'), PMA_getDbLink());
?>
2  libraries/display_export.lib.php
View
@@ -74,7 +74,7 @@ function PMA_exportIsActive($what, $val) {
<div class="exportoptions" id="header">
<h2>
- <img src="<?php echo $GLOBALS['pmaThemeImage'];?>b_export.png" alt="export" />
+ <img class="icon ic_b_export" src="themes/dot.gif" alt="export" />
<?php
if($export_type == 'server') {
echo __('Exporting databases from the current server');
2  libraries/display_import.lib.php
View
@@ -123,7 +123,7 @@ function(response) {
<div class="exportoptions" id="header">
<h2>
- <img src="<?php echo $GLOBALS['pmaThemeImage'];?>b_import.png" alt="import" />
+ <img class="icon ic_b_import" src="themes/dot.gif" alt="import" />
<?php
if($import_type == 'server') {
echo __('Importing into the current server');
12 libraries/display_tbl.lib.php
View
@@ -892,10 +892,10 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
$order_img = '';
} elseif ('DESC' == $sort_direction) {
$sort_order .= ' ASC';
- $order_img = ' <img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 's_desc.png" width="11" height="9" alt="'. __('Descending') . '" title="'. __('Descending') . '" id="soimg' . $i . '" />';
+ $order_img = ' <img class="icon ic_s_desc" src="themes/dot.gif" alt="'. __('Descending') . '" title="'. __('Descending') . '" id="soimg' . $i . '" />';
} else {
$sort_order .= ' DESC';
- $order_img = ' <img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 's_asc.png" width="11" height="9" alt="'. __('Ascending') . '" title="'. __('Ascending') . '" id="soimg' . $i . '" />';
+ $order_img = ' <img class="icon ic_s_asc" src="themes/dot.gif" alt="'. __('Ascending') . '" title="'. __('Ascending') . '" id="soimg' . $i . '" />';
}
if (preg_match('@(.*)([[:space:]](LIMIT (.*)|PROCEDURE (.*)|FOR UPDATE|LOCK IN SHARE MODE))@is', $unsorted_sql_query, $regs3)) {
@@ -916,11 +916,11 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
$order_link_params = array();
if (isset($order_img) && $order_img!='') {
if (strstr($order_img, 'asc')) {
- $order_link_params['onmouseover'] = 'if(document.getElementById(\'soimg' . $i . '\')){ document.getElementById(\'soimg' . $i . '\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_desc.png\'; }';
- $order_link_params['onmouseout'] = 'if(document.getElementById(\'soimg' . $i . '\')){ document.getElementById(\'soimg' . $i . '\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_asc.png\'; }';
+ $order_link_params['onmouseover'] = 'if($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_desc\'); }';
+ $order_link_params['onmouseout'] = 'if($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_asc\'); }';
} elseif (strstr($order_img, 'desc')) {
- $order_link_params['onmouseover'] = 'if(document.getElementById(\'soimg' . $i . '\')){ document.getElementById(\'soimg' . $i . '\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_asc.png\'; }';
- $order_link_params['onmouseout'] = 'if(document.getElementById(\'soimg' . $i . '\')){ document.getElementById(\'soimg' . $i . '\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_desc.png\'; }';
+ $order_link_params['onmouseover'] = 'if($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_asc\'); }';
+ $order_link_params['onmouseout'] = 'if($(\'#soimg' . $i . '\').length > 0) { $(\'#soimg' . $i . '\').attr(\'class\', \'icon ic_s_desc\'); }';
}
}
if ($GLOBALS['cfg']['HeaderFlipType'] == 'auto') {
2  libraries/footer.inc.php
View
@@ -162,7 +162,7 @@
echo '<a href="index.php' . PMA_generate_common_url($url_params) . '"'
. ' title="' . __('Open new phpMyAdmin window') . '" target="_blank">';
if ($GLOBALS['cfg']['NavigationBarIconic']) {
- echo '<img class="icon" src="'. $GLOBALS['pmaThemeImage'] . 'window-new.png"'
+ echo '<img class="icon ic_window-new" src="themes/dot.gif"'
. ' alt="' . __('Open new phpMyAdmin window') . '" />';
}
if ($GLOBALS['cfg']['NavigationBarIconic'] !== true) {
10 libraries/header.inc.php
View
@@ -110,8 +110,8 @@ function PMA_addRecentTable($db, $table) {
);
$item = '<a href="%1$s?%2$s" class="item">';
if ($GLOBALS['cfg']['NavigationBarIconic']) {
- $separator = ' <span class="separator"><img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'item_' . $GLOBALS['text_dir'] . '.png" width="5" height="9" alt="-" /></span>' . "\n";
- $item .= ' <img class="icon" src="' . $GLOBALS['pmaThemeImage'] . '%5$s" width="16" height="16" alt="" /> ' . "\n";
+ $separator = ' <span class="separator"><img class="icon ic_item_' . $GLOBALS['text_dir'] . '" src="themes/dot.gif" alt="-" /></span>' . "\n";
+ $item .= ' <img class="icon %5$s" src="themes/dot.gif" alt="" /> ' . "\n";
} else {
$separator = ' <span class="separator"> - </span>' . "\n";
}
@@ -127,7 +127,7 @@ function PMA_addRecentTable($db, $table) {
PMA_generate_common_url(),
htmlspecialchars($server_info),
__('Server'),
- 's_host.png');
+ 'ic_s_host');
if (strlen($GLOBALS['db'])) {
@@ -137,7 +137,7 @@ function PMA_addRecentTable($db, $table) {
PMA_generate_common_url($GLOBALS['db']),
htmlspecialchars($GLOBALS['db']),
__('Database'),
- 's_db.png');
+ 'ic_s_db');
// if the table is being dropped, $_REQUEST['purge'] is set
// (it always contains "1")
// so do not display the table name in upper div
@@ -150,7 +150,7 @@ function PMA_addRecentTable($db, $table) {
PMA_generate_common_url($GLOBALS['db'], $GLOBALS['table']),
str_replace(' ', '&nbsp;', htmlspecialchars($GLOBALS['table'])),
(isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] ? __('View') : __('Table')),
- (isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] ? 'b_views' : 's_tbl') . '.png');
+ (isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] ? 'ic_b_views' : 'ic_s_tbl'));
/**
* Displays table comment
13 libraries/navigation_header.inc.php
View
@@ -56,8 +56,7 @@
echo '<a href="main.php?' . $query_url . '"'
.' title="' . __('Home') . '">'
.($GLOBALS['cfg']['MainPageIconic']
- ? '<img class="icon" src="' . $pmaThemeImage . 'b_home.png" width="16" '
- .' height="16" alt="' . __('Home') . '" />'
+ ? '<img class="icon ic_b_home" src="themes/dot.gif" alt="' . __('Home') . '" />'
: __('Home'))
.'</a>' . "\n";
// if we have chosen server
@@ -69,8 +68,7 @@
.urlencode($PHP_AUTH_USER) . '" target="_parent"'
.' title="' . __('Log out') . '" >'
.($GLOBALS['cfg']['MainPageIconic']
- ? '<img class="icon" src="' . $pmaThemeImage . 's_loggoff.png" '
- .' width="16" height="16" alt="' . __('Log out') . '" />'
+ ? '<img class="icon ic_s_loggoff" src="themes/dot.gif" alt="' . __('Log out') . '" />'
: __('Log out'))
.'</a>' . "\n";
} // end if ($GLOBALS['cfg']['Server']['auth_type'] != 'config'
@@ -79,8 +77,7 @@
if ($GLOBALS['cfg']['MainPageIconic']) {
$query_frame_link_text =
- '<img class="icon" src="' . $pmaThemeImage . 'b_selboard.png"'
- .' width="16" height="16" alt="' . __('Query window') . '" />';
+ '<img class="icon ic_b_selboard" src="themes/dot.gif" alt="' . __('Query window') . '" />';
} else {
echo '<br />' . "\n";
$query_frame_link_text = __('Query window');
@@ -95,7 +92,7 @@
.' title="' . __('phpMyAdmin documentation') . '" >';
if ($GLOBALS['cfg']['MainPageIconic']) {
- echo '<img class="icon" src="' . $pmaThemeImage . 'b_docs.png" width="16" height="16"'
+ echo '<img class="icon ic_b_docs" src="themes/dot.gif"'
.' alt="' . __('phpMyAdmin documentation') . '" />';
}
echo '</a>';
@@ -107,7 +104,7 @@
}
echo '<a href="navigation.php?' . PMA_generate_common_url($params) . '" target="frame_navigation">';
if ($GLOBALS['cfg']['MainPageIconic']) {
- echo '<img class="icon" src="'. $GLOBALS['pmaThemeImage'] . 's_reload.png"'
+ echo '<img class="icon ic_s_reload" src="themes/dot.gif"'
. ' title="' . __('Reload navigation frame') . '"'
. ' alt="' . __('Reload navigation frame') . '" />';
} else {
3  libraries/schema/User_Schema.class.php
View
@@ -336,8 +336,7 @@ public function displaySchemaGenerationOptions()
<?php
echo PMA_generate_common_hidden_inputs($db);
if ($cfg['PropertiesIconic']) {
- echo '<img class="icon" src="' . $pmaThemeImage . 'b_view.png"'
- .' alt="" width="16" height="16" />';
+ echo '<img class="icon ic_b_views" src="themes/dot.gif" />';
}
echo __('Display relational schema');
?>:
3  libraries/sql_query_form.lib.php
View
@@ -383,8 +383,7 @@ function PMA_sqlQueryFormBookmark()
if ($GLOBALS['cfg']['ReplaceHelpImg']) {
echo ' <a href="./Documentation.html#faqbookmark"'
.' target="documentation">'
- .'<img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_help.png"'
- .' border="0" width="11" height="11" align="middle"'
+ .'<img class="icon ic_b_help_s" src="themes/dot.gif"'
.' alt="' . __('Documentation') . '" /></a> ';
} else {
echo ' (<a href="./Documentation.html#faqbookmark"'
15 navigation.php
View
@@ -113,9 +113,6 @@ function PMA_exitNavigationFrame()
?>
<script type="text/javascript">
// <![CDATA[
- var image_minus = '<?php echo $GLOBALS['pmaThemeImage']; ?>b_minus.png';
- var image_plus = '<?php echo $GLOBALS['pmaThemeImage']; ?>b_plus.png';
-
// INIT PMA_setFrameSize
var onloadCnt = 0;
var onLoadHandler = window.onload;
@@ -230,9 +227,9 @@ function PMA_exitNavigationFrame()
// or $GLOBALS['cfg']['Servers']['only_db'] is defined and is not an array)
// In this case, the database should not be collapsible/expandable
-$img_plus = '<img class="icon" id="el%dImg" src="' . $pmaThemeImage . 'b_plus.png"'
+$img_plus = '<img class="icon ic_b_plus" id="el%dImg" src="themes/dot.gif"'
.' alt="+" />';
-$img_minus = '<img class="icon" id="el%dImg" src="' . $pmaThemeImage . 'b_minus.png"'
+$img_minus = '<img class="icon ic_b_minus" id="el%dImg" src="themes/dot.gif"'
.' alt="-" />';
$href_left = '<a onclick="if (toggle(\'%d\')) return false;"'
@@ -303,7 +300,7 @@ function PMA_exitNavigationFrame()
$class = '';
$GLOBALS['cfg']['AjaxEnable'] ? $class="ajax" : '';
echo '<ul id="newtable"><li><a target="frame_content" href="tbl_create.php' . PMA_generate_common_url(array('db' => $GLOBALS['db'])) . '" class="'.$class .'" >'
- .'<img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_snewtbl.png" id="icon_newtable" alt="' . _pgettext('short form', 'Create table') . '" />'
+ .'<img class="icon ic_b_snewtbl" src="themes/dot.gif" id="icon_newtable" alt="' . _pgettext('short form', 'Create table') . '" />'
. _pgettext('short form', 'Create table') . '</a></li></ul>';
}
} elseif ($GLOBALS['cfg']['LeftFrameLight']) {
@@ -597,11 +594,11 @@ function PMA_displayTableList($tables, $visible = false,
.'&amp;table=' . urlencode($table['Name'])
.'&amp;goto=' . $GLOBALS['cfg']['LeftDefaultTabTable']
. '" >'
- .'<img class="icon"';
+ .'<img src="themes/dot.gif"';
if ('VIEW' === strtoupper($table['Comment'])) {
- echo ' src="' . $GLOBALS['pmaThemeImage'] . 's_views.png"';
+ echo ' class="icon ic_s_views"';
} else {
- echo ' src="' . $GLOBALS['pmaThemeImage'] . 'b_sbrowse.png"';
+ echo ' class="icon ic_b_sbrowse"';
}
echo ' id="icon_' . htmlspecialchars($table_db . '.' . $table['Name']) . '"'
.' alt="' . htmlspecialchars($link_title) . '" /></a>' . "\n";
6 pmd/scripts/history.js
View
@@ -71,12 +71,12 @@ function display(init,final) {
else {
str +='<img src="pmd/images/and_icon.png" onclick="and_or('+i+')" title="AND"/></td>';
}
- str +='<td style="padding-left: 5px;" align="right"><img src="./themes/original/img/b_sbrowse.png" title="column name"/></td><td width="175" style="padding-left: 5px">' + history_array[i].get_column_name();
+ str +='<td style="padding-left: 5px;" align="right"><img class="icon ic_b_sbrowse" src="themes/dot.gif" title="column name"/></td><td width="175" style="padding-left: 5px">' + history_array[i].get_column_name();
if (history_array[i].get_type() == "GroupBy" || history_array[i].get_type() == "OrderBy") {
- str += '</td><td align="center"><img src="themes/original/img/b_info.png" title="'+detail(i)+'"/><td title="' + detail(i) +'">' + history_array[i].get_type() + '</td></td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_delete('+ i +')><img src="themes/original/img/b_drop.png" title="Delete"></td></tr></thead>';
+ str += '</td><td align="center"><img class="icon ic_b_info" src="themes/dot.gif" title="'+detail(i)+'"/><td title="' + detail(i) +'">' + history_array[i].get_type() + '</td></td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_delete('+ i +')><img class="icon ic_b_drop" src="themes/dot.gif" title="Delete"></td></tr></thead>';
}
else {
- str += '</td><td align="center"><img src="themes/original/img/b_info.png" title="'+detail(i)+'"/></td><td title="' + detail(i) +'">' + history_array[i]. get_type() + '</td><td <td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_edit('+ i +')><img src="themes/original/img/b_edit.png" title="Edit"/></td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_delete('+ i +')><img src="themes/original/img/b_drop.png" title="Delete"></td></tr></thead>';
+ str += '</td><td align="center"><img class="icon ic_b_info" src="themes/dot.gif" title="'+detail(i)+'"/></td><td title="' + detail(i) +'">' + history_array[i]. get_type() + '</td><td <td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_edit('+ i +')><img class="icon ic_b_edit" src="themes/dot.gif" title="Edit"/></td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_delete('+ i +')><img src="themes/original/img/b_drop.png" title="Delete"></td></tr></thead>';
}
i++;
if(i >= history_array.length) {
10 querywindow.php
View
@@ -60,17 +60,17 @@
$tabs = false;
} else {
$tabs = array();
- $tabs['sql']['icon'] = 'b_sql.png';
+ $tabs['sql']['icon'] = 'ic_b_sql';
$tabs['sql']['text'] = __('SQL');
$tabs['sql']['fragment'] = '#';
$tabs['sql']['attr'] = 'onclick="javascript:PMA_querywindowCommit(\'sql\');return false;"';
$tabs['sql']['active'] = (bool) ($querydisplay_tab == 'sql');
- $tabs['import']['icon'] = 'b_import.png';
+ $tabs['import']['icon'] = 'ic_b_import';
$tabs['import']['text'] = __('Import files');
$tabs['import']['fragment'] = '#';
$tabs['import']['attr'] = 'onclick="javascript:PMA_querywindowCommit(\'files\');return false;"';
$tabs['import']['active'] = (bool) ($querydisplay_tab == 'files');
- $tabs['history']['icon'] = 'b_bookmark.png';
+ $tabs['history']['icon'] = 'ic_b_bookmark';
$tabs['history']['text'] = __('SQL history');
$tabs['history']['fragment'] = '#';
$tabs['history']['attr'] = 'onclick="javascript:PMA_querywindowCommit(\'history\');return false;"';
@@ -86,8 +86,8 @@
if ($GLOBALS['cfg']['PropertiesIconic']) {
$titles['Change'] =
- '<img class="icon" width="16" height="16" src="' . $pmaThemeImage
- . 'b_edit.png" alt="' . __('Change') . '" title="' . __('Change')
+ '<img class="icon ic_b_edit" src="themes/dot.gif" alt="'
+ . __('Change') . '" title="' . __('Change')
. '" />';
if ('both' === $GLOBALS['cfg']['PropertiesIconic']) {
2  server_binlog.php
View
@@ -73,7 +73,7 @@
* Displays the sub-page heading
*/
echo '<h2>' . "\n"
- . ($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $pmaThemeImage . 's_tbl.png" width="16" height="16" border="0" hspace="2" align="middle" alt="" />' : '')
+ . ($GLOBALS['cfg']['MainPageIconic'] ? '<img src="themes/dot.gif" class="icon ic_s_tbl" alt="" />' : '')
. ' ' . __('Binary log') . "\n"
. '</h2>' . "\n";
2  server_collations.php
View
@@ -34,7 +34,7 @@
*/
echo '<h2>' . "\n"
. ' ' . ($GLOBALS['cfg']['MainPageIconic']
- ? '<img class="icon" src="'. $GLOBALS['pmaThemeImage'] . 's_asci.png" alt="" />'
+ ? '<img class="icon ic_s_asci" src="themes/dot.gif" alt="" />'
: '')
. '' . __('Character Sets and Collations') . "\n"
. '</h2>' . "\n";
7 server_databases.php
View
@@ -94,8 +94,7 @@
*/
echo '<h2>' . "\n"
. ($GLOBALS['cfg']['MainPageIconic']
- ? '<img class="icon" src="' . $pmaThemeImage . 's_db.png" width="16"'
- .' height="16" alt="" />'
+ ? '<img class="icon ic_s_db" src="themes/dot.gif" alt="" />'
: '')
. ($dbstats ? __('Databases statistics') : __('Databases')) . "\n"
.'</h2>' . "\n";
@@ -155,7 +154,7 @@
. ($is_superuser || $cfg['AllowUserDropDatabase'] ? ' <th></th>' . "\n" : '')
. ' <th><a href="./server_databases.php' . PMA_generate_common_url($_url_params) . '">' . "\n"
. ' ' . __('Database') . "\n"
- . ($sort_by == 'SCHEMA_NAME' ? ' <img class="icon" src="' . $pmaThemeImage . 's_' . $sort_order . '.png" width="11" height="9" alt="' . ($sort_order == 'asc' ? __('Ascending') : __('Descending')) . '" />' . "\n" : '')
+ . ($sort_by == 'SCHEMA_NAME' ? ' <img class="icon ic_s_' . $sort_order . '" src="themes/dot.gif" alt="' . ($sort_order == 'asc' ? __('Ascending') : __('Descending')) . '" />' . "\n" : '')
. ' </a></th>' . "\n";
$table_columns = 3;
foreach ($column_order as $stat_name => $stat) {
@@ -172,7 +171,7 @@
echo ' <th' . $colspan . '>'
.'<a href="./server_databases.php' . PMA_generate_common_url($_url_params) . '">' . "\n"
.' ' . $stat['disp_name'] . "\n"
- .($sort_by == $stat_name ? ' <img class="icon" src="' . $pmaThemeImage . 's_' . $sort_order . '.png" width="11" height="9" alt="' . ($sort_order == 'asc' ? __('Ascending') : __('Descending')) . '" />' . "\n" : '')
+ .($sort_by == $stat_name ? ' <img class="icon ic_s_' . $sort_order . '" src="themes/dot.gif" alt="' . ($sort_order == 'asc' ? __('Ascending') : __('Descending')) . '" />' . "\n" : '')
.' </a></th>' . "\n";
}
}
6 server_engines.php
View
@@ -42,8 +42,7 @@
*/
echo '<h2>' . "\n"
. ($GLOBALS['cfg']['MainPageIconic']
- ? '<img class="icon" src="' . $pmaThemeImage . 'b_engine.png"'
- .' width="16" height="16" alt="" />' : '')
+ ? '<img class="icon ic_b_engine" src="themes/dot.gif" alt="" />' : '')
. "\n" . __('Storage Engines') . "\n"
. '</h2>' . "\n";
@@ -107,8 +106,7 @@
$engine_plugin = PMA_StorageEngine::getEngine($_REQUEST['engine']);
echo '<h2>' . "\n"
. ($GLOBALS['cfg']['MainPageIconic']
- ? '<img class="icon" src="' . $pmaThemeImage . 'b_engine.png"'
- .' width="16" height="16" alt="" />' : '')
+ ? '<img class="icon ic_b_engine" src="themes/dot.gif" alt="" />' : '')
. ' ' . htmlspecialchars($engine_plugin->getTitle()) . "\n"
. ' ' . PMA_showMySQLDocu('', $engine_plugin->getMysqlHelpPage()) . "\n"
. '</h2>' . "\n\n";
2  server_replication.php
View
@@ -158,7 +158,7 @@
echo '<div id="replication">';
echo ' <h2>';
-echo ' <img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 's_replication.png" width="16" height="16" alt="" />';
+echo ' <img class="icon ic_s_replication" src="themes/dot.gif" alt="" />';
echo __('Replication');
echo ' </h2>';
3  server_synchronize.php
View
@@ -1081,8 +1081,7 @@
* Displays the sub-page heading
*/
echo '<h2>' . ($GLOBALS['cfg']['MainPageIconic']
- ? '<img class="icon" src="' . $pmaThemeImage . 's_sync.png" width="18"'
- . ' height="18" alt="" />'
+ ? '<img class="icon ic_s_sync" src="themes/dot.gif" alt="" />'
: '')
. __('Synchronize')
.'</h2>';
2  server_variables.php
View
@@ -73,7 +73,7 @@
* Displays the sub-page heading
*/
echo '<h2>' . "\n"
- . ($cfg['MainPageIconic'] ? '<img class="icon" src="' . $pmaThemeImage . 's_vars.png" width="16" height="16" alt="" />' : '')
+ . ($cfg['MainPageIconic'] ? '<img class="icon ic_s_vars" src="themes/dot.gif" alt="" />' : '')
. '' . __('Server variables and settings') . "\n"
. PMA_showMySQLDocu('server_system_variables','server_system_variables')
. '</h2>' . "\n";
2  sql.php
View
@@ -1013,7 +1013,7 @@
<input type="hidden" name="fields[query]" value="<?php echo urlencode(isset($complete_query) ? $complete_query : $sql_query); ?>" />
<fieldset>
<legend><?php
- echo ($cfg['PropertiesIconic'] ? '<img class="icon" src="' . $pmaThemeImage . 'b_bookmark.png" width="16" height="16" alt="' . __('Bookmark this SQL query') . '" />' : '')
+ echo ($cfg['PropertiesIconic'] ? '<img class="icon ic_b_bookmark" src="themes/dot.gif" alt="' . __('Bookmark this SQL query') . '" />' : '')
. __('Bookmark this SQL query');
?>
</legend>
4 tbl_create.php
View
@@ -266,9 +266,9 @@
if (PMA_Tracker::isActive()) {
$truename = str_replace(' ', '&nbsp;', htmlspecialchars($table));
if (PMA_Tracker::isTracked($db, $truename)) {
- $new_table_string .= '<a href="tbl_tracking.php' . PMA_generate_common_url($tbl_url_params) . '"><img class="icon" width="14" height="14" src="' . $pmaThemeImage . 'eye.png" alt="' . __('Tracking is active.') . '" title="' . __('Tracking is active.') . '" /></a>';
+ $new_table_string .= '<a href="tbl_tracking.php' . PMA_generate_common_url($tbl_url_params) . '"><img class="icon ic_eye" src="themes/dot.gif" alt="' . __('Tracking is active.') . '" title="' . __('Tracking is active.') . '" /></a>';
} elseif (PMA_Tracker::getVersion($db, $truename) > 0) {
- $new_table_string .= '<a href="tbl_tracking.php' . PMA_generate_common_url($tbl_url_params) . '"><img class="icon" width="14" height="14" src="' . $pmaThemeImage . 'eye_grey.png" alt="' . __('Tracking is not active.') . '" title="' . __('Tracking is not active.') . '" /></a>';
+ $new_table_string .= '<a href="tbl_tracking.php' . PMA_generate_common_url($tbl_url_params) . '"><img class="icon ic_eye_grey" src="themes/dot.gif" alt="' . __('Tracking is not active.') . '" title="' . __('Tracking is not active.') . '" /></a>';
}
unset($truename);
}
14 tbl_structure.php
View
@@ -494,7 +494,7 @@
echo "\n";
?>
<td class="more_opts" id="more_opts<?php echo $rownum; ?>">
- <?php echo __('More'); ?> <img src="<?php echo $pmaThemeImage . 'more.png'; ?>" alt="<?php echo __('Show more actions'); ?>" />
+ <?php echo __('More'); ?> <img class="icon ic_more" src="themes/dot.gif" alt="<?php echo __('Show more actions'); ?>" />
<div class="structure_actions_dropdown" id="row_<?php echo $rownum; ?>">
<div class="action_browse">
@@ -625,7 +625,7 @@
?>
<a href="tbl_printview.php?<?php echo $url_query; ?>"><?php
if ($cfg['PropertiesIconic']) {
- echo '<img class="icon" src="' . $pmaThemeImage . 'b_print.png" width="16" height="16" alt="' . __('Print view') . '"/>';
+ echo '<img class="icon ic_b_print" src="themes/dot.gif" alt="' . __('Print view') . '"/>';
}
echo __('Print view');
?></a>
@@ -639,7 +639,7 @@
?>
<a href="tbl_relation.php?<?php echo $url_query; ?>"><?php
if ($cfg['PropertiesIconic']) {
- echo '<img class="icon" src="' . $pmaThemeImage . 'b_relations.png" width="16" height="16" alt="' . __('Relation view') . '"/>';
+ echo '<img class="icon ic_b_relations" src="themes/dot.gif" alt="' . __('Relation view') . '"/>';
}
echo __('Relation view');
?></a>
@@ -648,7 +648,7 @@
?>
<a href="sql.php?<?php echo $url_query; ?>&amp;session_max_rows=all&amp;sql_query=<?php echo urlencode('SELECT * FROM ' . PMA_backquote($table) . ' PROCEDURE ANALYSE()'); ?>"><?php
if ($cfg['PropertiesIconic']) {
- echo '<img class="icon" src="' . $pmaThemeImage . 'b_tblanalyse.png" width="16" height="16" alt="' . __('Propose table structure') . '" />';
+ echo '<img class="icon ic_b_tblanalyse" src="themes/dot.gif" alt="' . __('Propose table structure') . '" />';
}
echo __('Propose table structure');
?></a><?php
@@ -661,7 +661,7 @@
if ($cfg['PropertiesIconic'])
{
- echo '<img class="icon" src="' . $pmaThemeImage . 'eye.png" width="16" height="16" alt="' . __('Track table') . '" /> ';
+ echo '<img class="icon ic_eye" src="themes/dot.gif" alt="' . __('Track table') . '" /> ';
}
echo __('Track table') . '</a>';
}
@@ -673,7 +673,7 @@
<?php
echo PMA_generate_common_hidden_inputs($db, $table);
if ($cfg['PropertiesIconic']) {
- echo '<img class="icon" src="' . $pmaThemeImage . 'b_insrow.png" width="16" height="16" alt="' . __('Add column') . '"/>';
+ echo '<img class="icon ic_b_insrow" src="themes/dot.gif" alt="' . __('Add column') . '"/>';
}
echo sprintf(__('Add %s column(s)'), '<input type="text" name="num_fields" size="2" maxlength="2" value="1" onfocus="this.select()" />');
@@ -839,7 +839,7 @@
<td colspan="3" align="center">
<a href="sql.php?<?php echo $url_query; ?>&pos=0&amp;sql_query=<?php echo urlencode('OPTIMIZE TABLE ' . PMA_backquote($table)); ?>"><?php
if ($cfg['PropertiesIconic']) {
- echo '<img class="icon" src="' . $pmaThemeImage . 'b_tbloptimize.png" width="16" height="16" alt="' . __('Optimize table'). '" />';
+ echo '<img class="icon ic_b_tbloptimize" src="themes/dot.gif" alt="' . __('Optimize table'). '" />';
}
echo __('Optimize table');
?></a>
2  tbl_tracking.php
View
@@ -429,7 +429,7 @@ function PMA_filter_tracking($data, $filter_ts_from, $filter_ts_to, $filter_user
// Prepare delete link content here
$drop_image_or_text = '';
if (true == $GLOBALS['cfg']['PropertiesIconic']) {
- $drop_image_or_text .= '<img class="icon" width="16" height="16" src="' . $pmaThemeImage . 'b_drop.png" alt="' . __('Delete tracking data row from report') . '" title="' . __('Delete tracking data row from report') . '" />';
+ $drop_image_or_text .= '<img class="icon ic_b_drop" src="themes/dot.gif" alt="' . __('Delete tracking data row from report') . '" title="' . __('Delete tracking data row from report') . '" />';
}
if ('both' === $GLOBALS['cfg']['PropertiesIconic'] || false === $GLOBALS['cfg']['PropertiesIconic']) {
$drop_image_or_text .= __('Delete');
74 test/theme.php
View
@@ -39,10 +39,10 @@
$separator = '<span class="separator">'
- .'<img class="icon" src=../"' . $GLOBALS['pmaThemeImage'] . 'item_ltr.png"'
+ .'<img class="icon ic_item_ltr" src="../themes/dot.gif"'
.' width="5" height="9" alt="-" /></span>' . "\n";
$item = '<a href="%1$s?%2$s" class="item">'
- .' <img class="icon" src="../' . $GLOBALS['pmaThemeImage'] . '%5$s"'
+ .' <img class="icon %5$s" src="../themes/dot.gif"'
.' width="16" height="16" alt="" /> ' . "\n"
.'%4$s: %3$s</a>' . "\n";
@@ -52,7 +52,7 @@
PMA_generate_common_url(),
'Server',
__('Server'),
- 's_host.png');
+ 'ic_s_host');
echo $separator;
printf($item,
@@ -60,7 +60,7 @@
'',
'Database',
__('Database'),
- 's_db.png');
+ 'ic_s_db');
echo $separator;
printf($item,
@@ -71,8 +71,8 @@
? __('View')
: __('Table')),
(isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view']
- ? 'b_views'
- : 's_tbl') . '.png');
+ ? 'ic_b_views'
+ : 'ic_s_tbl'));
echo '<span class="table_comment" id="span_table_comment">'
.'&quot;Table comment&quot</span>' . "\n";
@@ -85,56 +85,56 @@
*/
$tabs = array();
-$tabs['databases']['icon'] = '../../../../' . $pmaThemeImage . 's_db.png';
+$tabs['databases']['icon'] = 'ic_s_db';
$tabs['databases']['link'] = 'server_databases.php';
$tabs['databases']['text'] = __('Databases');
-$tabs['sql']['icon'] = '../../../../' . $pmaThemeImage . 'b_sql.png';
+$tabs['sql']['icon'] = 'b_sql.png';
$tabs['sql']['link'] = 'server_sql.php';
$tabs['sql']['text'] = __('SQL');
-$tabs['status']['icon'] = '../../../../' . $pmaThemeImage . 's_status.png';
+$tabs['status']['icon'] = 'ic_s_status';
$tabs['status']['link'] = 'server_status.php';
$tabs['status']['text'] = __('Status');
-$tabs['vars']['icon'] = '../../../../' . $pmaThemeImage . 's_vars.png';
+$tabs['vars']['icon'] = 'ic_s_vars';
$tabs['vars']['link'] = 'server_variables.php';
$tabs['vars']['text'] = __('Variables');
-$tabs['charset']['icon'] = '../../../../' . $pmaThemeImage . 's_asci.png';
+$tabs['charset']['icon'] = 'ic_s_asci';
$tabs['charset']['link'] = 'server_collations.php';
$tabs['charset']['text'] = __('Charsets');
-$tabs['engine']['icon'] = '../../../../' . $pmaThemeImage . 'b_engine.png';
+$tabs['engine']['icon'] = 'ic_b_engine';
$tabs['engine']['link'] = 'server_engines.php';
$tabs['engine']['text'] = __('Engines');
-$tabs['rights']['icon'] = '../../../../' . $pmaThemeImage . 's_rights.png';
+$tabs['rights']['icon'] = 'ic_s_rights';
$tabs['rights']['link'] = 'server_privileges.php';
$tabs['rights']['text'] = __('Privileges');
-$tabs['binlog']['icon'] = '../../../../' . $pmaThemeImage . 's_tbl.png';
+$tabs['binlog']['icon'] = 'ic_s_tbl';
$tabs['binlog']['link'] = 'server_binlog.php';
$tabs['binlog']['text'] = __('Binary log');
-$tabs['process']['icon'] = '../../../../' . $pmaThemeImage . 's_process.png';
+$tabs['process']['icon'] = 'ic_s_process';
$tabs['process']['link'] = 'server_processlist.php';
$tabs['process']['text'] = 'caution';
$tabs['process']['class'] = 'caution';
-$tabs['export']['icon'] = '../../../../' . $pmaThemeImage . 'b_export.png';
+$tabs['export']['icon'] = 'ic_b_export';
$tabs['export']['text'] = 'disabled';
-$tabs['export2']['icon'] = '../../../../' . $pmaThemeImage . 'b_export.png';
+$tabs['export2']['icon'] = 'ic_b_export';
$tabs['export2']['text'] = 'disabled caution';
$tabs['export2']['class'] = 'caution';
-$tabs['import']['icon'] = '../../../../' . $pmaThemeImage . 'b_import.png';
+$tabs['import']['icon'] = 'ic_b_import';
$tabs['import']['link'] = 'server_import.php';
$tabs['import']['text'] = 'active';
$tabs['import']['class'] = 'active';
-echo PMA_generate_html_tabs($tabs, array());
+echo PMA_generate_html_tabs($tabs, array(), '../../../../');
unset($tabs);
if (@file_exists($pmaThemeImage . 'logo_right.png')) {
@@ -260,12 +260,9 @@
value="1" /></td>
<th><label for="checkbox_1">th label</label></th>
<td class="value">td.value</td>
- <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
- width="16" height="16" alt="drop" /></td>
- <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
- width="16" height="16" alt="drop" /></td>
- <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
- width="16" height="16" alt="drop" /></td>
+ <td><img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop" /></td>
+ <td><img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop" /></td>
+ <td><img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop" /></td>
<td>table.data tbody tr.odd td</td>
</tr>
<tr class="even">
@@ -273,12 +270,9 @@
value="1" /></td>
<th><label for="checkbox_2">th label</label></th>
<td class="value">td.value</td>
- <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
- width="16" height="16" alt="drop" /></td>
- <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
- width="16" height="16" alt="drop" /></td>
- <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
- width="16" height="16" alt="drop" /></td>
+ <td><img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop" /></td>
+ <td><img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop" /></td>
+ <td><img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop" /></td>
<td>table.data tbody tr.even td</td>
</tr>
<tr class="odd">
@@ -286,12 +280,9 @@
value="1" /></td>
<th><label for="checkbox_3">th label</label></th>
<td class="value">td.value</td>
- <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
- width="16" height="16" alt="drop" /></td>
- <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
- width="16" height="16" alt="drop" /></td>
- <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
- width="16" height="16" alt="drop" /></td>
+ <td><img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop" /></td>
+ <td><img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop" /></td>
+ <td><img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop" /></td>
<td>table.data tbody tr.odd td</td>
</tr>
<tr class="even">
@@ -299,12 +290,9 @@
value="1" /></td>
<th><label for="checkbox_4">th label</label></th>
<td class="value">td.value</td>
- <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
- width="16" height="16" alt="drop" /></td>
- <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
- width="16" height="16" alt="drop" /></td>
- <td><img class="icon" src="../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/bd_drop.png"
- width="16" height="16" alt="drop" /></td>
+ <td><img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop" /></td>
+ <td><img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop" /></td>
+ <td><img class="icon ic_bd_drop" src="../themes/dot.gif" alt="drop" /></td>
<td>table.data tbody tr.even td</td>
</tr>
</tbody>
0  themes/pmahomme/img/cleardot.gif → themes/dot.gif
View
File renamed without changes
27 themes/pmahomme/css/theme_left.css.php
View
@@ -72,17 +72,30 @@ function PMA_ieFilter($start_color, $end_color)
display: inline;
}
+/* Icon sprites */
-/******************************************************************************/
-/* classes */
-
-/* leave some space between icons and text */
.icon {
+ /* leave some space between icons and text */
vertical-align: middle;
margin-right: 0.3em;
margin-left: 0.3em;
+ width:16px;
+ height:16px;
+ background: url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>iconsprites.png) no-repeat top left;
}
+.ic_b_home { background-position: -357px 0; }
+.ic_b_selboard { background-position: -754px 0; }
+.ic_b_docs { background-position: -136px 0; }
+.ic_b_sqlhelp { background-position: -856px 0; }
+.ic_s_reload { background-position: -1761px 0; }
+.ic_s_loggoff { background-position: -1698px 0; }
+.ic_b_browse, .ic_b_sbrowse { background-position: -34px 0; }
+.ic_b_view { background-position: -1077px 0; }
+
+/******************************************************************************/
+/* classes */
+
.navi_dbName {
font-weight: bold;
color: <?php echo $GLOBALS['cfg']['NaviDatabaseNameColor']; ?>;
@@ -157,9 +170,9 @@ function PMA_ieFilter($start_color, $end_color)
div#reloadlink a img,
div#leftframelinks a img.icon {
- margin: 10px 2px 0 0;
- padding: 0.2em;
- border: 0px;
+ margin: 0.3em;
+ margin-top: 0.7em;
+ border: 0px;
}
div#leftframelinks a:hover img {
24 themes/pmahomme/css/theme_right.css.php
View
@@ -321,7 +321,7 @@ function PMA_ieFilter($start_color, $end_color)
/* Icon sprites */
-.icon, img.footnotemarker {
+.icon, .footnotemarker {
vertical-align: -3px;
margin-right: 0.3em;
margin-left: 0.3em;
@@ -451,6 +451,16 @@ function PMA_ieFilter($start_color, $end_color)
.ic_s_vars { background-position: -1914px 0; }
.ic_window-new { background-position: -1931px 0; }
+/* Same as ic_s_sortable */
+img.sortableIcon { background-position: -1812px 0; }
+
+/* Same as s_asc */
+th.headerSortUp img.sortableIcon { background-position: -1516px 0; }
+
+/* Same as s_desc */
+th.headerSortDown img.sortableIcon { background-position: 0 0; }
+
+
/******************************************************************************/
/* classes */
div.tools {
@@ -1303,17 +1313,7 @@ function PMA_ieFilter($start_color, $end_color)
img.sortableIcon {
float:right;
background-repeat:no-repeat;
-}
-
-th.headerSortUp img.sortableIcon {
- background-position: -1516px 0;
-}
-
-th.headerSortDown img.sortableIcon {
- background-position: 0 0;
-}
-th.headerSortDown img.sortableIcon, th.headerSortDown img.sortableIcon {
- background-image:url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asc.png);
+ margin:0;
}
.buttonlinks {
BIN  themes/pmahomme/img/iconsprites.png
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Please sign in to comment.
Something went wrong with that request. Please try again.