Skip to content

Commit

Permalink
Refactor top_menu.twig
Browse files Browse the repository at this point in the history 
Simplifies the navigation bar tab loop by removing the
get_html_tab function.

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
  • Loading branch information
@MauricioFauth
MauricioFauth committed Jan 8, 2020
1 parent 8bb28f8 commit 5f36cd8
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 41 deletions.
79 changes: 39 additions & 40 deletions libraries/classes/Menu.php
View file
Expand Up @@ -262,26 +262,26 @@ private function _getTableTabs()

$tabs['browse']['icon'] = 'b_browse';
$tabs['browse']['text'] = __('Browse');
$tabs['browse']['link'] = Url::getFromRoute('/sql');
$tabs['browse']['route'] = '/sql';
$tabs['browse']['args']['pos'] = 0;
$tabs['browse']['active'] = $route === '/sql';

$tabs['structure']['icon'] = 'b_props';
$tabs['structure']['link'] = Url::getFromRoute('/table/structure');
$tabs['structure']['route'] = '/table/structure';
$tabs['structure']['text'] = __('Structure');
$tabs['structure']['active'] = in_array($route, [
'/table/relation',
'/table/structure',
]);

$tabs['sql']['icon'] = 'b_sql';
$tabs['sql']['link'] = Url::getFromRoute('/table/sql');
$tabs['sql']['route'] = '/table/sql';
$tabs['sql']['text'] = __('SQL');
$tabs['sql']['active'] = $route === '/table/sql';

$tabs['search']['icon'] = 'b_search';
$tabs['search']['text'] = __('Search');
$tabs['search']['link'] = Url::getFromRoute('/table/search');
$tabs['search']['route'] = '/table/search';
$tabs['search']['active'] = in_array($route, [
'/table/find-replace',
'/table/search',
Expand All @@ -290,13 +290,13 @@ private function _getTableTabs()

if (! $db_is_system_schema && (! $tbl_is_view || $updatable_view)) {
$tabs['insert']['icon'] = 'b_insrow';
$tabs['insert']['link'] = Url::getFromRoute('/table/change');
$tabs['insert']['route'] = '/table/change';
$tabs['insert']['text'] = __('Insert');
$tabs['insert']['active'] = $route === '/table/change';
}

$tabs['export']['icon'] = 'b_tblexport';
$tabs['export']['link'] = Url::getFromRoute('/table/export');
$tabs['export']['route'] = '/table/export';
$tabs['export']['args']['single_table'] = 'true';
$tabs['export']['text'] = __('Export');
$tabs['export']['active'] = $route === '/table/export';
Expand All @@ -306,14 +306,14 @@ private function _getTableTabs()
*/
if (! $tbl_is_view && ! $db_is_system_schema) {
$tabs['import']['icon'] = 'b_tblimport';
$tabs['import']['link'] = Url::getFromRoute('/table/import');
$tabs['import']['route'] = '/table/import';
$tabs['import']['text'] = __('Import');
$tabs['import']['active'] = $route === '/table/import';
}
if (($is_superuser || $isCreateOrGrantUser)
&& ! $db_is_system_schema
) {
$tabs['privileges']['link'] = Url::getFromRoute('/server/privileges');
$tabs['privileges']['route'] = '/server/privileges';
$tabs['privileges']['args']['checkprivsdb'] = $this->_db;
$tabs['privileges']['args']['checkprivstable'] = $this->_table;
// stay on table view
Expand All @@ -327,7 +327,7 @@ private function _getTableTabs()
*/
if (! $tbl_is_view && ! $db_is_system_schema) {
$tabs['operation']['icon'] = 'b_tblops';
$tabs['operation']['link'] = Url::getFromRoute('/table/operations');
$tabs['operation']['route'] = '/table/operations';
$tabs['operation']['text'] = __('Operations');
$tabs['operation']['active'] = $route === '/table/operations';
}
Expand All @@ -336,15 +336,15 @@ private function _getTableTabs()
*/
if ($tbl_is_view && ! $db_is_system_schema) {
$tabs['operation']['icon'] = 'b_tblops';
$tabs['operation']['link'] = Url::getFromRoute('/view/operations');
$tabs['operation']['route'] = '/view/operations';
$tabs['operation']['text'] = __('Operations');
$tabs['operation']['active'] = $route === '/view/operations';
}

if (Tracker::isActive() && ! $db_is_system_schema) {
$tabs['tracking']['icon'] = 'eye';
$tabs['tracking']['text'] = __('Tracking');
$tabs['tracking']['link'] = Url::getFromRoute('/table/tracking');
$tabs['tracking']['route'] = '/table/tracking';
$tabs['tracking']['active'] = $route === '/table/tracking';
}
if (! $db_is_system_schema
Expand All @@ -355,7 +355,7 @@ private function _getTableTabs()
)
&& ! $tbl_is_view
) {
$tabs['triggers']['link'] = Url::getFromRoute('/table/triggers');
$tabs['triggers']['route'] = '/table/triggers';
$tabs['triggers']['text'] = __('Triggers');
$tabs['triggers']['icon'] = 'b_triggers';
$tabs['triggers']['active'] = $route === '/table/triggers';
Expand Down Expand Up @@ -386,53 +386,53 @@ private function _getDbTabs()

$tabs = [];

$tabs['structure']['link'] = Url::getFromRoute('/database/structure');
$tabs['structure']['route'] = '/database/structure';
$tabs['structure']['text'] = __('Structure');
$tabs['structure']['icon'] = 'b_props';
$tabs['structure']['active'] = $route === '/database/structure';

$tabs['sql']['link'] = Url::getFromRoute('/database/sql');
$tabs['sql']['route'] = '/database/sql';
$tabs['sql']['text'] = __('SQL');
$tabs['sql']['icon'] = 'b_sql';
$tabs['sql']['active'] = $route === '/database/sql';

$tabs['search']['text'] = __('Search');
$tabs['search']['icon'] = 'b_search';
$tabs['search']['link'] = Url::getFromRoute('/database/search');
$tabs['search']['route'] = '/database/search';
$tabs['search']['active'] = $route === '/database/search';
if ($num_tables == 0) {
$tabs['search']['warning'] = __('Database seems to be empty!');
}

$tabs['query']['text'] = __('Query');
$tabs['query']['icon'] = 's_db';
$tabs['query']['link'] = Url::getFromRoute('/database/multi_table_query');
$tabs['query']['route'] = '/database/multi_table_query';
$tabs['query']['active'] = $route === '/database/multi_table_query' || $route === '/database/qbe';
if ($num_tables == 0) {
$tabs['query']['warning'] = __('Database seems to be empty!');
}

$tabs['export']['text'] = __('Export');
$tabs['export']['icon'] = 'b_export';
$tabs['export']['link'] = Url::getFromRoute('/database/export');
$tabs['export']['route'] = '/database/export';
$tabs['export']['active'] = $route === '/database/export';
if ($num_tables == 0) {
$tabs['export']['warning'] = __('Database seems to be empty!');
}

if (! $db_is_system_schema) {
$tabs['import']['link'] = Url::getFromRoute('/database/import');
$tabs['import']['route'] = '/database/import';
$tabs['import']['text'] = __('Import');
$tabs['import']['icon'] = 'b_import';
$tabs['import']['active'] = $route === '/database/import';

$tabs['operation']['link'] = Url::getFromRoute('/database/operations');
$tabs['operation']['route'] = '/database/operations';
$tabs['operation']['text'] = __('Operations');
$tabs['operation']['icon'] = 'b_tblops';
$tabs['operation']['active'] = $route === '/database/operations';

if ($is_superuser || $isCreateOrGrantUser) {
$tabs['privileges']['link'] = Url::getFromRoute('/server/privileges');
$tabs['privileges']['route'] = '/server/privileges';
$tabs['privileges']['args']['checkprivsdb'] = $this->_db;
// stay on database view
$tabs['privileges']['args']['viewing_mode'] = 'db';
Expand All @@ -441,20 +441,20 @@ private function _getDbTabs()
$tabs['privileges']['active'] = $route === '/server/privileges';
}

$tabs['routines']['link'] = Url::getFromRoute('/database/routines');
$tabs['routines']['route'] = '/database/routines';
$tabs['routines']['text'] = __('Routines');
$tabs['routines']['icon'] = 'b_routines';
$tabs['routines']['active'] = $route === '/database/routines';

if (Util::currentUserHasPrivilege('EVENT', $this->_db)) {
$tabs['events']['link'] = Url::getFromRoute('/database/events');
$tabs['events']['route'] = '/database/events';
$tabs['events']['text'] = __('Events');
$tabs['events']['icon'] = 'b_events';
$tabs['events']['active'] = $route === '/database/events';
}

if (Util::currentUserHasPrivilege('TRIGGER', $this->_db)) {
$tabs['triggers']['link'] = Url::getFromRoute('/database/triggers');
$tabs['triggers']['route'] = '/database/triggers';
$tabs['triggers']['text'] = __('Triggers');
$tabs['triggers']['icon'] = 'b_triggers';
$tabs['triggers']['active'] = $route === '/database/triggers';
Expand All @@ -464,15 +464,14 @@ private function _getDbTabs()
if (Tracker::isActive() && ! $db_is_system_schema) {
$tabs['tracking']['text'] = __('Tracking');
$tabs['tracking']['icon'] = 'eye';
$tabs['tracking']['link'] = Url::getFromRoute('/database/tracking');
$tabs['tracking']['route'] = '/database/tracking';
$tabs['tracking']['active'] = $route === '/database/tracking';
}

if (! $db_is_system_schema) {
$tabs['designer']['text'] = __('Designer');
$tabs['designer']['icon'] = 'b_relations';
$tabs['designer']['link'] = Url::getFromRoute('/database/designer');
$tabs['designer']['id'] = 'designer_tab';
$tabs['designer']['route'] = '/database/designer';
$tabs['designer']['active'] = $route === '/database/designer';
}

Expand All @@ -481,7 +480,7 @@ private function _getDbTabs()
) {
$tabs['central_columns']['text'] = __('Central columns');
$tabs['central_columns']['icon'] = 'centralColumns';
$tabs['central_columns']['link'] = Url::getFromRoute('/database/central-columns');
$tabs['central_columns']['route'] = '/database/central-columns';
$tabs['central_columns']['active'] = $route === '/database/central-columns';
}
return $tabs;
Expand Down Expand Up @@ -515,17 +514,17 @@ private function _getServerTabs()
$tabs = [];

$tabs['databases']['icon'] = 's_db';
$tabs['databases']['link'] = Url::getFromRoute('/server/databases');
$tabs['databases']['route'] = '/server/databases';
$tabs['databases']['text'] = __('Databases');
$tabs['databases']['active'] = $route === '/server/databases';

$tabs['sql']['icon'] = 'b_sql';
$tabs['sql']['link'] = Url::getFromRoute('/server/sql');
$tabs['sql']['route'] = '/server/sql';
$tabs['sql']['text'] = __('SQL');
$tabs['sql']['active'] = $route === '/server/sql';

$tabs['status']['icon'] = 's_status';
$tabs['status']['link'] = Url::getFromRoute('/server/status');
$tabs['status']['route'] = '/server/status';
$tabs['status']['text'] = __('Status');
$tabs['status']['active'] = in_array($route, [
'/server/status',
Expand All @@ -538,7 +537,7 @@ private function _getServerTabs()

if ($is_superuser || $isCreateOrGrantUser) {
$tabs['rights']['icon'] = 's_rights';
$tabs['rights']['link'] = Url::getFromRoute('/server/privileges');
$tabs['rights']['route'] = '/server/privileges';
$tabs['rights']['text'] = __('User accounts');
$tabs['rights']['active'] = in_array($route, [
'/server/privileges',
Expand All @@ -548,17 +547,17 @@ private function _getServerTabs()
}

$tabs['export']['icon'] = 'b_export';
$tabs['export']['link'] = Url::getFromRoute('/server/export');
$tabs['export']['route'] = '/server/export';
$tabs['export']['text'] = __('Export');
$tabs['export']['active'] = $route === '/server/export';

$tabs['import']['icon'] = 'b_import';
$tabs['import']['link'] = Url::getFromRoute('/server/import');
$tabs['import']['route'] = '/server/import';
$tabs['import']['text'] = __('Import');
$tabs['import']['active'] = $route === '/server/import';

$tabs['settings']['icon'] = 'b_tblops';
$tabs['settings']['link'] = Url::getFromRoute('/preferences/manage');
$tabs['settings']['route'] = '/preferences/manage';
$tabs['settings']['text'] = __('Settings');
$tabs['settings']['active'] = in_array($route, [
'/preferences/forms',
Expand All @@ -568,35 +567,35 @@ private function _getServerTabs()

if (! empty($binary_logs)) {
$tabs['binlog']['icon'] = 's_tbl';
$tabs['binlog']['link'] = Url::getFromRoute('/server/binlog');
$tabs['binlog']['route'] = '/server/binlog';
$tabs['binlog']['text'] = __('Binary log');
$tabs['binlog']['active'] = $route === '/server/binlog';
}

if ($is_superuser) {
$tabs['replication']['icon'] = 's_replication';
$tabs['replication']['link'] = Url::getFromRoute('/server/replication');
$tabs['replication']['route'] = '/server/replication';
$tabs['replication']['text'] = __('Replication');
$tabs['replication']['active'] = $route === '/server/replication';
}

$tabs['vars']['icon'] = 's_vars';
$tabs['vars']['link'] = Url::getFromRoute('/server/variables');
$tabs['vars']['route'] = '/server/variables';
$tabs['vars']['text'] = __('Variables');
$tabs['vars']['active'] = $route === '/server/variables';

$tabs['charset']['icon'] = 's_asci';
$tabs['charset']['link'] = Url::getFromRoute('/server/collations');
$tabs['charset']['route'] = '/server/collations';
$tabs['charset']['text'] = __('Charsets');
$tabs['charset']['active'] = $route === '/server/collations';

$tabs['engine']['icon'] = 'b_engine';
$tabs['engine']['link'] = Url::getFromRoute('/server/engines');
$tabs['engine']['route'] = '/server/engines';
$tabs['engine']['text'] = __('Engines');
$tabs['engine']['active'] = $route === '/server/engines';

$tabs['plugins']['icon'] = 'b_plugin';
$tabs['plugins']['link'] = Url::getFromRoute('/server/plugins');
$tabs['plugins']['route'] = '/server/plugins';
$tabs['plugins']['text'] = __('Plugins');
$tabs['plugins']['active'] = $route === '/server/plugins';

Expand Down
6 changes: 5 additions & 1 deletion templates/top_menu.twig
View file
Expand Up @@ -3,7 +3,11 @@
<div class="navigationbar">
<ul id="topmenu" class="resizable-menu">
{% for tab in tabs %}
{{ get_html_tab(tab, url_params) }}
<li{{ tab.active ? ' class="active"' }}>
<a href="{{ url(tab.route, url_params|merge(tab.args ?? [])) }}" class="tab{{ tab.active ? 'active' }}">
{{ get_icon(tab.icon, tab.text, false, true, 'TabsMode') }}
</a>
</li>
{% endfor %}
<div class="clearfloat"></div>
</ul>
Expand Down

0 comments on commit 5f36cd8

Please sign in to comment.