From: Nik Okuntseff Date: Tue, 23 Apr 2019 14:45:16 +0000 (+0000) Subject: Removed middots in menus to hopefully do better styling with css. X-Git-Tag: timetracker_1.19-1~54 X-Git-Url: http://wagnertech.de/git?p=timetracker.git;a=commitdiff_plain;h=ce2df23479c88d1bc9db04a68164af3feb6346e1 Removed middots in menus to hopefully do better styling with css. --- diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index d0601709..64203f55 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.19.3.4975 | Copyright © Anuko | +  Anuko Time Tracker 1.19.3.4976 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} diff --git a/WEB-INF/templates/groups.tpl b/WEB-INF/templates/groups.tpl index 3cd4f51d..0289ef9e 100644 --- a/WEB-INF/templates/groups.tpl +++ b/WEB-INF/templates/groups.tpl @@ -2,21 +2,22 @@ function chLocation(newLocation) { document.location = newLocation; } {$forms.subgroupsForm.open} - {if $group_dropdown} +
- - + - + +
{$i18n.label.group}:{$forms.subgroupsForm.group.control}{$i18n.label.group}: {$forms.subgroupsForm.group.control}
 
 
{/if} +{if $subgroups} + -{if $subgroups} {foreach $subgroups as $subgroup} @@ -25,8 +26,8 @@ {/foreach} -{/if}
{$i18n.label.thing_name} {$i18n.label.description}
{$subgroup.name|escape}{$i18n.label.delete}
+{/if} {$forms.subgroupsForm.close} diff --git a/WEB-INF/templates/header.tpl b/WEB-INF/templates/header.tpl index 9c46a7a8..b420f1ae 100644 --- a/WEB-INF/templates/header.tpl +++ b/WEB-INF/templates/header.tpl @@ -59,8 +59,8 @@
@@ -71,7 +71,7 @@
  - {$i18n.menu.logout} · - {$i18n.menu.forum} · + {$i18n.menu.logout} + {$i18n.menu.forum} {$i18n.menu.help}
@@ -82,20 +82,20 @@ @@ -110,39 +110,39 @@ {$i18n.menu.time} {/if} {if $user->exists() && $user->isPluginEnabled('ex') && ($user->can('track_own_expenses') || $user->can('track_expenses'))} - · {$i18n.menu.expenses} + {$i18n.menu.expenses} {/if} {if $user->exists() && ($user->can('view_own_reports') || $user->can('view_reports') || $user->can('view_all_reports') || $user->can('view_client_reports'))} - {if !$user->isClient()}·{/if} {$i18n.menu.reports} + {$i18n.menu.reports} {/if} {if $user->exists() && $user->isPluginEnabled('ts') && ($user->can('track_own_time') || $user->can('track_time'))} - · {$i18n.menu.timesheets} + {$i18n.menu.timesheets} {/if} {if $user->exists() && $user->isPluginEnabled('iv') && ($user->can('manage_invoices') || $user->can('view_client_invoices'))} - · {$i18n.title.invoices} + {$i18n.title.invoices} {/if} {if ($user->exists() && $user->isPluginEnabled('ch') && ($user->can('view_own_charts') || $user->can('view_charts'))) && ($smarty.const.MODE_PROJECTS == $user->getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() || $user->isPluginEnabled('cl'))} - · {$i18n.menu.charts} + {$i18n.menu.charts} {/if} {if ($user->can('view_own_projects') || $user->can('manage_projects')) && ($smarty.const.MODE_PROJECTS == $user->getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())} - · {$i18n.menu.projects} + {$i18n.menu.projects} {/if} {if ($smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode() && ($user->can('view_own_tasks') || $user->can('manage_tasks')))} - · {$i18n.menu.tasks} + {$i18n.menu.tasks} {/if} {if $user->can('view_users') || $user->can('manage_users')} - · {$i18n.menu.users} + {$i18n.menu.users} {/if} {if $user->isPluginEnabled('cl') && ($user->can('view_own_clients') || $user->can('manage_clients'))} - · {$i18n.menu.clients} + {$i18n.menu.clients} {/if} {if $user->isPluginEnabled('wk') && ($user->can('update_work') || $user->can('bid_on_work') || $user->can('manage_work')) && $user->exists()} - · {$i18n.title.work} + {$i18n.title.work} {/if} {if $user->can('export_data')} - · {$i18n.menu.export} + {$i18n.menu.export} {/if} @@ -154,11 +154,11 @@
  - {$i18n.menu.logout} · + {$i18n.menu.logout} {if $user->exists() && $user->can('manage_own_settings')} - {$i18n.menu.profile} · + {$i18n.menu.profile} {/if} {if $user->can('manage_basic_settings')} - {$i18n.menu.group} · + {$i18n.menu.group} {/if} {if $user->can('manage_subgroups')} - {$i18n.menu.subgroups} · + {$i18n.menu.subgroups} {/if} {if $user->can('manage_features')} - {$i18n.menu.plugins} · + {$i18n.menu.plugins} {/if} - {$i18n.menu.forum} · + {$i18n.menu.forum} {$i18n.menu.help}
diff --git a/WEB-INF/templates/mobile/header.tpl b/WEB-INF/templates/mobile/header.tpl index 806bd485..ec0b0592 100644 --- a/WEB-INF/templates/mobile/header.tpl +++ b/WEB-INF/templates/mobile/header.tpl @@ -61,7 +61,7 @@
  - {$i18n.menu.login} · + {$i18n.menu.login} {if isTrue('MULTITEAM_MODE') && $smarty.const.AUTH_MODULE == 'db'} - {$i18n.menu.create_group} · + {$i18n.menu.create_group} {/if} - {$i18n.menu.forum} · + {$i18n.menu.forum} {$i18n.menu.help}
@@ -77,19 +77,19 @@ {$i18n.menu.time} {/if} {if $user->exists() && $user->isPluginEnabled('ex') && ($user->can('track_own_expenses') || $user->can('track_expenses'))} - · {$i18n.menu.expenses} + {$i18n.menu.expenses} {/if} {if ($user->can('view_own_projects') || $user->can('manage_projects')) && ($smarty.const.MODE_PROJECTS == $user->getTrackingMode() || $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode())} - · {$i18n.menu.projects} + {$i18n.menu.projects} {/if} {if ($user->can('view_own_tasks') || $user->can('manage_tasks')) && $smarty.const.MODE_PROJECTS_AND_TASKS == $user->getTrackingMode()} - · {$i18n.menu.tasks} + {$i18n.menu.tasks} {/if} {if $user->can('view_users') || $user->can('manage_users')} - · {$i18n.menu.users} + {$i18n.menu.users} {/if} {if $user->isPluginEnabled('cl') && ($user->can('view_own_clients') || $user->can('manage_clients'))} - · {$i18n.menu.clients} + {$i18n.menu.clients} {/if} diff --git a/default.css b/default.css index 0fe36051..462b70ed 100644 --- a/default.css +++ b/default.css @@ -67,11 +67,13 @@ input[type=checkbox], label { font-weight: bold; color: white; background-color: black; + margin: 2px 3px 2px 3px; } .mainMenu { font-size: 11pt; color: #444444; + margin: 2px 3px 2px 3px; } .onBehalf {