diff options
| author | Michal Čihař <michal@cihar.com> | 2017-11-27 16:24:42 +0300 |
|---|---|---|
| committer | Michal Čihař <michal@cihar.com> | 2017-11-27 16:24:42 +0300 |
| commit | bed6fb4ebdc5f83ed30fe3e83e380baf24ed2fa5 (patch) | |
| tree | e0843a441b7c4fa1a7b069f27ea274dc06e99a2e | |
| parent | 0aed31b8549e6a78d3c04ab0add96ad5ffcb13d1 (diff) | |
Avois passing extension to Util::getImage
We do not use it anyway for quite some time and this way it's less
processing to generate the img tag.
Signed-off-by: Michal Čihař <michal@cihar.com>
80 files changed, 335 insertions, 375 deletions
@@ -184,7 +184,7 @@ if ($server > 0 || count($cfg['Servers']) > 1 || ($server == 0 && count($cfg['Servers']) == 1))) ) { echo '<li id="li_select_server" class="no_bullets" >'; - echo Util::getImage('s_host.png') , " " + echo Util::getImage('s_host') , " " , Select::render(true, true); echo '</li>'; } @@ -200,7 +200,7 @@ if ($server > 0 || count($cfg['Servers']) > 1 if ($cfg['ShowChgPassword']) { $conditional_class = 'ajax'; Core::printListItem( - Util::getImage('s_passwd.png') . " " . __( + Util::getImage('s_passwd') . " " . __( 'Change password' ), 'li_change_password', @@ -217,7 +217,7 @@ if ($server > 0 || count($cfg['Servers']) > 1 echo ' <form method="post" action="index.php">' , "\n" . Url::getHiddenInputs(null, null, 4, 'collation_connection') . ' <label for="select_collation_connection">' . "\n" - . ' ' . Util::getImage('s_asci.png') + . ' ' . Util::getImage('s_asci') . " " . __('Server connection collation') . "\n" // put the doc link in the form so that it appears on the same line . Util::showMySQLDocu('Charset-connection') @@ -249,7 +249,7 @@ $language_manager = LanguageManager::getInstance(); if (empty($cfg['Lang']) && $language_manager->hasChoice()) { echo '<li id="li_select_lang" class="no_bullets">'; - echo Util::getImage('s_lang.png') , " " + echo Util::getImage('s_lang') , " " , $language_manager->getSelectorDisplay(); echo '</li>'; } @@ -258,7 +258,7 @@ if (empty($cfg['Lang']) && $language_manager->hasChoice()) { if ($GLOBALS['cfg']['ThemeManager']) { echo '<li id="li_select_theme" class="no_bullets">'; - echo Util::getImage('s_theme.png') , " " + echo Util::getImage('s_theme') , " " , ThemeManager::getInstance()->getHtmlSelectBox(); echo '</li>'; } @@ -273,7 +273,7 @@ echo '</ul>'; if ($server > 0) { echo '<ul>'; Core::printListItem( - Util::getImage('b_tblops.png') . " " . __( + Util::getImage('b_tblops') . " " . __( 'More settings' ), 'li_user_preferences', diff --git a/libraries/classes/CentralColumns.php b/libraries/classes/CentralColumns.php index b44fe721d7..4d92801aaf 100644 --- a/libraries/classes/CentralColumns.php +++ b/libraries/classes/CentralColumns.php @@ -889,7 +889,7 @@ class CentralColumns . '<td class="navigation_separator largescreenonly"></td>' . '<td style="padding:1.5% 0em">' . Util::getIcon( - 'centralColumns_add.png', + 'centralColumns_add', __('Add column') ) . '<form id="add_column" action="db_central_columns.php" method="post">' @@ -945,9 +945,9 @@ class CentralColumns . 'id="checkbox_row_' . $row_num . '"/>' . '</td>' . '<td id="edit_' . $row_num . '" class="edit center">' - . '<a href="#">' . Util::getIcon('b_edit.png', __('Edit')) . '</a></td>' + . '<a href="#">' . Util::getIcon('b_edit', __('Edit')) . '</a></td>' . '<td class="del_row" data-rownum = "' . $row_num . '">' - . '<a hrf="#">' . Util::getIcon('b_drop.png', __('Delete')) . '</a>' + . '<a hrf="#">' . Util::getIcon('b_drop', __('Delete')) . '</a>' . '<input type="submit" data-rownum = "' . $row_num . '"' . ' class="edit_cancel_form" value="Cancel"></td>' . '<td id="save_' . $row_num . '" class="hide">' @@ -1312,11 +1312,11 @@ class CentralColumns ); $html_output .= Util::getButtonOrImage( 'edit_central_columns', 'mult_submit change_central_columns', - __('Edit'), 'b_edit.png', 'edit central columns' + __('Edit'), 'b_edit', 'edit central columns' ); $html_output .= Util::getButtonOrImage( 'delete_central_columns', 'mult_submit', - __('Delete'), 'b_drop.png', + __('Delete'), 'b_drop', 'remove_from_central_columns' ); return $html_output; diff --git a/libraries/classes/Config/FormDisplayTemplate.php b/libraries/classes/Config/FormDisplayTemplate.php index c78e57b879..4f3ec7269e 100644 --- a/libraries/classes/Config/FormDisplayTemplate.php +++ b/libraries/classes/Config/FormDisplayTemplate.php @@ -160,10 +160,10 @@ class FormDisplayTemplate // The first element contains the filename and the second // element is used for the "alt" and "title" attributes. $icon_init = array( - 'edit' => array('b_edit.png', ''), - 'help' => array('b_help.png', __('Documentation')), - 'reload' => array('s_reload.png', ''), - 'tblops' => array('b_tblops.png', '') + 'edit' => array('b_edit', ''), + 'help' => array('b_help', __('Documentation')), + 'reload' => array('s_reload', ''), + 'tblops' => array('b_tblops', '') ); if ($is_setup_script) { // When called from the setup script, we don't have access to the diff --git a/libraries/classes/Console.php b/libraries/classes/Console.php index 678d8b883f..d05649099a 100644 --- a/libraries/classes/Console.php +++ b/libraries/classes/Console.php @@ -126,7 +126,7 @@ class Console if ((! $this->_isAjax) && $this->_isEnabled) { $cfgBookmark = Bookmark::getParams($GLOBALS['cfg']['Server']['user']); - $image = Util::getImage('console.png', __('SQL Query Console')); + $image = Util::getImage('console', __('SQL Query Console')); $_sql_history = Relation::getHistory($GLOBALS['cfg']['Server']['user']); $bookmarkContent = static::getBookmarkContent(); diff --git a/libraries/classes/Controllers/Server/ServerDatabasesController.php b/libraries/classes/Controllers/Server/ServerDatabasesController.php index 52bdb9ae5f..800f714339 100644 --- a/libraries/classes/Controllers/Server/ServerDatabasesController.php +++ b/libraries/classes/Controllers/Server/ServerDatabasesController.php @@ -420,7 +420,7 @@ class ServerDatabasesController extends Controller ); if (strlen($key) > 0) { $out = Util::getIcon( - 's_cancel.png', + 's_cancel', __('Not replicated') ); } else { @@ -433,7 +433,7 @@ class ServerDatabasesController extends Controller ) { // if ($key != null) did not work for index "0" $out = Util::getIcon( - 's_success.png', + 's_success', __('Replicated') ); } diff --git a/libraries/classes/Controllers/Table/TableSearchController.php b/libraries/classes/Controllers/Table/TableSearchController.php index 088f1eb7d6..63f1971fd5 100644 --- a/libraries/classes/Controllers/Table/TableSearchController.php +++ b/libraries/classes/Controllers/Table/TableSearchController.php @@ -357,7 +357,7 @@ class TableSearchController extends TableController //Displays form for point data and scatter plot $titles = array( 'Browse' => Util::getIcon( - 'b_browse.png', + 'b_browse', __('Browse foreign values') ) ); @@ -776,18 +776,18 @@ class TableSearchController extends TableController private function _getSubTabs() { $subtabs = array(); - $subtabs['search']['icon'] = 'b_search.png'; + $subtabs['search']['icon'] = 'b_search'; $subtabs['search']['text'] = __('Table search'); $subtabs['search']['link'] = 'tbl_select.php'; $subtabs['search']['id'] = 'tbl_search_id'; $subtabs['search']['args']['pos'] = 0; - $subtabs['zoom']['icon'] = 'b_select.png'; + $subtabs['zoom']['icon'] = 'b_select'; $subtabs['zoom']['link'] = 'tbl_zoom_select.php'; $subtabs['zoom']['text'] = __('Zoom search'); $subtabs['zoom']['id'] = 'zoom_search_id'; - $subtabs['replace']['icon'] = 'b_find_replace.png'; + $subtabs['replace']['icon'] = 'b_find_replace'; $subtabs['replace']['link'] = 'tbl_find_replace.php'; $subtabs['replace']['text'] = __('Find and replace'); $subtabs['replace']['id'] = 'find_replace_id'; @@ -853,7 +853,7 @@ class TableSearchController extends TableController ? $_POST['criteriaValues'] : ''); $titles = array( 'Browse' => Util::getIcon( - 'b_browse.png', __('Browse foreign values') + 'b_browse', __('Browse foreign values') ) ); //Gets column's type and collation diff --git a/libraries/classes/Controllers/Table/TableStructureController.php b/libraries/classes/Controllers/Table/TableStructureController.php index 535e11903a..52528bcccd 100644 --- a/libraries/classes/Controllers/Table/TableStructureController.php +++ b/libraries/classes/Controllers/Table/TableStructureController.php @@ -1195,23 +1195,20 @@ class TableStructureController extends TableController $columns_list = array(); $titles = array( - 'Change' => Util::getIcon('b_edit.png', __('Change')), - 'Drop' => Util::getIcon('b_drop.png', __('Drop')), - 'NoDrop' => Util::getIcon('b_drop.png', __('Drop')), - 'Primary' => Util::getIcon('b_primary.png', __('Primary')), - 'Index' => Util::getIcon('b_index.png', __('Index')), - 'Unique' => Util::getIcon('b_unique.png', __('Unique')), - 'Spatial' => Util::getIcon('b_spatial.png', __('Spatial')), - 'IdxFulltext' => Util::getIcon('b_ftext.png', __('Fulltext')), - 'NoPrimary' => Util::getIcon('bd_primary.png', __('Primary')), - 'NoIndex' => Util::getIcon('bd_index.png', __('Index')), - 'NoUnique' => Util::getIcon('bd_unique.png', __('Unique')), - 'NoSpatial' => Util::getIcon('bd_spatial.png', __('Spatial')), - 'NoIdxFulltext' => Util::getIcon('bd_ftext.png', __('Fulltext')), - 'DistinctValues' => Util::getIcon( - 'b_browse.png', - __('Distinct values') - ), + 'Change' => Util::getIcon('b_edit', __('Change')), + 'Drop' => Util::getIcon('b_drop', __('Drop')), + 'NoDrop' => Util::getIcon('b_drop', __('Drop')), + 'Primary' => Util::getIcon('b_primary', __('Primary')), + 'Index' => Util::getIcon('b_index', __('Index')), + 'Unique' => Util::getIcon('b_unique', __('Unique')), + 'Spatial' => Util::getIcon('b_spatial', __('Spatial')), + 'IdxFulltext' => Util::getIcon('b_ftext', __('Fulltext')), + 'NoPrimary' => Util::getIcon('bd_primary', __('Primary')), + 'NoIndex' => Util::getIcon('bd_index', __('Index')), + 'NoUnique' => Util::getIcon('bd_unique', __('Unique')), + 'NoSpatial' => Util::getIcon('bd_spatial', __('Spatial')), + 'NoIdxFulltext' => Util::getIcon('bd_ftext', __('Fulltext')), + 'DistinctValues' => Util::getIcon('b_browse', __('Distinct values')), ); /** diff --git a/libraries/classes/Display/Export.php b/libraries/classes/Display/Export.php index c0792c13c4..91d283fb6f 100644 --- a/libraries/classes/Display/Export.php +++ b/libraries/classes/Display/Export.php @@ -182,7 +182,7 @@ class Export { $html = '<div class="exportoptions" id="header">'; $html .= '<h2>'; - $html .= Util::getImage('b_export.png', __('Export')); + $html .= Util::getImage('b_export', __('Export')); if ($export_type == 'server') { $html .= __('Exporting databases from the current server'); } elseif ($export_type == 'database') { diff --git a/libraries/classes/Display/Results.php b/libraries/classes/Display/Results.php index 10050acb23..3079af4354 100644 --- a/libraries/classes/Display/Results.php +++ b/libraries/classes/Display/Results.php @@ -2105,21 +2105,21 @@ class Results if (strtoupper(trim($sort_direction[$index])) == self::DESCENDING_SORT_DIR) { $sort_order .= ' ASC'; $order_img = ' ' . Util::getImage( - 's_desc.png', __('Descending'), + 's_desc', __('Descending'), array('class' => "soimg", 'title' => '') ); $order_img .= ' ' . Util::getImage( - 's_asc.png', __('Ascending'), + 's_asc', __('Ascending'), array('class' => "soimg hide", 'title' => '') ); } else { $sort_order .= ' DESC'; $order_img = ' ' . Util::getImage( - 's_asc.png', __('Ascending'), + 's_asc', __('Ascending'), array('class' => "soimg", 'title' => '') ); $order_img .= ' ' . Util::getImage( - 's_desc.png', __('Descending'), + 's_desc', __('Descending'), array('class' => "soimg hide", 'title' => '') ); } @@ -3323,10 +3323,10 @@ class Results ); $edit_str = $this->_getActionLinkContent( - 'b_edit.png', __('Edit') + 'b_edit', __('Edit') ); $copy_str = $this->_getActionLinkContent( - 'b_insrow.png', __('Copy') + 'b_insrow', __('Copy') ); // Class definitions required for grid editing jQuery scripts @@ -3392,7 +3392,7 @@ class Results . ' WHERE ' . Sanitize::jsFormat($where_clause, false) . ($clause_is_unique ? '' : ' LIMIT 1'); - $del_str = $this->_getActionLinkContent('b_drop.png', __('Delete')); + $del_str = $this->_getActionLinkContent('b_drop', __('Delete')); } elseif ($del_lnk == self::KILL_PROCESS) { // kill process case @@ -3416,7 +3416,7 @@ class Results $del_url = 'sql.php' . Url::getCommon($_url_params); $js_conf = $kill; $del_str = Util::getIcon( - 'b_drop.png', __('Kill') + 'b_drop', __('Kill') ); } else { $del_url = $del_str = $js_conf = null; @@ -4682,23 +4682,23 @@ class Results $links_html .= Util::getButtonOrImage( 'submit_mult', 'mult_submit', - __('Edit'), 'b_edit.png', 'edit' + __('Edit'), 'b_edit', 'edit' ); $links_html .= Util::getButtonOrImage( 'submit_mult', 'mult_submit', - __('Copy'), 'b_insrow.png', 'copy' + __('Copy'), 'b_insrow', 'copy' ); $links_html .= Util::getButtonOrImage( 'submit_mult', 'mult_submit', - $delete_text, 'b_drop.png', 'delete' + $delete_text, 'b_drop', 'delete' ); if ($analyzed_sql_results['querytype'] == 'SELECT') { $links_html .= Util::getButtonOrImage( 'submit_mult', 'mult_submit', - __('Export'), 'b_tblexport.png', 'export' + __('Export'), 'b_tblexport', 'export' ); } @@ -4804,7 +4804,7 @@ class Results . Util::linkOrButton( 'view_create.php' . $url_query, Util::getIcon( - 'b_view_add.png', __('Create view'), true + 'b_view_add', __('Create view'), true ), array('class' => 'create_view' . $ajax_class) ) @@ -4850,7 +4850,7 @@ class Results $html = Util::linkOrButton( '#', Util::getIcon( - 'b_insrow.png', __('Copy to clipboard'), true + 'b_insrow', __('Copy to clipboard'), true ), array('id' => 'copyToClipBoard') ); @@ -4870,7 +4870,7 @@ class Results $html = Util::linkOrButton( '#', Util::getIcon( - 'b_print.png', __('Print'), true + 'b_print', __('Print'), true ), array('id' => 'printView'), 'print_view' @@ -4976,7 +4976,7 @@ class Results $results_operations_html .= Util::linkOrButton( 'tbl_export.php' . Url::getCommon($_url_params), Util::getIcon( - 'b_tblexport.png', __('Export'), true + 'b_tblexport', __('Export'), true ) ) . "\n"; @@ -4985,7 +4985,7 @@ class Results $results_operations_html .= Util::linkOrButton( 'tbl_chart.php' . Url::getCommon($_url_params), Util::getIcon( - 'b_chart.png', __('Display chart'), true + 'b_chart', __('Display chart'), true ) ) . "\n"; diff --git a/libraries/classes/Footer.php b/libraries/classes/Footer.php index efd21a6185..be2e2d0e6e 100644 --- a/libraries/classes/Footer.php +++ b/libraries/classes/Footer.php @@ -201,7 +201,7 @@ class Footer . ' title="' . __('Open new phpMyAdmin window') . '" target="_blank" rel="noopener noreferrer">'; if (Util::showIcons('TabsMode')) { $retval .= Util::getImage( - 'window-new.png', + 'window-new', __('Open new phpMyAdmin window') ); } else { diff --git a/libraries/classes/Header.php b/libraries/classes/Header.php index 94e6d8c35f..293b8a03d8 100644 --- a/libraries/classes/Header.php +++ b/libraries/classes/Header.php @@ -454,14 +454,14 @@ class Header $retval .= '<span id="lock_page_icon"></span>'; $retval .= '<span id="page_settings_icon">' . Util::getImage( - 's_cog.png', + 's_cog', __('Page-related settings') ) . '</span>'; $retval .= sprintf( '<a id="goto_pagetop" href="#">%s</a>', Util::getImage( - 's_top.png', + 's_top', __('Click on the bar to scroll to top of page') ) ); diff --git a/libraries/classes/Index.php b/libraries/classes/Index.php index 814bfc7127..5a354d5ca3 100644 --- a/libraries/classes/Index.php +++ b/libraries/classes/Index.php @@ -743,7 +743,7 @@ class Index . ' <a class="'; $r .= 'ajax'; $r .= '" href="tbl_indexes.php' . Url::getCommon($this_params) - . '">' . Util::getIcon('b_edit.png', __('Edit')) . '</a>' + . '">' . Util::getIcon('b_edit', __('Edit')) . '</a>' . '</td>' . "\n"; $this_params = $GLOBALS['url_params']; if ($index->getName() == 'PRIMARY') { @@ -770,7 +770,7 @@ class Index $r .= ' ajax'; $r .= '" href="sql.php' . Url::getCommon($this_params) . '" >' - . Util::getIcon('b_drop.png', __('Drop')) . '</a>' + . Util::getIcon('b_drop', __('Drop')) . '</a>' . '</td>' . "\n"; } diff --git a/libraries/classes/InsertEdit.php b/libraries/classes/InsertEdit.php index 1aef365b57..860aa13f94 100644 --- a/libraries/classes/InsertEdit.php +++ b/libraries/classes/InsertEdit.php @@ -1430,7 +1430,7 @@ class InsertEdit */ public static function getHtmlForGisDataTypes() { - $edit_str = Util::getIcon('b_edit.png', __('Edit/Insert')); + $edit_str = Util::getIcon('b_edit', __('Edit/Insert')); return '<span class="open_gis_editor">' . Util::linkOrButton( '#', $edit_str, array(), '_blank' diff --git a/libraries/classes/Menu.php b/libraries/classes/Menu.php index 2bbd48c75a..cc09ded310 100644 --- a/libraries/classes/Menu.php +++ b/libraries/classes/Menu.php @@ -199,7 +199,7 @@ class Menu $retval .= "<div id='serverinfo'>"; if (Util::showIcons('TabsMode')) { $retval .= Util::getImage( - 's_host.png', + 's_host', '', array('class' => 'item') ); @@ -218,7 +218,7 @@ class Menu $retval .= $separator; if (Util::showIcons('TabsMode')) { $retval .= Util::getImage( - 's_db.png', + 's_db', '', array('class' => 'item') ); @@ -250,7 +250,7 @@ class Menu } $retval .= $separator; if (Util::showIcons('TabsMode')) { - $icon = $tbl_is_view ? 'b_views.png' : 's_tbl.png'; + $icon = $tbl_is_view ? 'b_views' : 's_tbl'; $retval .= Util::getImage( $icon, '', @@ -340,12 +340,12 @@ class Menu $tabs = array(); - $tabs['browse']['icon'] = 'b_browse.png'; + $tabs['browse']['icon'] = 'b_browse'; $tabs['browse']['text'] = __('Browse'); $tabs['browse']['link'] = 'sql.php'; $tabs['browse']['args']['pos'] = 0; - $tabs['structure']['icon'] = 'b_props.png'; + $tabs['structure']['icon'] = 'b_props'; $tabs['structure']['link'] = 'tbl_structure.php'; $tabs['structure']['text'] = __('Structure'); $tabs['structure']['active'] = in_array( @@ -353,11 +353,11 @@ class Menu array('tbl_structure.php', 'tbl_relation.php') ); - $tabs['sql']['icon'] = 'b_sql.png'; + $tabs['sql']['icon'] = 'b_sql'; $tabs['sql']['link'] = 'tbl_sql.php'; $tabs['sql']['text'] = __('SQL'); - $tabs['search']['icon'] = 'b_search.png'; + $tabs['search']['icon'] = 'b_search'; $tabs['search']['text'] = __('Search'); $tabs['search']['link'] = 'tbl_select.php'; $tabs['search']['active'] = in_array( @@ -366,12 +366,12 @@ class Menu ); if (! $db_is_system_schema && (! $tbl_is_view || $updatable_view)) { - $tabs['insert']['icon'] = 'b_insrow.png'; + $tabs['insert']['icon'] = 'b_insrow'; $tabs['insert']['link'] = 'tbl_change.php'; $tabs['insert']['text'] = __('Insert'); } - $tabs['export']['icon'] = 'b_tblexport.png'; + $tabs['export']['icon'] = 'b_tblexport'; $tabs['export']['link'] = 'tbl_export.php'; $tabs['export']['args']['single_table'] = 'true'; $tabs['export']['text'] = __('Export'); @@ -380,7 +380,7 @@ class Menu * Don't display "Import" for views and information_schema */ if (! $tbl_is_view && ! $db_is_system_schema) { - $tabs['import']['icon'] = 'b_tblimport.png'; + $tabs['import']['icon'] = 'b_tblimport'; $tabs['import']['link'] = 'tbl_import.php'; $tabs['import']['text'] = __('Import'); } @@ -393,13 +393,13 @@ class Menu // stay on table view $tabs['privileges']['args']['viewing_mode'] = 'table'; $tabs['privileges']['text'] = __('Privileges'); - $tabs['privileges']['icon'] = 's_rights.png'; + $tabs['privileges']['icon'] = 's_rights'; } /** * Don't display "Operations" for views and information_schema */ if (! $tbl_is_view && ! $db_is_system_schema) { - $tabs['operation']['icon'] = 'b_tblops.png'; + $tabs['operation']['icon'] = 'b_tblops'; $tabs['operation']['link'] = 'tbl_operations.php'; $tabs['operation']['text'] = __('Operations'); } @@ -407,13 +407,13 @@ class Menu * Views support a limited number of operations */ if ($tbl_is_view && ! $db_is_system_schema) { - $tabs['operation']['icon'] = 'b_tblops.png'; + $tabs['operation']['icon'] = 'b_tblops'; $tabs['operation']['link'] = 'view_operations.php'; $tabs['operation']['text'] = __('Operations'); } if (Tracker::isActive() && ! $db_is_system_schema) { - $tabs['tracking']['icon'] = 'eye.png'; + $tabs['tracking']['icon'] = 'eye'; $tabs['tracking']['text'] = __('Tracking'); $tabs['tracking']['link'] = 'tbl_tracking.php'; } @@ -427,7 +427,7 @@ class Menu ) { $tabs['triggers']['link'] = 'tbl_triggers.php'; $tabs['triggers']['text'] = __('Triggers'); - $tabs['triggers']['icon'] = 'b_triggers.png'; + $tabs['triggers']['icon'] = 'b_triggers'; } return $tabs; @@ -455,28 +455,28 @@ class Menu $tabs['structure']['link'] = 'db_structure.php'; $tabs['structure']['text'] = __('Structure'); - $tabs['structure']['icon'] = 'b_props.png'; + $tabs['structure']['icon'] = 'b_props'; $tabs['sql']['link'] = 'db_sql.php'; $tabs['sql']['text'] = __('SQL'); - $tabs['sql']['icon'] = 'b_sql.png'; + $tabs['sql']['icon'] = 'b_sql'; $tabs['search']['text'] = __('Search'); - $tabs['search']['icon'] = 'b_search.png'; + $tabs['search']['icon'] = 'b_search'; $tabs['search']['link'] = 'db_search.php'; if ($num_tables == 0) { $tabs['search']['warning'] = __('Database seems to be empty!'); } $tabs['multi_table_query']['text'] = __('Query'); - $tabs['multi_table_query']['icon'] = 's_db.png'; + $tabs['multi_table_query']['icon'] = 's_db'; $tabs['multi_table_query']['link'] = 'db_multi_table_query.php'; if ($num_tables == 0) { $tabs['qbe']['warning'] = __('Database seems to be empty!'); } $tabs['export']['text'] = __('Export'); - $tabs['export']['icon'] = 'b_export.png'; + $tabs['export']['icon'] = 'b_export'; $tabs['export']['link'] = 'db_export.php'; if ($num_tables == 0) { $tabs['export']['warning'] = __('Database seems to be empty!'); @@ -485,11 +485,11 @@ class Menu if (! $db_is_system_schema) { $tabs['import']['link'] = 'db_import.php'; $tabs['import']['text'] = __('Import'); - $tabs['import']['icon'] = 'b_import.png'; + $tabs['import']['icon'] = 'b_import'; $tabs['operation']['link'] = 'db_operations.php'; $tabs['operation']['text'] = __('Operations'); - $tabs['operation']['icon'] = 'b_tblops.png'; + $tabs['operation']['icon'] = 'b_tblops'; if (($is_superuser || $isCreateOrGrantUser)) { $tabs['privileges']['link'] = 'server_privileges.php'; @@ -497,35 +497,35 @@ class Menu // stay on database view $tabs['privileges']['args']['viewing_mode'] = 'db'; $tabs['privileges']['text'] = __('Privileges'); - $tabs['privileges']['icon'] = 's_rights.png'; + $tabs['privileges']['icon'] = 's_rights'; } $tabs['routines']['link'] = 'db_routines.php'; $tabs['routines']['text'] = __('Routines'); - $tabs['routines']['icon'] = 'b_routines.png'; + $tabs['routines']['icon'] = 'b_routines'; if (Util::currentUserHasPrivilege('EVENT', $this->_db)) { $tabs['events']['link'] = 'db_events.php'; $tabs['events']['text'] = __('Events'); - $tabs['events']['icon'] = 'b_events.png'; + $tabs['events']['icon'] = 'b_events'; } if (Util::currentUserHasPrivilege('TRIGGER', $this->_db)) { $tabs['triggers']['link'] = 'db_triggers.php'; $tabs['triggers']['text'] = __('Triggers'); - $tabs['triggers']['icon'] = 'b_triggers.png'; + $tabs['triggers']['icon'] = 'b_triggers'; } } if (Tracker::isActive() && ! $db_is_system_schema) { $tabs['tracking']['text'] = __('Tracking'); - $tabs['tracking']['icon'] = 'eye.png'; + $tabs['tracking']['icon'] = 'eye'; $tabs['tracking']['link'] = 'db_tracking.php'; } if (! $db_is_system_schema) { $tabs['designer']['text'] = __('Designer'); - $tabs['designer']['icon'] = 'b_relations.png'; + $tabs['designer']['icon'] = 'b_relations'; $tabs['designer']['link'] = 'db_designer.php'; $tabs['designer']['id'] = 'designer_tab'; } @@ -534,7 +534,7 @@ class Menu && $cfgRelation['centralcolumnswork'] ) { $tabs['central_columns']['text'] = __('Central columns'); - $tabs['central_columns']['icon'] = 'centralColumns.png'; + $tabs['central_columns']['icon'] = 'centralColumns'; $tabs['central_columns']['link'] = 'db_central_columns.php'; } return $tabs; @@ -565,15 +565,15 @@ class Menu $tabs = array(); - $tabs['databases']['icon'] = 's_db.png'; + $tabs['databases']['icon'] = 's_db'; $tabs['databases']['link'] = 'server_databases.php'; $tabs['databases']['text'] = __('Databases'); - $tabs['sql']['icon'] = 'b_sql.png'; + $tabs['sql']['icon'] = 'b_sql'; $tabs['sql']['link'] = 'server_sql.php'; $tabs['sql']['text'] = __('SQL'); - $tabs['status']['icon'] = 's_status.png'; + $tabs['status']['icon'] = 's_status'; $tabs['status']['link'] = 'server_status.php'; $tabs['status']['text'] = __('Status'); $tabs['status']['active'] = in_array( @@ -589,7 +589,7 @@ class Menu ); if ($is_superuser || $isCreateOrGrantUser) { - $tabs['rights']['icon'] = 's_rights.png'; + $tabs['rights']['icon'] = 's_rights'; $tabs['rights']['link'] = 'server_privileges.php'; $tabs['rights']['text'] = __('User accounts'); $tabs['rights']['active'] = in_array( @@ -599,15 +599,15 @@ class Menu $tabs['rights']['args']['viewing_mode'] = 'server'; } - $tabs['export']['icon'] = 'b_export.png'; + $tabs['export']['icon'] = 'b_export'; $tabs['export']['link'] = 'server_export.php'; $tabs['export']['text'] = __('Export'); - $tabs['import']['icon'] = 'b_import.png'; + $tabs['import']['icon'] = 'b_import'; $tabs['import']['link'] = 'server_import.php'; $tabs['import']['text'] = __('Import'); - $tabs['settings']['icon'] = 'b_tblops.png'; + $tabs['settings']['icon'] = 'b_tblops'; $tabs['settings']['link'] = 'prefs_manage.php'; $tabs['settings']['text'] = __('Settings'); $tabs['settings']['active'] = in_array( @@ -616,30 +616,30 @@ class Menu ); if (! empty($binary_logs)) { - $tabs['binlog']['icon'] = 's_tbl.png'; + $tabs['binlog']['icon'] = 's_tbl'; $tabs['binlog']['link'] = 'server_binlog.php'; $tabs['binlog']['text'] = __('Binary log'); } if ($is_superuser) { - $tabs['replication']['icon'] = 's_replication.png'; + $tabs['replication']['icon'] = 's_replication'; $tabs['replication']['link'] = 'server_replication.php'; $tabs['replication']['text'] = __('Replication'); } - $tabs['vars']['icon'] = 's_vars.png'; + $tabs['vars']['icon'] = 's_vars'; $tabs['vars']['link'] = 'server_variables.php'; $tabs['vars']['text'] = __('Variables'); - $tabs['charset']['icon'] = 's_asci.png'; + $tabs['charset']['icon'] = 's_asci'; $tabs['charset']['link'] = 'server_collations.php'; $tabs['charset']['text'] = __('Charsets'); - $tabs['engine']['icon'] = 'b_engine.png'; + $tabs['engine']['icon'] = 'b_engine'; $tabs['engine']['link'] = 'server_engines.php'; $tabs['engine']['text'] = __('Engines'); - $tabs['plugins']['icon'] = 'b_plugin.png'; + $tabs['plugins']['icon'] = 'b_plugin'; $tabs['plugins']['link'] = 'server_plugins.php'; $tabs['plugins']['text'] = __('Plugins'); diff --git a/libraries/classes/Message.php b/libraries/classes/Message.php index e850db365f..efeeca673a 100644 --- a/libraries/classes/Message.php +++ b/libraries/classes/Message.php @@ -805,11 +805,11 @@ class Message public function getMessageWithIcon($message) { if ('error' == $this->getLevel()) { - $image = 's_error.png'; + $image = 's_error'; } elseif ('success' == $this->getLevel()) { - $image = 's_success.png'; + $image = 's_success'; } else { - $image = 's_notice.png'; + $image = 's_notice'; } $message = Message::notice(Util::getImage($image)) . " " . $message; return $message; diff --git a/libraries/classes/Navigation/NavigationHeader.php b/libraries/classes/Navigation/NavigationHeader.php index 95448a818c..5b6408ec67 100644 --- a/libraries/classes/Navigation/NavigationHeader.php +++ b/libraries/classes/Navigation/NavigationHeader.php @@ -57,7 +57,7 @@ class NavigationHeader $buffer .= $this->_links(); $buffer .= $this->_serverChoice(); $buffer .= Util::getImage( - 'ajax_clock_small.gif', + 'ajax_clock_small', __('Loading…'), array( 'style' => 'visibility: hidden; display:none', @@ -164,7 +164,7 @@ class NavigationHeader $showText, __('Home'), $showIcon, - 'b_home.png' + 'b_home' ); // if we have chosen server if ($GLOBALS['server'] != 0) { @@ -180,7 +180,7 @@ class NavigationHeader $showText, $text, $showIcon, - 's_loggoff.png', + 's_loggoff', '', true, '', @@ -192,7 +192,7 @@ class NavigationHeader $showText, __('phpMyAdmin documentation'), $showIcon, - 'b_docs.png', + 'b_docs', '', false, 'documentation' @@ -202,7 +202,7 @@ class NavigationHeader $showText, __('Documentation'), $showIcon, - 'b_sqlhelp.png', + 'b_sqlhelp', '', false, 'mysql_doc' @@ -212,7 +212,7 @@ class NavigationHeader $showText, __('Navigation panel settings'), $showIcon, - 's_cog.png', + 's_cog', 'pma_navigation_settings_icon', false, '', @@ -223,7 +223,7 @@ class NavigationHeader $showText, __('Reload navigation panel'), $showIcon, - 's_reload.png', + 's_reload', 'pma_navigation_reload' ); $retval .= '</div>'; diff --git a/libraries/classes/Navigation/NavigationTree.php b/libraries/classes/Navigation/NavigationTree.php index 806e24a8d0..1deb3a9f46 100644 --- a/libraries/classes/Navigation/NavigationTree.php +++ b/libraries/classes/Navigation/NavigationTree.php @@ -769,7 +769,7 @@ class NavigationTree $groups[$key]->separator = $node->separator; $groups[$key]->separator_depth = $node->separator_depth - 1; $groups[$key]->icon = Util::getImage( - 'b_group.png' + 'b_group' ); $groups[$key]->pos2 = $node->pos2; $groups[$key]->pos3 = $node->pos3; @@ -1424,13 +1424,13 @@ class NavigationTree $showText, __('Collapse all'), $showIcon, - 's_collapseall.png', + 's_collapseall', 'pma_navigation_collapse' ); - $syncImage = 's_unlink.png'; + $syncImage = 's_unlink'; $title = __('Link with main panel'); if ($GLOBALS['cfg']['NavigationLinkWithMainPanel']) { - $syncImage = 's_link.png'; + $syncImage = 's_link'; $title = __('Unlink from main panel'); } $retval .= Util::getNavigationLink( diff --git a/libraries/classes/Navigation/Nodes/Node.php b/libraries/classes/Navigation/Nodes/Node.php index 379c5e0c7b..01cc0b5fd6 100644 --- a/libraries/classes/Navigation/Nodes/Node.php +++ b/libraries/classes/Navigation/Nodes/Node.php @@ -795,9 +795,9 @@ class Node } elseif ($match && !$this->is_group) { $this->visible = true; - return Util::getImage('b_minus.png'); + return Util::getImage('b_minus'); } else { - return Util::getImage('b_plus.png', __('Expand/Collapse')); + return Util::getImage('b_plus', __('Expand/Collapse')); } } diff --git a/libraries/classes/Navigation/Nodes/NodeColumn.php b/libraries/classes/Navigation/Nodes/NodeColumn.php index e7215f88b7..876cb22151 100644 --- a/libraries/classes/Navigation/Nodes/NodeColumn.php +++ b/libraries/classes/Navigation/Nodes/NodeColumn.php @@ -27,7 +27,7 @@ class NodeColumn extends Node public function __construct($name, $type = Node::OBJECT, $is_group = false) { parent::__construct($name, $type, $is_group); - $this->icon = Util::getImage('pause.png', __('Column')); + $this->icon = Util::getImage('pause', __('Column')); $this->links = array( 'text' => 'tbl_structure.php?server=' . $GLOBALS['server'] . '&db=%3$s&table=%2$s&field=%1$s' diff --git a/libraries/classes/Navigation/Nodes/NodeColumnContainer.php b/libraries/classes/Navigation/Nodes/NodeColumnContainer.php index 927718c08d..eaa7c9c0a5 100644 --- a/libraries/classes/Navigation/Nodes/NodeColumnContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeColumnContainer.php @@ -23,7 +23,7 @@ class NodeColumnContainer extends Node public function __construct() { parent::__construct(__('Columns'), Node::CONTAINER); - $this->icon = Util::getImage('pause.png', __('Columns')); + $this->icon = Util::getImage('pause', __('Columns')); $this->links = array( 'text' => 'tbl_structure.php?server=' . $GLOBALS['server'] . '&db=%2$s&table=%1$s', @@ -38,7 +38,7 @@ class NodeColumnContainer extends Node $new_label ); $new->isNew = true; - $new->icon = Util::getImage('b_column_add.png', $new_label); + $new->icon = Util::getImage('b_column_add', $new_label); $new->links = array( 'text' => 'tbl_addfield.php?server=' . $GLOBALS['server'] . '&db=%3$s&table=%2$s' diff --git a/libraries/classes/Navigation/Nodes/NodeDatabase.php b/libraries/classes/Navigation/Nodes/NodeDatabase.php index 27ab2559d9..67d1f9ecee 100644 --- a/libraries/classes/Navigation/Nodes/NodeDatabase.php +++ b/libraries/classes/Navigation/Nodes/NodeDatabase.php @@ -37,7 +37,7 @@ class NodeDatabase extends Node { parent::__construct($name, $type, $is_group); $this->icon = Util::getImage( - 's_db.png', + 's_db', __('Database operations') ); @@ -681,7 +681,7 @@ class NodeDatabase extends Node . Url::getCommon($params) . '"' . ' class="showUnhide ajax">' . Util::getImage( - 'show.png', + 'show', __('Show hidden items') ) . '</a></span>'; diff --git a/libraries/classes/Navigation/Nodes/NodeDatabaseChild.php b/libraries/classes/Navigation/Nodes/NodeDatabaseChild.php index 7a7d5cbff4..e08ae1d853 100644 --- a/libraries/classes/Navigation/Nodes/NodeDatabaseChild.php +++ b/libraries/classes/Navigation/Nodes/NodeDatabaseChild.php @@ -51,7 +51,7 @@ abstract class NodeDatabaseChild extends Node . '<a href="navigation.php' . Url::getCommon($params) . '"' . ' class="hideNavItem ajax">' - . Util::getImage('hide.png', __('Hide')) + . Util::getImage('hide', __('Hide')) . '</a></span>'; } diff --git a/libraries/classes/Navigation/Nodes/NodeDatabaseContainer.php b/libraries/classes/Navigation/Nodes/NodeDatabaseContainer.php index fd6859a839..33a9913d21 100644 --- a/libraries/classes/Navigation/Nodes/NodeDatabaseContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeDatabaseContainer.php @@ -36,7 +36,7 @@ class NodeDatabaseContainer extends Node _pgettext('Create new database', 'New') ); $new->isNew = true; - $new->icon = Util::getImage('b_newdb.png', ''); + $new->icon = Util::getImage('b_newdb', ''); $new->links = array( 'text' => 'server_databases.php?server=' . $GLOBALS['server'], 'icon' => 'server_databases.php?server=' . $GLOBALS['server'], diff --git a/libraries/classes/Navigation/Nodes/NodeEvent.php b/libraries/classes/Navigation/Nodes/NodeEvent.php index 03015b19f8..0737fcce35 100644 --- a/libraries/classes/Navigation/Nodes/NodeEvent.php +++ b/libraries/classes/Navigation/Nodes/NodeEvent.php @@ -27,7 +27,7 @@ class NodeEvent extends NodeDatabaseChild public function __construct($name, $type = Node::OBJECT, $is_group = false) { parent::__construct($name, $type, $is_group); - $this->icon = Util::getImage('b_events.png'); + $this->icon = Util::getImage('b_events'); $this->links = array( 'text' => 'db_events.php?server=' . $GLOBALS['server'] . '&db=%2$s&item_name=%1$s&edit_item=1', diff --git a/libraries/classes/Navigation/Nodes/NodeEventContainer.php b/libraries/classes/Navigation/Nodes/NodeEventContainer.php index 7c4b61cecb..0231c94d6b 100644 --- a/libraries/classes/Navigation/Nodes/NodeEventContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeEventContainer.php @@ -23,7 +23,7 @@ class NodeEventContainer extends NodeDatabaseChildContainer public function __construct() { parent::__construct(__('Events'), Node::CONTAINER); - $this->icon = Util::getImage('b_events.png', ''); + $this->icon = Util::getImage('b_events', ''); $this->links = array( 'text' => 'db_events.php?server=' . $GLOBALS['server'] . '&db=%1$s', @@ -37,7 +37,7 @@ class NodeEventContainer extends NodeDatabaseChildContainer _pgettext('Create new event', 'New') ); $new->isNew = true; - $new->icon = Util::getImage('b_event_add.png', ''); + $new->icon = Util::getImage('b_event_add', ''); $new->links = array( 'text' => 'db_events.php?server=' . $GLOBALS['server'] . '&db=%2$s&add_item=1', diff --git a/libraries/classes/Navigation/Nodes/NodeFunction.php b/libraries/classes/Navigation/Nodes/NodeFunction.php index dea19ddc33..2f5cd38187 100644 --- a/libraries/classes/Navigation/Nodes/NodeFunction.php +++ b/libraries/classes/Navigation/Nodes/NodeFunction.php @@ -27,7 +27,7 @@ class NodeFunction extends NodeDatabaseChild public function __construct($name, $type = Node::OBJECT, $is_group = false) { parent::__construct($name, $type, $is_group); - $this->icon = Util::getImage('b_routines.png', __('Function')); + $this->icon = Util::getImage('b_routines', __('Function')); $this->links = array( 'text' => 'db_routines.php?server=' . $GLOBALS['server'] . '&db=%2$s&item_name=%1$s&item_type=FUNCTION' diff --git a/libraries/classes/Navigation/Nodes/NodeFunctionContainer.php b/libraries/classes/Navigation/Nodes/NodeFunctionContainer.php index 9ff6de783d..bf092edcae 100644 --- a/libraries/classes/Navigation/Nodes/NodeFunctionContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeFunctionContainer.php @@ -23,10 +23,7 @@ class NodeFunctionContainer extends NodeDatabaseChildContainer public function __construct() { parent::__construct(__('Functions'), Node::CONTAINER); - $this->icon = Util::getImage( - 'b_routines.png', - __('Functions') - ); + $this->icon = Util::getImage('b_routines', __('Functions')); $this->links = array( 'text' => 'db_routines.php?server=' . $GLOBALS['server'] . '&db=%1$s&type=FUNCTION', @@ -41,7 +38,7 @@ class NodeFunctionContainer extends NodeDatabaseChildContainer $new_label ); $new->isNew = true; - $new->icon = Util::getImage('b_routine_add.png', $new_label); + $new->icon = Util::getImage('b_routine_add', $new_label); $new->links = array( 'text' => 'db_routines.php?server=' . $GLOBALS['server'] . '&db=%2$s&add_item=1&item_type=FUNCTION', diff --git a/libraries/classes/Navigation/Nodes/NodeIndex.php b/libraries/classes/Navigation/Nodes/NodeIndex.php index 359b905737..332cc2ce6f 100644 --- a/libraries/classes/Navigation/Nodes/NodeIndex.php +++ b/libraries/classes/Navigation/Nodes/NodeIndex.php @@ -27,7 +27,7 @@ class NodeIndex extends Node public function __construct($name, $type = Node::OBJECT, $is_group = false) { parent::__construct($name, $type, $is_group); - $this->icon = Util::getImage('b_index.png', __('Index')); + $this->icon = Util::getImage('b_index', __('Index')); $this->links = array( 'text' => 'tbl_indexes.php?server=' . $GLOBALS['server'] . '&db=%3$s&table=%2$s&index=%1$s', diff --git a/libraries/classes/Navigation/Nodes/NodeIndexContainer.php b/libraries/classes/Navigation/Nodes/NodeIndexContainer.php index 2e28dfd4a7..39ba9ee70a 100644 --- a/libraries/classes/Navigation/Nodes/NodeIndexContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeIndexContainer.php @@ -23,7 +23,7 @@ class NodeIndexContainer extends Node public function __construct() { parent::__construct(__('Indexes'), Node::CONTAINER); - $this->icon = Util::getImage('b_index.png', __('Indexes')); + $this->icon = Util::getImage('b_index', __('Indexes')); $this->links = array( 'text' => 'tbl_structure.php?server=' . $GLOBALS['server'] . '&db=%2$s&table=%1$s', @@ -38,7 +38,7 @@ class NodeIndexContainer extends Node $new_label ); $new->isNew = true; - $new->icon = Util::getImage('b_index_add.png', $new_label); + $new->icon = Util::getImage('b_index_add', $new_label); $new->links = array( 'text' => 'tbl_indexes.php?server=' . $GLOBALS['server'] . '&create_index=1&added_fields=2' diff --git a/libraries/classes/Navigation/Nodes/NodeProcedure.php b/libraries/classes/Navigation/Nodes/NodeProcedure.php index e442503d38..e9a74eb044 100644 --- a/libraries/classes/Navigation/Nodes/NodeProcedure.php +++ b/libraries/classes/Navigation/Nodes/NodeProcedure.php @@ -27,10 +27,7 @@ class NodeProcedure extends NodeDatabaseChild public function __construct($name, $type = Node::OBJECT, $is_group = false) { parent::__construct($name, $type, $is_group); - $this->icon = Util::getImage( - 'b_routines.png', - __('Procedure') - ); + $this->icon = Util::getImage('b_routines', __('Procedure')); $this->links = array( 'text' => 'db_routines.php?server=' . $GLOBALS['server'] . '&db=%2$s&item_name=%1$s&item_type=PROCEDURE' diff --git a/libraries/classes/Navigation/Nodes/NodeProcedureContainer.php b/libraries/classes/Navigation/Nodes/NodeProcedureContainer.php index f9ed5ea138..e4eb0fa8c4 100644 --- a/libraries/classes/Navigation/Nodes/NodeProcedureContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeProcedureContainer.php @@ -23,10 +23,7 @@ class NodeProcedureContainer extends NodeDatabaseChildContainer public function __construct() { parent::__construct(__('Procedures'), Node::CONTAINER); - $this->icon = Util::getImage( - 'b_routines.png', - __('Procedures') - ); + $this->icon = Util::getImage('b_routines', __('Procedures')); $this->links = array( 'text' => 'db_routines.php?server=' . $GLOBALS['server'] . '&db=%1$s&type=PROCEDURE', @@ -41,7 +38,7 @@ class NodeProcedureContainer extends NodeDatabaseChildContainer $new_label ); $new->isNew = true; - $new->icon = Util::getImage('b_routine_add.png', $new_label); + $new->icon = Util::getImage('b_routine_add', $new_label); $new->links = array( 'text' => 'db_routines.php?server=' . $GLOBALS['server'] . '&db=%2$s&add_item=1', diff --git a/libraries/classes/Navigation/Nodes/NodeTable.php b/libraries/classes/Navigation/Nodes/NodeTable.php index f11a99ad68..cafe3065e6 100644 --- a/libraries/classes/Navigation/Nodes/NodeTable.php +++ b/libraries/classes/Navigation/Nodes/NodeTable.php @@ -285,31 +285,19 @@ class NodeTable extends NodeDatabaseChild switch ($page) { case 'tbl_structure.php': - $this->icon[] = Util::getImage( - 'b_props.png', - __('Structure') - ); + $this->icon[] = Util::getImage('b_props', __('Structure')); break; case 'tbl_select.php': - $this->icon[] = Util::getImage( - 'b_search.png', - __('Search') - ); + $this->icon[] = Util::getImage('b_search', __('Search')); break; case 'tbl_change.php': - $this->icon[] = Util::getImage( - 'b_insrow.png', - __('Insert') - ); + $this->icon[] = Util::getImage('b_insrow', __('Insert')); break; case 'tbl_sql.php': - $this->icon[] = Util::getImage('b_sql.png', __('SQL')); + $this->icon[] = Util::getImage('b_sql', __('SQL')); break; case 'sql.php': - $this->icon[] = Util::getImage( - 'b_browse.png', - __('Browse') - ); + $this->icon[] = Util::getImage('b_browse', __('Browse')); break; } } diff --git a/libraries/classes/Navigation/Nodes/NodeTableContainer.php b/libraries/classes/Navigation/Nodes/NodeTableContainer.php index cf6880adf2..e0a30cf730 100644 --- a/libraries/classes/Navigation/Nodes/NodeTableContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeTableContainer.php @@ -23,7 +23,7 @@ class NodeTableContainer extends NodeDatabaseChildContainer public function __construct() { parent::__construct(__('Tables'), Node::CONTAINER); - $this->icon = Util::getImage('b_browse.png', __('Tables')); + $this->icon = Util::getImage('b_browse', __('Tables')); $this->links = array( 'text' => 'db_structure.php?server=' . $GLOBALS['server'] . '&db=%1$s&tbl_type=table', @@ -39,7 +39,7 @@ class NodeTableContainer extends NodeDatabaseChildContainer $new_label ); $new->isNew = true; - $new->icon = Util::getImage('b_table_add.png', $new_label); + $new->icon = Util::getImage('b_table_add', $new_label); $new->links = array( 'text' => 'tbl_create.php?server=' . $GLOBALS['server'] . '&db=%2$s', diff --git a/libraries/classes/Navigation/Nodes/NodeTrigger.php b/libraries/classes/Navigation/Nodes/NodeTrigger.php index 8ba7c35ea0..af88444f64 100644 --- a/libraries/classes/Navigation/Nodes/NodeTrigger.php +++ b/libraries/classes/Navigation/Nodes/NodeTrigger.php @@ -27,7 +27,7 @@ class NodeTrigger extends Node public function __construct($name, $type = Node::OBJECT, $is_group = false) { parent::__construct($name, $type, $is_group); - $this->icon = Util::getImage('b_triggers.png'); + $this->icon = Util::getImage('b_triggers'); $this->links = array( 'text' => 'db_triggers.php?server=' . $GLOBALS['server'] . '&db=%3$s&item_name=%1$s&edit_item=1', diff --git a/libraries/classes/Navigation/Nodes/NodeTriggerContainer.php b/libraries/classes/Navigation/Nodes/NodeTriggerContainer.php index 989c2692ce..77cfc73117 100644 --- a/libraries/classes/Navigation/Nodes/NodeTriggerContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeTriggerContainer.php @@ -23,7 +23,7 @@ class NodeTriggerContainer extends Node public function __construct() { parent::__construct(__('Triggers'), Node::CONTAINER); - $this->icon = Util::getImage('b_triggers.png'); + $this->icon = Util::getImage('b_triggers'); $this->links = array( 'text' => 'db_triggers.php?server=' . $GLOBALS['server'] . '&db=%2$s&table=%1$s', @@ -37,7 +37,7 @@ class NodeTriggerContainer extends Node _pgettext('Create new trigger', 'New') ); $new->isNew = true; - $new->icon = Util::getImage('b_trigger_add.png', ''); + $new->icon = Util::getImage('b_trigger_add', ''); $new->links = array( 'text' => 'db_triggers.php?server=' . $GLOBALS['server'] . '&db=%3$s&add_item=1', diff --git a/libraries/classes/Navigation/Nodes/NodeView.php b/libraries/classes/Navigation/Nodes/NodeView.php index 987aba119d..e7dd5185b7 100644 --- a/libraries/classes/Navigation/Nodes/NodeView.php +++ b/libraries/classes/Navigation/Nodes/NodeView.php @@ -27,7 +27,7 @@ class NodeView extends NodeDatabaseChild public function __construct($name, $type = Node::OBJECT, $is_group = false) { parent::__construct($name, $type, $is_group); - $this->icon = Util::getImage('b_props.png', __('View')); + $this->icon = Util::getImage('b_props', __('View')); $this->links = array( 'text' => 'sql.php?server=' . $GLOBALS['server'] . '&db=%2$s&table=%1$s&pos=0', diff --git a/libraries/classes/Navigation/Nodes/NodeViewContainer.php b/libraries/classes/Navigation/Nodes/NodeViewContainer.php index 394173a783..dfb97c49a3 100644 --- a/libraries/classes/Navigation/Nodes/NodeViewContainer.php +++ b/libraries/classes/Navigation/Nodes/NodeViewContainer.php @@ -23,7 +23,7 @@ class NodeViewContainer extends NodeDatabaseChildContainer public function __construct() { parent::__construct(__('Views'), Node::CONTAINER); - $this->icon = Util::getImage('b_views.png', __('Views')); + $this->icon = Util::getImage('b_views', __('Views')); $this->links = array( 'text' => 'db_structure.php?server=' . $GLOBALS['server'] . '&db=%1$s&tbl_type=view', @@ -39,7 +39,7 @@ class NodeViewContainer extends NodeDatabaseChildContainer $new_label ); $new->isNew = true; - $new->icon = Util::getImage('b_view_add.png', $new_label); + $new->icon = Util::getImage('b_view_add', $new_label); $new->links = array( 'text' => 'view_create.php?server=' . $GLOBALS['server'] . '&db=%2$s', diff --git a/libraries/classes/Normalization.php b/libraries/classes/Normalization.php index 53be690025..f591128596 100644 --- a/libraries/classes/Normalization.php +++ b/libraries/classes/Normalization.php @@ -220,7 +220,7 @@ class Normalization ); $subText = '<a href="#" id="createPrimaryKey">' . Util::getIcon( - 'b_index_add.png', __( + 'b_index_add', __( 'Add a primary key on existing column(s)' ) ) diff --git a/libraries/classes/Operations.php b/libraries/classes/Operations.php index b8b3e3069f..ed7c86b24e 100644 --- a/libraries/classes/Operations.php +++ b/libraries/classes/Operations.php @@ -42,7 +42,7 @@ class Operations . '<fieldset>' . '<legend>'; if (Util::showIcons('ActionLinksMode')) { - $html_output .= Util::getImage('b_comment.png') . ' '; + $html_output .= Util::getImage('b_comment') . ' '; } $html_output .= __('Database comment'); $html_output .= '</legend>'; @@ -85,7 +85,7 @@ class Operations . '<legend>'; if (Util::showIcons('ActionLinksMode')) { - $html_output .= Util::getImage('b_edit.png') . ' '; + $html_output .= Util::getImage('b_edit') . ' '; } $html_output .= __('Rename database to') . '</legend>'; @@ -151,7 +151,7 @@ class Operations . '<fieldset class="caution">'; $html_output .= '<legend>'; if (Util::showIcons('ActionLinksMode')) { - $html_output .= Util::getImage('b_deltbl.png') . ' '; + $html_output .= Util::getImage('b_deltbl') . ' '; } $html_output .= __('Remove database') . '</legend>'; @@ -207,7 +207,7 @@ class Operations . '<legend>'; if (Util::showIcons('ActionLinksMode')) { - $html_output .= Util::getImage('b_edit.png') . ' '; + $html_output .= Util::getImage('b_edit') . ' '; } $html_output .= __('Copy database to') . '</legend>' @@ -293,7 +293,7 @@ class Operations $html_output .= '<fieldset>' . "\n" . ' <legend>'; if (Util::showIcons('ActionLinksMode')) { - $html_output .= Util::getImage('s_asci.png') . ' '; + $html_output .= Util::getImage('s_asci') . ' '; } $html_output .= '<label for="select_db_collation">' . __('Collation') . '</label>' . "\n" diff --git a/libraries/classes/RecentFavoriteTable.php b/libraries/classes/RecentFavoriteTable.php index a24c7f08b5..848d3d5c5a 100644 --- a/libraries/classes/RecentFavoriteTable.php +++ b/libraries/classes/RecentFavoriteTable.php @@ -214,7 +214,7 @@ class RecentFavoriteTable . '" data-favtargetn="' . md5($table['db'] . "." . $table['table']) . '" >' - . Util::getIcon('b_favorite.png') + . Util::getIcon('b_favorite') . '</a>'; $fav_params = array( diff --git a/libraries/classes/Rte/RteList.php b/libraries/classes/Rte/RteList.php index cb69e1cd16..70247a5f1b 100644 --- a/libraries/classes/Rte/RteList.php +++ b/libraries/classes/Rte/RteList.php @@ -165,11 +165,11 @@ class RteList ); $retval .= Util::getButtonOrImage( 'submit_mult', 'mult_submit', - __('Export'), 'b_export.png', 'export' + __('Export'), 'b_export', 'export' ); $retval .= Util::getButtonOrImage( 'submit_mult', 'mult_submit', - __('Drop'), 'b_drop.png', 'drop' + __('Drop'), 'b_drop', 'drop' ); $retval .= '</div>'; } diff --git a/libraries/classes/Sanitize.php b/libraries/classes/Sanitize.php index b0c68ce712..e15f4ba06b 100644 --- a/libraries/classes/Sanitize.php +++ b/libraries/classes/Sanitize.php @@ -188,7 +188,7 @@ class Sanitize // used in common.inc.php: '[conferr]' => '<iframe src="show_config_errors.php"><a href="show_config_errors.php">show_config_errors.php</a></iframe>', // used in libraries/Util.php - '[dochelpicon]' => Util::getImage('b_help.png', __('Documentation')), + '[dochelpicon]' => Util::getImage('b_help', __('Documentation')), ); $message = strtr($message, $replace_pairs); diff --git a/libraries/classes/Server/Privileges.php b/libraries/classes/Server/Privileges.php index 072ea9dc3f..810edc4bbf 100644 --- a/libraries/classes/Server/Privileges.php +++ b/libraries/classes/Server/Privileges.php @@ -2143,7 +2143,7 @@ class Privileges public static function getHtmlForAddUser($dbname) { $html_output = '<h2>' . "\n" - . Util::getIcon('b_usradd.png') . __('Add user account') . "\n" + . Util::getIcon('b_usradd') . __('Add user account') . "\n" . '</h2>' . "\n" . '<form name="usersForm" id="addUsersForm"' . ' onsubmit="return checkAddUser(this);"' @@ -2353,7 +2353,7 @@ class Privileges $html_output .= '<div class="width100">'; $html_output .= '<fieldset>'; $html_output .= '<legend>' . "\n" - . Util::getIcon('b_usrcheck.png') + . Util::getIcon('b_usrcheck') . ' ' . sprintf( __('Users having access to "%s"'), @@ -2386,7 +2386,7 @@ class Privileges ); $html_output .= Util::getButtonOrImage( 'submit_mult', 'mult_submit', - __('Export'), 'b_tblexport.png', 'export' + __('Export'), 'b_tblexport', 'export' ); $html_output .= '</fieldset>'; @@ -2428,7 +2428,7 @@ class Privileges $html_output .= Url::getHiddenInputs($db, $table); $html_output .= '<fieldset>'; $html_output .= '<legend>' - . Util::getIcon('b_usrcheck.png') + . Util::getIcon('b_usrcheck') . sprintf( __('Users having access to "%s"'), '<a href="' . Util::getScriptNameForOption( @@ -2472,7 +2472,7 @@ class Privileges ); $html_output .= Util::getButtonOrImage( 'submit_mult', 'mult_submit', - __('Export'), 'b_tblexport.png', 'export' + __('Export'), 'b_tblexport', 'export' ); $html_output .= '</fieldset>'; @@ -2819,13 +2819,13 @@ class Privileges switch($linktype) { case 'edit': - $html .= Util::getIcon('b_usredit.png', __('Edit privileges')); + $html .= Util::getIcon('b_usredit', __('Edit privileges')); break; case 'revoke': - $html .= Util::getIcon('b_usrdrop.png', __('Revoke')); + $html .= Util::getIcon('b_usrdrop', __('Revoke')); break; case 'export': - $html .= Util::getIcon('b_tblexport.png', __('Export')); + $html .= Util::getIcon('b_tblexport', __('Export')); break; } $html .= '</a>'; @@ -2846,7 +2846,7 @@ class Privileges . ' href="server_privileges.php' . Url::getCommon(array('username' => $username)) . '">' - . Util::getIcon('b_usrlist.png', __('Edit user group')) + . Util::getIcon('b_usrlist', __('Edit user group')) . '</a>'; } @@ -3553,7 +3553,7 @@ class Privileges ) . "\n"; $html_output .= Util::getButtonOrImage( 'submit_mult', 'mult_submit', - __('Export'), 'b_tblexport.png', 'export' + __('Export'), 'b_tblexport', 'export' ); $html_output .= '<input type="hidden" name="initial" ' . 'value="' . (isset($_GET['initial']) ? htmlspecialchars($_GET['initial']) : '') . '" />'; @@ -4501,7 +4501,7 @@ class Privileges $username, $hostname, $entity_name, $entity_type='table' ) { $html_output = '<h2>' . "\n" - . Util::getIcon('b_usredit.png') + . Util::getIcon('b_usredit') . __('Edit privileges:') . ' ' . __('User account'); @@ -4596,7 +4596,7 @@ class Privileges public static function getHtmlForUserOverview($pmaThemeImage, $text_dir) { $html_output = '<h2>' . "\n" - . Util::getIcon('b_usrlist.png') + . Util::getIcon('b_usrlist') . __('User accounts overview') . "\n" . '</h2>' . "\n"; diff --git a/libraries/classes/Server/Status/Advisor.php b/libraries/classes/Server/Status/Advisor.php index 753cacf2c1..2356c710f2 100644 --- a/libraries/classes/Server/Status/Advisor.php +++ b/libraries/classes/Server/Status/Advisor.php @@ -26,7 +26,7 @@ class Advisor public static function getHtml() { $output = '<a href="#openAdvisorInstructions">'; - $output .= Util::getIcon('b_help.png', __('Instructions')); + $output .= Util::getIcon('b_help', __('Instructions')); $output .= '</a>'; $output .= '<div id="statustabs_advisor"></div>'; $output .= '<div id="advisorInstructionsDialog" class="hide">'; diff --git a/libraries/classes/Server/Status/Monitor.php b/libraries/classes/Server/Status/Monitor.php index d1c7330e0e..111bee9c20 100644 --- a/libraries/classes/Server/Status/Monitor.php +++ b/libraries/classes/Server/Status/Monitor.php @@ -149,7 +149,7 @@ class Monitor ); $retval .= '</p>'; $retval .= '<p>'; - $retval .= Util::getImage('s_attention.png'); + $retval .= Util::getImage('s_attention'); $retval .= '<strong>'; $retval .= __('Please note:'); $retval .= '</strong><br />'; @@ -258,15 +258,15 @@ class Monitor { $retval = '<div class="tabLinks">'; $retval .= '<a href="#pauseCharts">'; - $retval .= Util::getImage('play.png') . __('Start Monitor'); + $retval .= Util::getImage('play') . __('Start Monitor'); $retval .= '</a>'; $retval .= '<a href="#settingsPopup" class="popupLink">'; - $retval .= Util::getImage('s_cog.png') . __('Settings'); + $retval .= Util::getImage('s_cog') . __('Settings'); $retval .= '</a>'; $retval .= '<a href="#monitorInstructionsDialog">'; - $retval .= Util::getImage('b_help.png') . __('Instructions/Setup'); + $retval .= Util::getImage('b_help') . __('Instructions/Setup'); $retval .= '<a href="#endChartEditMode" class="hide">'; - $retval .= Util::getImage('s_okay.png'); + $retval .= Util::getImage('s_okay'); $retval .= __('Done dragging (rearranging) charts'); $retval .= '</a>'; $retval .= '</div>'; @@ -283,10 +283,10 @@ class Monitor { $retval = '<div class="popupContent settingsPopup">'; $retval .= '<a href="#addNewChart">'; - $retval .= Util::getImage('b_chart.png') . __('Add chart'); + $retval .= Util::getImage('b_chart') . __('Add chart'); $retval .= '</a>'; $retval .= '<a href="#rearrangeCharts">'; - $retval .= Util::getImage('b_tblops.png') + $retval .= Util::getImage('b_tblops') . __('Enable charts dragging'); $retval .= '</a>'; $retval .= '<div class="clearfloat paddingtop"></div>'; diff --git a/libraries/classes/Server/Status/Processes.php b/libraries/classes/Server/Status/Processes.php index a310549479..463a1caae4 100644 --- a/libraries/classes/Server/Status/Processes.php +++ b/libraries/classes/Server/Status/Processes.php @@ -43,7 +43,7 @@ class Processes ); $retval .= '</label>'; $retval .= '<a id="toggleRefresh" href="#">'; - $retval .= Util::getImage('play.png') . __('Start auto refresh'); + $retval .= Util::getImage('play') . __('Start auto refresh'); $retval .= '</a>'; $retval .= '</div>'; return $retval; @@ -178,15 +178,9 @@ class Processes if (0 === --$sortableColCount) { $retval .= '<a href="' . $full_text_link . '">'; if ($show_full_sql) { - $retval .= Util::getImage( - 's_partialtext.png', - __('Truncate Shown Queries') - ); + $retval .= Util::getImage('s_partialtext', __('Truncate Shown Queries')); } else { - $retval .= Util::getImage( - 's_fulltext.png', - __('Show Full Queries') - ); + $retval .= Util::getImage('s_fulltext', __('Show Full Queries')); } $retval .= '</a>'; } diff --git a/libraries/classes/Server/UserGroups.php b/libraries/classes/Server/UserGroups.php index b6c648b854..0757e87b3a 100644 --- a/libraries/classes/Server/UserGroups.php +++ b/libraries/classes/Server/UserGroups.php @@ -115,7 +115,7 @@ class UserGroups ) ) . '">' - . Util::getIcon('b_usrlist.png', __('View users')) + . Util::getIcon('b_usrlist', __('View users')) . '</a>'; $html_output .= ' '; $html_output .= '<a class="" href="server_user_groups.php' @@ -125,7 +125,7 @@ class UserGroups ) ) . '">' - . Util::getIcon('b_edit.png', __('Edit')) . '</a>'; + . Util::getIcon('b_edit', __('Edit')) . '</a>'; $html_output .= ' '; $html_output .= '<a class="deleteUserGroup ajax"' . ' href="server_user_groups.php' @@ -135,7 +135,7 @@ class UserGroups ) ) . '">' - . Util::getIcon('b_drop.png', __('Delete')) . '</a>'; + . Util::getIcon('b_drop', __('Delete')) . '</a>'; $html_output .= '</td>'; $html_output .= '</tr>'; @@ -150,7 +150,7 @@ class UserGroups $html_output .= '<fieldset id="fieldset_add_user_group">'; $html_output .= '<a href="server_user_groups.php' . Url::getCommon(array('addUserGroup' => 1)) . '">' - . Util::getIcon('b_usradd.png') + . Util::getIcon('b_usradd') . __('Add user group') . '</a>'; $html_output .= '</fieldset>'; diff --git a/libraries/classes/Sql.php b/libraries/classes/Sql.php index 17ad7c7abb..f2ad07cd60 100644 --- a/libraries/classes/Sql.php +++ b/libraries/classes/Sql.php @@ -583,7 +583,7 @@ EOT; $html .= '<fieldset>'; $html .= '<legend>'; $html .= Util::getIcon( - 'b_bookmark.png', __('Bookmark this SQL query'), true + 'b_bookmark', __('Bookmark this SQL query'), true ); $html .= '</legend>'; $html .= '<div class="formelement">'; diff --git a/libraries/classes/Tracking.php b/libraries/classes/Tracking.php index faaf51ab95..c5d94b3e1d 100644 --- a/libraries/classes/Tracking.php +++ b/libraries/classes/Tracking.php @@ -306,12 +306,9 @@ class Tracking $html .= '<tbody>'; $GLOBALS['dbi']->dataSeek($sql_result, 0); - $delete = Util::getIcon('b_drop.png', __('Delete version')); - $report = Util::getIcon('b_report.png', __('Tracking report')); - $structure = Util::getIcon( - 'b_props.png', - __('Structure snapshot') - ); + $delete = Util::getIcon('b_drop', __('Delete version')); + $report = Util::getIcon('b_report', __('Tracking report')); + $structure = Util::getIcon('b_props', __('Structure snapshot')); while ($version = $GLOBALS['dbi']->fetchArray($sql_result)) { if ($version['version'] == $last_version) { @@ -373,7 +370,7 @@ class Tracking ); $html .= Util::getButtonOrImage( 'submit_mult', 'mult_submit', - __('Delete version'), 'b_drop.png', 'delete_version' + __('Delete version'), 'b_drop', 'delete_version' ); $html .= '</form>'; @@ -494,7 +491,7 @@ class Tracking $drop_image_or_text = ''; if (Util::showIcons('ActionLinksMode')) { $drop_image_or_text .= Util::getImage( - 'b_drop.png', __('Delete tracking data row from report') + 'b_drop', __('Delete tracking data row from report') ); } if (Util::showText('ActionLinksMode')) { @@ -934,13 +931,9 @@ class Tracking $html .= '<td>' . $index . '</td>'; $html .= '<td><b>' . htmlspecialchars($field['Field']); if ($field['Key'] == 'PRI') { - $html .= ' ' . Util::getImage( - 'b_primary.png', __('Primary') - ); + $html .= ' ' . Util::getImage('b_primary', __('Primary')); } elseif (! empty($field['Key'])) { - $html .= ' ' . Util::getImage( - 'bd_primary.png', __('Index') - ); + $html .= ' ' . Util::getImage('bd_primary', __('Index')); } $html .= '</b></td>'; $html .= "\n"; @@ -1492,7 +1485,7 @@ class Tracking ); echo Util::getButtonOrImage( 'submit_mult', 'mult_submit', - __('Track table'), 'eye.png', 'track' + __('Track table'), 'eye', 'track' ); ?> </form> @@ -1515,7 +1508,7 @@ class Tracking if (Tracker::getVersion($db, $tablename) == -1) { $my_link = '<a href="tbl_tracking.php' . $url_query . '&table=' . htmlspecialchars($tablename) . '">'; - $my_link .= Util::getIcon('eye.png', __('Track table')); + $my_link .= Util::getIcon('eye', __('Track table')); $my_link .= '</a>'; ?> <tr> @@ -1621,13 +1614,10 @@ class Tracking // Print out information about versions - $delete = Util::getIcon('b_drop.png', __('Delete tracking')); - $versions = Util::getIcon('b_versions.png', __('Versions')); - $report = Util::getIcon('b_report.png', __('Tracking report')); - $structure = Util::getIcon( - 'b_props.png', - __('Structure snapshot') - ); + $delete = Util::getIcon('b_drop', __('Delete tracking')); + $versions = Util::getIcon('b_versions', __('Versions')); + $report = Util::getIcon('b_report', __('Tracking report')); + $structure = Util::getIcon('b_props', __('Structure snapshot')); while ($one_result = $GLOBALS['dbi']->fetchArray($all_tables_result)) { list($table_name, $version_number) = $one_result; @@ -1701,7 +1691,7 @@ class Tracking ); echo Util::getButtonOrImage( 'submit_mult', 'mult_submit', - __('Delete tracking'), 'b_drop.png', 'delete_tracking' + __('Delete tracking'), 'b_drop', 'delete_tracking' ); ?> </form> diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php index 5ca4136711..bc56b868a8 100644 --- a/libraries/classes/Util.php +++ b/libraries/classes/Util.php @@ -101,8 +101,9 @@ class Util } /** - * Returns an HTML IMG tag for a particular image from a theme, - * which may be an actual file or an icon from a sprite + * Returns an HTML IMG tag for a particular image from a theme + * + * The image name should match CSS class defined in icons.css.php * * @param string $image The name of the file to get * @param string $alternate Used to set 'alt' and 'title' attributes @@ -122,11 +123,10 @@ class Util $url = './themes/pmahomme/' . $image; } - $class = str_replace(array('.gif','.png'), '', $image); if (isset($attributes['class'])) { - $attributes['class'] = "icon ic_$class " . $attributes['class']; + $attributes['class'] = "icon ic_$image " . $attributes['class']; } else { - $attributes['class'] = "icon ic_$class"; + $attributes['class'] = "icon ic_$image"; } // set all other attributes @@ -310,7 +310,7 @@ class Util return "[a@$link@$target][dochelpicon][/a]"; }else{ return '<a href="' . $link . '" target="' . $target . '">' - . self::getImage('b_help.png', __('Documentation')) + . self::getImage('b_help', __('Documentation')) . '</a>'; } } // end of the 'showDocLink()' function @@ -378,7 +378,7 @@ class Util return $open_link; } elseif ($big_icon) { return $open_link - . self::getImage('b_sqlhelp.png', __('Documentation')) . '</a>'; + . self::getImage('b_sqlhelp', __('Documentation')) . '</a>'; } else { return self::showDocLink($url, 'mysql_doc'); } @@ -463,7 +463,7 @@ class Util $classClause = ''; } return '<span' . $classClause . '>' - . self::getImage('b_help.png') + . self::getImage('b_help') . '<span class="hide">' . $message . '</span>' . '</span>'; } @@ -592,7 +592,7 @@ class Util } $error_msg .= $doedit_goto - . self::getIcon('b_edit.png', __('Edit')) + . self::getIcon('b_edit', __('Edit')) . '</a>'; } @@ -3314,26 +3314,26 @@ class Util { $titles = array(); - $titles['Browse'] = self::getIcon('b_browse.png', __('Browse')); - $titles['NoBrowse'] = self::getIcon('bd_browse.png', __('Browse')); - $titles['Search'] = self::getIcon('b_select.png', __('Search')); - $titles['NoSearch'] = self::getIcon('bd_select.png', __('Search')); - $titles['Insert'] = self::getIcon('b_insrow.png', __('Insert')); - $titles['NoInsert'] = self::getIcon('bd_insrow.png', __('Insert')); - $titles['Structure'] = self::getIcon('b_props.png', __('Structure')); - $titles['Drop'] = self::getIcon('b_drop.png', __('Drop')); - $titles['NoDrop'] = self::getIcon('bd_drop.png', __('Drop')); - $titles['Empty'] = self::getIcon('b_empty.png', __('Empty')); - $titles['NoEmpty'] = self::getIcon('bd_empty.png', __('Empty')); - $titles['Edit'] = self::getIcon('b_edit.png', __('Edit')); - $titles['NoEdit'] = self::getIcon('bd_edit.png', __('Edit')); - $titles['Export'] = self::getIcon('b_export.png', __('Export')); - $titles['NoExport'] = self::getIcon('bd_export.png', __('Export')); - $titles['Execute'] = self::getIcon('b_nextpage.png', __('Execute')); - $titles['NoExecute'] = self::getIcon('bd_nextpage.png', __('Execute')); + $titles['Browse'] = self::getIcon('b_browse', __('Browse')); + $titles['NoBrowse'] = self::getIcon('bd_browse', __('Browse')); + $titles['Search'] = self::getIcon('b_select', __('Search')); + $titles['NoSearch'] = self::getIcon('bd_select', __('Search')); + $titles['Insert'] = self::getIcon('b_insrow', __('Insert')); + $titles['NoInsert'] = self::getIcon('bd_insrow', __('Insert')); + $titles['Structure'] = self::getIcon('b_props', __('Structure')); + $titles['Drop'] = self::getIcon('b_drop', __('Drop')); + $titles['NoDrop'] = self::getIcon('bd_drop', __('Drop')); + $titles['Empty'] = self::getIcon('b_empty', __('Empty')); + $titles['NoEmpty'] = self::getIcon('bd_empty', __('Empty')); + $titles['Edit'] = self::getIcon('b_edit', __('Edit')); + $titles['NoEdit'] = self::getIcon('bd_edit', __('Edit')); + $titles['Export'] = self::getIcon('b_export', __('Export')); + $titles['NoExport'] = self::getIcon('bd_export', __('Export')); + $titles['Execute'] = self::getIcon('b_nextpage', __('Execute')); + $titles['NoExecute'] = self::getIcon('bd_nextpage', __('Execute')); // For Favorite/NoFavorite, we need icon only. - $titles['Favorite'] = self::getIcon('b_favorite.png', ''); - $titles['NoFavorite']= self::getIcon('b_no_favorite.png', ''); + $titles['Favorite'] = self::getIcon('b_favorite', ''); + $titles['NoFavorite']= self::getIcon('b_no_favorite', ''); return $titles; } @@ -4871,12 +4871,12 @@ class Util $futureSortOrder = 'DESC'; // current sort order is ASC $orderImg = ' ' . self::getImage( - 's_asc.png', + 's_asc', __('Ascending'), array('class' => 'sort_arrow', 'title' => '') ); $orderImg .= ' ' . self::getImage( - 's_desc.png', + 's_desc', __('Descending'), array('class' => 'sort_arrow hide', 'title' => '') ); @@ -4888,12 +4888,12 @@ class Util $futureSortOrder = 'ASC'; // current sort order is DESC $orderImg = ' ' . self::getImage( - 's_asc.png', + 's_asc', __('Ascending'), array('class' => 'sort_arrow hide', 'title' => '') ); $orderImg .= ' ' . self::getImage( - 's_desc.png', + 's_desc', __('Descending'), array('class' => 'sort_arrow', 'title' => '') ); diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php index 05e3bbca1e..d9d1e005d1 100644 --- a/libraries/user_preferences.inc.php +++ b/libraries/user_preferences.inc.php @@ -18,12 +18,12 @@ if (!defined('PHPMYADMIN')) { $form_param = isset($_GET['form']) ? $_GET['form'] : null; $tabs_icons = array( - 'Features' => 'b_tblops.png', - 'Sql' => 'b_sql.png', - 'Navi' => 'b_select.png', - 'Main' => 'b_props.png', - 'Import' => 'b_import.png', - 'Export' => 'b_export.png'); + 'Features' => 'b_tblops', + 'Sql' => 'b_sql', + 'Navi' => 'b_select', + 'Main' => 'b_props', + 'Import' => 'b_import', + 'Export' => 'b_export'); $content = PhpMyAdmin\Util::getHtmlTab( array( diff --git a/tbl_change.php b/tbl_change.php index cc0eb13c50..1673f98dea 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -138,7 +138,7 @@ $html_output .= InsertEdit::getHtmlForInsertEditFormHeader($has_blob_field, $is_ $html_output .= Url::getHiddenInputs($_form_params); -$titles['Browse'] = Util::getIcon('b_browse.png', __('Browse foreign values')); +$titles['Browse'] = Util::getIcon('b_browse', __('Browse foreign values')); // user can toggle the display of Function column and column types // (currently does not work for multi-edits) diff --git a/templates/database/create_table.twig b/templates/database/create_table.twig index c3abae2291..51f626cd48 100644 --- a/templates/database/create_table.twig +++ b/templates/database/create_table.twig @@ -2,7 +2,7 @@ <fieldset> <legend> {% if Util_showIcons('ActionLinksMode') -%} - {{ Util_getImage('b_table_add.png') }} + {{ Util_getImage('b_table_add') }} {%- endif %} {% trans "Create table" %} </legend> diff --git a/templates/database/structure/print_view_data_dictionary_link.twig b/templates/database/structure/print_view_data_dictionary_link.twig index d04980713d..81d52035fa 100644 --- a/templates/database/structure/print_view_data_dictionary_link.twig +++ b/templates/database/structure/print_view_data_dictionary_link.twig @@ -1,8 +1,8 @@ <p class="print_ignore"> <a href="#" id="printView"> - {{ Util_getIcon('b_print.png', 'Print'|trans, true) }} + {{ Util_getIcon('b_print', 'Print'|trans, true) }} </a> <a href="db_datadict.php{{ url_query }}" target="print_view"> - {{ Util_getIcon('b_tblanalyse.png', 'Data dictionary'|trans, true) }} + {{ Util_getIcon('b_tblanalyse', 'Data dictionary'|trans, true) }} </a> </p> diff --git a/templates/database/structure/structure_table_row.twig b/templates/database/structure/structure_table_row.twig index eb35b90b25..1a967d4f48 100644 --- a/templates/database/structure/structure_table_row.twig +++ b/templates/database/structure/structure_table_row.twig @@ -12,8 +12,8 @@ </th> {% if server_slave_status %} <td class="center"> - {{ ignored ? Util_getImage('s_cancel.png', 'Not replicated'|trans) }} - {{ do ? Util_getImage('s_success.png', 'Replicated'|trans) }} + {{ ignored ? Util_getImage('s_cancel', 'Not replicated'|trans) }} + {{ do ? Util_getImage('s_success', 'Replicated'|trans) }} </td> {% endif %} diff --git a/templates/database/structure/tracking_icon.twig b/templates/database/structure/tracking_icon.twig index adc11a7cc7..ca7e894b34 100644 --- a/templates/database/structure/tracking_icon.twig +++ b/templates/database/structure/tracking_icon.twig @@ -1,7 +1,7 @@ <a href="tbl_tracking.php{{ Url_getCommon({'table': table, 'db': db}) }}"> {% if is_tracked -%} - {{ Util_getImage('eye.png', 'Tracking is active.'|trans) }} + {{ Util_getImage('eye', 'Tracking is active.'|trans) }} {%- else -%} - {{ Util_getImage('eye_grey.png', 'Tracking is not active.'|trans) }} + {{ Util_getImage('eye_grey', 'Tracking is not active.'|trans) }} {%- endif %} </a> diff --git a/templates/display/import/options.twig b/templates/display/import/options.twig index 52ee928f84..812d0985b6 100644 --- a/templates/display/import/options.twig +++ b/templates/display/import/options.twig @@ -1,6 +1,6 @@ <div class="exportoptions" id="header"> <h2> - {{ Util_getImage('b_import.png', 'Import'|trans) }} + {{ Util_getImage('b_import', 'Import'|trans) }} {% if import_type == 'server' %} {% trans 'Importing into the current server' %} {% elseif import_type == 'database' %} diff --git a/templates/privileges/add_user_fieldset.twig b/templates/privileges/add_user_fieldset.twig index b07aa6f8cf..6483ec8567 100644 --- a/templates/privileges/add_user_fieldset.twig +++ b/templates/privileges/add_user_fieldset.twig @@ -4,5 +4,5 @@ {% if rel_params is not empty %} rel="{{ Url_getCommon(rel_params) }}" {% endif %}> - {{ Util_getIcon('b_usradd.png') }}{% trans 'Add user account' %}</a> + {{ Util_getIcon('b_usradd') }}{% trans 'Add user account' %}</a> </fieldset> diff --git a/templates/privileges/delete_user_fieldset.twig b/templates/privileges/delete_user_fieldset.twig index 3375c64d83..d948afea11 100644 --- a/templates/privileges/delete_user_fieldset.twig +++ b/templates/privileges/delete_user_fieldset.twig @@ -1,6 +1,6 @@ <fieldset id="fieldset_delete_user"> <legend> - {{ Util_getIcon('b_usrdrop.png') }}{% trans 'Remove selected user accounts' %} + {{ Util_getIcon('b_usrdrop') }}{% trans 'Remove selected user accounts' %} </legend> <input type="hidden" name="mode" value="2" /> <p>({% trans 'Revoke all active privileges from the users and delete them afterwards.' %})</p> diff --git a/templates/server/databases/create.twig b/templates/server/databases/create.twig index a8c7f320a0..fff3c2dc6d 100644 --- a/templates/server/databases/create.twig +++ b/templates/server/databases/create.twig @@ -4,7 +4,7 @@ <form method="post" action="server_databases.php" id="create_database_form" class="ajax"> <p><strong> <label for="text_create_db"> - {{ Util_getImage('b_newdb.png') }} + {{ Util_getImage('b_newdb') }} {% trans 'Create database' %} </label> {{ Util_showMySQLDocu('CREATE_DATABASE') }} @@ -32,14 +32,14 @@ {% else %} {# db creation no privileges message #} <p><strong> - {{ Util_getImage('b_newdb.png') }} + {{ Util_getImage('b_newdb') }} {% trans 'Create database' %} {{ Util_showMySQLDocu('CREATE_DATABASE') }} </strong></p> <span class="noPrivileges"> {{ Util_getImage( - 's_error.png', + 's_error', '', {'hspace': 2, 'border': 0, 'align': 'middle'} ) }} diff --git a/templates/server/databases/databases_footer.twig b/templates/server/databases/databases_footer.twig index dcfb38440e..0737f54403 100644 --- a/templates/server/databases/databases_footer.twig +++ b/templates/server/databases/databases_footer.twig @@ -56,7 +56,7 @@ '', 'mult_submit ajax', 'Drop'|trans, - 'b_deltbl.png' + 'b_deltbl' ) }} {% endif %} diff --git a/templates/server/databases/table_header.twig b/templates/server/databases/table_header.twig index bc8a09fa6b..29455ab49d 100644 --- a/templates/server/databases/table_header.twig +++ b/templates/server/databases/table_header.twig @@ -7,7 +7,7 @@ <a href="server_databases.php{{ Url_getCommon(url_params) }}"> {% trans 'Database' %} {{ sort_by == 'SCHEMA_NAME' ? Util_getImage( - 's_' ~ sort_order ~ '.png', + 's_' ~ sort_order, sort_order_text ) }} </a> @@ -22,7 +22,7 @@ <a href="server_databases.php{{ Url_getCommon(url_params) }}"> {{ stat['disp_name'] }} {{ sort_by == stat_name ? Util_getImage( - 's_' ~ sort_order ~ '.png', + 's_' ~ sort_order, sort_order_text ) }} </a> diff --git a/templates/server/databases/table_row.twig b/templates/server/databases/table_row.twig index 1131d80f80..03bdd57ec8 100644 --- a/templates/server/databases/table_row.twig +++ b/templates/server/databases/table_row.twig @@ -59,7 +59,7 @@ 'checkprivsdb': current['SCHEMA_NAME'] }) }}" title=" {{- 'Check privileges for database "%s".'|trans|format(current['SCHEMA_NAME']|e) }}"> - {{ Util_getIcon('s_rights.png', 'Check privileges'|trans) }} + {{ Util_getIcon('s_rights', 'Check privileges'|trans) }} </a> </td> </tr> diff --git a/templates/server/engines/engine.twig b/templates/server/engines/engine.twig index b23f39f23f..7744ed1ce3 100644 --- a/templates/server/engines/engine.twig +++ b/templates/server/engines/engine.twig @@ -1,5 +1,5 @@ <h2> - {{ Util_getImage('b_engine.png') }} + {{ Util_getImage('b_engine') }} {{ title }} {{ Util_showMySQLDocu(help_page) }} </h2> diff --git a/templates/server/sub_page_header.twig b/templates/server/sub_page_header.twig index 4d04a296b5..883de257aa 100644 --- a/templates/server/sub_page_header.twig +++ b/templates/server/sub_page_header.twig @@ -1,39 +1,39 @@ {# array contains Sub page icon and text #} {% set header = { 'variables': { - 'image': 's_vars.png', + 'image': 's_vars', 'text': 'Server variables and settings'|trans }, 'engines': { - 'image': 'b_engine.png', + 'image': 'b_engine', 'text': 'Storage engines'|trans }, 'plugins': { - 'image': 'b_engine.png', + 'image': 'b_engine', 'text': 'Plugins'|trans }, 'binlog': { - 'image': 's_tbl.png', + 'image': 's_tbl', 'text': 'Binary log'|trans }, 'collations': { - 'image': 's_asci.png', + 'image': 's_asci', 'text': 'Character sets and collations'|trans }, 'replication': { - 'image': 's_replication.png', + 'image': 's_replication', 'text': 'Replication'|trans }, 'database_statistics': { - 'image': 's_db.png', + 'image': 's_db', 'text': 'Databases statistics'|trans }, 'databases': { - 'image': 's_db.png', + 'image': 's_db', 'text': 'Databases'|trans }, 'privileges': { - 'image': 'b_usrlist.png', + 'image': 'b_usrlist', 'text': 'Privileges'|trans } } %} diff --git a/templates/server/variables/link_template.twig b/templates/server/variables/link_template.twig index fc1e9a1c1a..4bcbfb157b 100644 --- a/templates/server/variables/link_template.twig +++ b/templates/server/variables/link_template.twig @@ -1,10 +1,10 @@ <a href="{{ url|raw }}" class="ajax saveLink hide"> - {{ Util_getIcon('b_save.png', 'Save'|trans) }} + {{ Util_getIcon('b_save', 'Save'|trans) }} </a> <a href="#" class="cancelLink hide"> - {{ Util_getIcon('b_close.png', 'Cancel'|trans) }} + {{ Util_getIcon('b_close', 'Cancel'|trans) }} </a> -{{ Util_getImage('b_help.png', 'Documentation'|trans, { +{{ Util_getImage('b_help', 'Documentation'|trans, { 'class': 'hide', 'id': 'docImage' }) }} diff --git a/templates/server/variables/variable_row.twig b/templates/server/variables/variable_row.twig index 8c165afbdd..174ac61be9 100644 --- a/templates/server/variables/variable_row.twig +++ b/templates/server/variables/variable_row.twig @@ -1,10 +1,10 @@ <tr class="var-row {{ row_class }}" data-filter-row="{{ name | upper }}"> <td class="var-action"> {% if editable %} - <a href="#" data-variable="{{ name }}" class="editLink">{{ Util_getIcon('b_edit.png', 'Edit'|trans) }}</a> + <a href="#" data-variable="{{ name }}" class="editLink">{{ Util_getIcon('b_edit', 'Edit'|trans) }}</a> {% else %} <span title="{% trans 'This is a read-only variable and can not be edited' %}" class="read_only_var"> - {{ Util_getIcon('bd_edit.png', 'Edit'|trans) }} + {{ Util_getIcon('bd_edit', 'Edit'|trans) }} </span> {% endif %} </td> diff --git a/templates/table/relation/foreign_key_row.twig b/templates/table/relation/foreign_key_row.twig index d6e8001edb..c56ce6f0ea 100644 --- a/templates/table/relation/foreign_key_row.twig +++ b/templates/table/relation/foreign_key_row.twig @@ -28,7 +28,7 @@ {{- js_msg }}" /> <a class="drop_foreign_key_anchor ajax" href="sql.php {{- Url_getCommon(this_params) }}"> - {{ Util_getIcon('b_drop.png', 'Drop'|trans) }} + {{ Util_getIcon('b_drop', 'Drop'|trans) }} </a> {% endif %} </td> diff --git a/templates/table/search/input_box.twig b/templates/table/search/input_box.twig index dd0c380abb..59f9ab77a3 100644 --- a/templates/table/search/input_box.twig +++ b/templates/table/search/input_box.twig @@ -36,7 +36,7 @@ id="field_{{ column_index }}" /> {% if in_fbs %} {% set edit_url = 'gis_data_editor.php' ~ Url_getCommon() %} - {% set edit_str = Util_getIcon('b_edit.png', 'Edit/Insert'|trans) %} + {% set edit_str = Util_getIcon('b_edit', 'Edit/Insert'|trans) %} <span class="open_search_gis_editor"> {{ Util_linkOrButton(edit_url, edit_str, [], '_blank') }} </span> diff --git a/templates/table/secondary_tabs.twig b/templates/table/secondary_tabs.twig index 0ee9013df8..a38b039e5d 100644 --- a/templates/table/secondary_tabs.twig +++ b/templates/table/secondary_tabs.twig @@ -1,13 +1,13 @@ {% if cfg_relation['relwork'] or is_foreign_key_supported %} <ul id="topmenu2"> {{ Util_getHtmlTab({ - 'icon': 'b_props.png', + 'icon': 'b_props', 'link': 'tbl_structure.php', 'text': 'Table structure'|trans, 'id': 'table_strucuture_id' }, url_params) }} {{ Util_getHtmlTab({ - 'icon': 'b_relations.png', + 'icon': 'b_relations', 'link': 'tbl_relation.php', 'text': 'Relation view'|trans, 'id': 'table_relation_id' diff --git a/templates/table/structure/actions_in_table_structure.twig b/templates/table/structure/actions_in_table_structure.twig index ae964f03cd..db83ad21ab 100644 --- a/templates/table/structure/actions_in_table_structure.twig +++ b/templates/table/structure/actions_in_table_structure.twig @@ -119,11 +119,11 @@ <li class="browse nowrap"> {% if is_in_central_columns %} <a href="#" class="central_columns remove_button"> - {{ Util_getIcon('centralColumns_delete.png', 'Remove from central columns'|trans) }} + {{ Util_getIcon('centralColumns_delete', 'Remove from central columns'|trans) }} </a> {% else %} <a href="#" class="central_columns add_button"> - {{ Util_getIcon('centralColumns_add.png', 'Add to central columns'|trans) }} + {{ Util_getIcon('centralColumns_add', 'Add to central columns'|trans) }} </a> {% endif %} </li> diff --git a/templates/table/structure/add_column.twig b/templates/table/structure/add_column.twig index c38d550005..9c88c0a2d2 100644 --- a/templates/table/structure/add_column.twig +++ b/templates/table/structure/add_column.twig @@ -1,7 +1,7 @@ <form method="post" action="tbl_addfield.php" id="addColumns" name="addColumns"> {{ Url_getHiddenInputs(db, table) }} {% if Util_showIcons('ActionLinksMode') %} - {{ Util_getImage('b_insrow.png', 'Add column'|trans) }} + {{ Util_getImage('b_insrow', 'Add column'|trans) }} {% endif %} {% set num_fields -%} <input type="number" name="num_fields" value="1" onfocus="this.select()" min="1" required /> diff --git a/templates/table/structure/check_all_table_column.twig b/templates/table/structure/check_all_table_column.twig index 0406b86a89..57e6e11220 100644 --- a/templates/table/structure/check_all_table_column.twig +++ b/templates/table/structure/check_all_table_column.twig @@ -9,7 +9,7 @@ 'submit_mult', 'mult_submit', 'Browse'|trans, - 'b_browse.png', + 'b_browse', 'browse' ) }} @@ -18,14 +18,14 @@ 'submit_mult', 'mult_submit change_columns_anchor ajax', 'Change'|trans, - 'b_edit.png', + 'b_edit', 'change' ) }} {{ Util_getButtonOrImage( 'submit_mult', 'mult_submit', 'Drop'|trans, - 'b_drop.png', + 'b_drop', 'drop' ) }} @@ -34,28 +34,28 @@ 'submit_mult', 'mult_submit', 'Primary'|trans, - 'b_primary.png', + 'b_primary', 'primary' ) }} {{ Util_getButtonOrImage( 'submit_mult', 'mult_submit', 'Unique'|trans, - 'b_unique.png', + 'b_unique', 'unique' ) }} {{ Util_getButtonOrImage( 'submit_mult', 'mult_submit', 'Index'|trans, - 'b_index.png', + 'b_index', 'index' ) }} {{ Util_getButtonOrImage( 'submit_mult', 'mult_submit', 'Fulltext'|trans, - 'b_ftext.png', + 'b_ftext', 'ftext' ) }} @@ -67,7 +67,7 @@ 'submit_mult', 'mult_submit', 'Fulltext'|trans, - 'b_ftext.png', + 'b_ftext', 'ftext' ) }} {% endif %} @@ -77,14 +77,14 @@ 'submit_mult', 'mult_submit', 'Add to central columns'|trans, - 'centralColumns_add.png', + 'centralColumns_add', 'add_to_central_columns' ) }} {{ Util_getButtonOrImage( 'submit_mult', 'mult_submit', 'Remove from central columns'|trans, - 'centralColumns_delete.png', + 'centralColumns_delete', 'remove_from_central_columns' ) }} {% endif %} diff --git a/templates/table/structure/display_structure.twig b/templates/table/structure/display_structure.twig index 3d2124db15..4b15b63469 100644 --- a/templates/table/structure/display_structure.twig +++ b/templates/table/structure/display_structure.twig @@ -59,12 +59,12 @@ {% if primary and primary.hasColumn(field_name) %} {% set displayed_field_name = displayed_field_name ~ Util_getImage( - 'b_primary.png', 'Primary'|trans + 'b_primary', 'Primary'|trans ) %} {% endif %} {% if field_name in columns_with_index %} {% set displayed_field_name = displayed_field_name ~ Util_getImage( - 'b_key.png', 'Index'|trans + 'b_key', 'Index'|trans ) %} {% endif %} <tr> @@ -134,7 +134,7 @@ {% if tbl_is_view and not db_is_system_schema %} {{ Util_linkOrButton( edit_view_url, - Util_getIcon('b_edit.png', 'Edit view'|trans, true) + Util_getIcon('b_edit', 'Edit view'|trans, true) ) }} {% endif %} {% include 'table/structure/optional_action_links.twig' with { @@ -176,15 +176,15 @@ {% endif %} {% set action_icons = { - 'ANALYZE': Util_getIcon('b_search.png', 'Analyze'|trans), - 'CHECK': Util_getIcon('eye.png', 'Check'|trans), - 'OPTIMIZE': Util_getIcon('normalize.png', 'Optimize'|trans), - 'REBUILD': Util_getIcon('s_tbl.png', 'Rebuild'|trans), - 'REPAIR': Util_getIcon('b_tblops.png', 'Repair'|trans), - 'TRUNCATE': Util_getIcon('b_empty.png', 'Truncate'|trans), + 'ANALYZE': Util_getIcon('b_search', 'Analyze'|trans), + 'CHECK': Util_getIcon('eye', 'Check'|trans), + 'OPTIMIZE': Util_getIcon('normalize', 'Optimize'|trans), + 'REBUILD': Util_getIcon('s_tbl', 'Rebuild'|trans), + 'REPAIR': Util_getIcon('b_tblops', 'Repair'|trans), + 'TRUNCATE': Util_getIcon('b_empty', 'Truncate'|trans), } %} {% if range_or_list %} - {% set action_icons = action_icons|merge({'DROP': Util_getIcon('b_drop.png', 'Drop'|trans)}) %} + {% set action_icons = action_icons|merge({'DROP': Util_getIcon('b_drop', 'Drop'|trans)}) %} {% endif %} {{ Util_getDivForSliderEffect('partitions', 'Partitions'|trans) }} diff --git a/templates/table/structure/display_table_stats.twig b/templates/table/structure/display_table_stats.twig index f382c3b1c6..64de0f2aae 100644 --- a/templates/table/structure/display_table_stats.twig +++ b/templates/table/structure/display_table_stats.twig @@ -58,7 +58,7 @@ <td colspan="3" class="center"> <a href="sql.php{{ url_query }}&pos=0&sql_query= {{- ('OPTIMIZE TABLE ' ~ Util_backquote(table))|url_encode }}"> - {{ Util_getIcon('b_tbloptimize.png', 'Optimize table'|trans) }} + {{ Util_getIcon('b_tbloptimize', 'Optimize table'|trans) }} </a> </td> </tr> diff --git a/templates/table/structure/optional_action_links.twig b/templates/table/structure/optional_action_links.twig index 989051d935..1e3a49f4c9 100644 --- a/templates/table/structure/optional_action_links.twig +++ b/templates/table/structure/optional_action_links.twig @@ -1,10 +1,10 @@ -<a href="#" id="printView">{{ Util_getIcon('b_print.png', 'Print'|trans, true) }}</a> +<a href="#" id="printView">{{ Util_getIcon('b_print', 'Print'|trans, true) }}</a> {% if not tbl_is_view and not db_is_system_schema %} <a href="sql.php{{ url_query|raw }}&session_max_rows=all&sql_query= {{- ('SELECT * FROM ' ~ Util_backquote(table) ~ ' PROCEDURE ANALYSE()')|url_encode -}} " style="margin-right: 0;"> {{ Util_getIcon( - 'b_tblanalyse.png', + 'b_tblanalyse', 'Propose table structure'|trans, true ) }} @@ -12,20 +12,20 @@ {{ Util_showMySQLDocu('procedure_analyse') }} {% if is_active %} <a href="tbl_tracking.php{{ url_query|raw }}"> - {{ Util_getIcon('eye.png', 'Track table'|trans, true) }} + {{ Util_getIcon('eye', 'Track table'|trans, true) }} </a> {% endif %} <a href="#" id="move_columns_anchor"> - {{ Util_getIcon('b_move.png', 'Move columns'|trans, true) }} + {{ Util_getIcon('b_move', 'Move columns'|trans, true) }} </a> <a href="normalization.php{{ url_query|raw }}"> - {{ Util_getIcon('normalize.png', 'Normalize'|trans, true) }} + {{ Util_getIcon('normalize', 'Normalize'|trans, true) }} </a> {% endif %} {% if tbl_is_view and not db_is_system_schema %} {% if is_active %} <a href="tbl_tracking.php{{ url_query|raw }}"> - {{ Util_getIcon('eye.png', 'Track view'|trans, true) }} + {{ Util_getIcon('eye', 'Track view'|trans, true) }} </a> {% endif %} {% endif %} diff --git a/test/classes/Controllers/Server/ServerVariablesControllerTest.php b/test/classes/Controllers/Server/ServerVariablesControllerTest.php index 7c95b0d6d3..93824c53e8 100644 --- a/test/classes/Controllers/Server/ServerVariablesControllerTest.php +++ b/test/classes/Controllers/Server/ServerVariablesControllerTest.php @@ -186,11 +186,11 @@ class ServerVariablesControllerTest extends PmaTestCase ); //validate 2: images $this->assertContains( - Util::getIcon('b_save.png', __('Save')), + Util::getIcon('b_save', __('Save')), $html ); $this->assertContains( - Util::getIcon('b_close.png', __('Cancel')), + Util::getIcon('b_close', __('Cancel')), $html ); } diff --git a/test/classes/Display/CreateTableTest.php b/test/classes/Display/CreateTableTest.php index 8a97ca9b7c..3646f5915d 100644 --- a/test/classes/Display/CreateTableTest.php +++ b/test/classes/Display/CreateTableTest.php @@ -62,7 +62,7 @@ class CreateTableTest extends TestCase //getImage $this->assertContains( - Util::getImage('b_table_add.png'), + Util::getImage('b_table_add'), $html ); diff --git a/test/classes/Server/PrivilegesTest.php b/test/classes/Server/PrivilegesTest.php index c1d156fc92..3a9d06ad8e 100644 --- a/test/classes/Server/PrivilegesTest.php +++ b/test/classes/Server/PrivilegesTest.php @@ -2203,7 +2203,7 @@ class PrivilegesTest extends TestCase $html ); $this->assertContains( - Util::getIcon('b_usradd.png'), + Util::getIcon('b_usradd'), $html ); $this->assertContains( diff --git a/test/classes/UtilTest.php b/test/classes/UtilTest.php index f429cb69de..5598e6c7d9 100644 --- a/test/classes/UtilTest.php +++ b/test/classes/UtilTest.php @@ -359,25 +359,25 @@ class UtilTest extends PmaTestCase $GLOBALS['cfg'] = array('ActionLinksMode' => 'both'); $titles = array(); - $titles['Browse'] = Util::getIcon('b_browse.png', __('Browse')); - $titles['NoBrowse'] = Util::getIcon('bd_browse.png', __('Browse')); - $titles['Search'] = Util::getIcon('b_select.png', __('Search')); - $titles['NoSearch'] = Util::getIcon('bd_select.png', __('Search')); - $titles['Insert'] = Util::getIcon('b_insrow.png', __('Insert')); - $titles['NoInsert'] = Util::getIcon('bd_insrow.png', __('Insert')); - $titles['Structure'] = Util::getIcon('b_props.png', __('Structure')); - $titles['Drop'] = Util::getIcon('b_drop.png', __('Drop')); - $titles['NoDrop'] = Util::getIcon('bd_drop.png', __('Drop')); - $titles['Empty'] = Util::getIcon('b_empty.png', __('Empty')); - $titles['NoEmpty'] = Util::getIcon('bd_empty.png', __('Empty')); - $titles['Edit'] = Util::getIcon('b_edit.png', __('Edit')); - $titles['NoEdit'] = Util::getIcon('bd_edit.png', __('Edit')); - $titles['Export'] = Util::getIcon('b_export.png', __('Export')); - $titles['NoExport'] = Util::getIcon('bd_export.png', __('Export')); - $titles['Execute'] = Util::getIcon('b_nextpage.png', __('Execute')); - $titles['NoExecute'] = Util::getIcon('bd_nextpage.png', __('Execute')); - $titles['Favorite'] = Util::getIcon('b_favorite.png', ''); - $titles['NoFavorite'] = Util::getIcon('b_no_favorite.png', ''); + $titles['Browse'] = Util::getIcon('b_browse', __('Browse')); + $titles['NoBrowse'] = Util::getIcon('bd_browse', __('Browse')); + $titles['Search'] = Util::getIcon('b_select', __('Search')); + $titles['NoSearch'] = Util::getIcon('bd_select', __('Search')); + $titles['Insert'] = Util::getIcon('b_insrow', __('Insert')); + $titles['NoInsert'] = Util::getIcon('bd_insrow', __('Insert')); + $titles['Structure'] = Util::getIcon('b_props', __('Structure')); + $titles['Drop'] = Util::getIcon('b_drop', __('Drop')); + $titles['NoDrop'] = Util::getIcon('bd_drop', __('Drop')); + $titles['Empty'] = Util::getIcon('b_empty', __('Empty')); + $titles['NoEmpty'] = Util::getIcon('bd_empty', __('Empty')); + $titles['Edit'] = Util::getIcon('b_edit', __('Edit')); + $titles['NoEdit'] = Util::getIcon('bd_edit', __('Edit')); + $titles['Export'] = Util::getIcon('b_export', __('Export')); + $titles['NoExport'] = Util::getIcon('bd_export', __('Export')); + $titles['Execute'] = Util::getIcon('b_nextpage', __('Execute')); + $titles['NoExecute'] = Util::getIcon('bd_nextpage', __('Execute')); + $titles['Favorite'] = Util::getIcon('b_favorite', ''); + $titles['NoFavorite'] = Util::getIcon('b_no_favorite', ''); $this->assertEquals($titles, Util::buildActionTitles()); } @@ -1392,7 +1392,7 @@ class UtilTest extends PmaTestCase $this->assertEquals( '<span class="nowrap"></span>', - Util::getIcon('b_comment.png') + Util::getIcon('b_comment') ); } @@ -1409,7 +1409,7 @@ class UtilTest extends PmaTestCase $this->assertEquals( '<span class="nowrap"><img src="themes/dot.gif" title="" alt="" class="icon ic_b_comment" /></span>', - Util::getIcon('b_comment.png') + Util::getIcon('b_comment') ); } @@ -1429,7 +1429,7 @@ class UtilTest extends PmaTestCase '<span class="nowrap"><img src="themes/dot.gif" title="' . $alternate_text . '" alt="' . $alternate_text . '" class="icon ic_b_comment" /></span>', - Util::getIcon('b_comment.png', $alternate_text) + Util::getIcon('b_comment', $alternate_text) ); } @@ -1451,7 +1451,7 @@ class UtilTest extends PmaTestCase '<span class="nowrap"><img src="themes/dot.gif" title="' . $alternate_text . '" alt="' . $alternate_text . '" class="icon ic_b_comment" /> ' . $alternate_text . '</span>', - Util::getIcon('b_comment.png', $alternate_text, true, false) + Util::getIcon('b_comment', $alternate_text, true, false) ); } |