From f032b24eeed9873aa0f3b4cb99c2b73e7628f431 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Thu, 19 Dec 2019 15:41:22 +0200 Subject: [PATCH] breadcrumb char change --- client/modules/crm/res/templates/lead/convert.tpl | 4 ++-- client/res/templates/admin/entity-manager/index.tpl | 4 +++- client/res/templates/admin/extensions/index.tpl | 4 +++- client/res/templates/admin/field-manager/index.tpl | 10 +++------- client/res/templates/admin/integrations/index.tpl | 4 +++- client/res/templates/admin/label-manager/index.tpl | 4 +++- client/res/templates/admin/layouts/index.tpl | 8 +++----- client/res/templates/admin/link-manager/index.tpl | 6 +++--- .../admin/settings/headers/authentication.tpl | 2 +- .../res/templates/admin/settings/headers/currency.tpl | 2 +- .../admin/settings/headers/inbound-emails.tpl | 4 +++- .../templates/admin/settings/headers/jobs-settings.tpl | 4 +++- .../templates/admin/settings/headers/notifications.tpl | 4 +++- .../admin/settings/headers/outbound-emails.tpl | 4 +++- .../res/templates/admin/settings/headers/settings.tpl | 4 +++- .../admin/settings/headers/user-interface.tpl | 4 +++- .../res/templates/admin/system-requirements/index.tpl | 4 +++- client/res/templates/admin/template-manager/index.tpl | 4 +++- client/res/templates/admin/upgrade/index.tpl | 4 +++- client/src/views/main.js | 3 ++- client/src/views/modals/detail.js | 2 +- frontend/less/espo/custom.less | 10 +++++++++- 22 files changed, 64 insertions(+), 35 deletions(-) diff --git a/client/modules/crm/res/templates/lead/convert.tpl b/client/modules/crm/res/templates/lead/convert.tpl index 692bb0a27d..6052bc6cc1 100644 --- a/client/modules/crm/res/templates/lead/convert.tpl +++ b/client/modules/crm/res/templates/lead/convert.tpl @@ -1,8 +1,8 @@

{{translate scope category='scopeNamesPlural'}} - » + {{get this.model 'name'}} - » + {{translate 'convert' scope='Lead'}}

diff --git a/client/res/templates/admin/entity-manager/index.tpl b/client/res/templates/admin/entity-manager/index.tpl index ae710c53cd..845ba13735 100644 --- a/client/res/templates/admin/entity-manager/index.tpl +++ b/client/res/templates/admin/entity-manager/index.tpl @@ -1,4 +1,6 @@ -

{{translate 'Administration'}} » {{translate 'Entity Manager' scope='Admin'}}

+

{{translate 'Administration'}} + +{{translate 'Entity Manager' scope='Admin'}}

diff --git a/client/res/templates/admin/extensions/index.tpl b/client/res/templates/admin/extensions/index.tpl index 4e9cdc3549..12ee139b62 100644 --- a/client/res/templates/admin/extensions/index.tpl +++ b/client/res/templates/admin/extensions/index.tpl @@ -1,4 +1,6 @@ -

{{translate 'Administration'}} » {{translate 'Extensions' scope='Admin'}}

+

{{translate 'Administration'}} + +{{translate 'Extensions' scope='Admin'}}

diff --git a/client/res/templates/admin/field-manager/index.tpl b/client/res/templates/admin/field-manager/index.tpl index b32606926c..fc7737140e 100644 --- a/client/res/templates/admin/field-manager/index.tpl +++ b/client/res/templates/admin/field-manager/index.tpl @@ -1,11 +1,11 @@

{{translate 'Administration'}} - » + {{translate 'Entity Manager' scope='Admin'}} - » + {{translate scope category='scopeNames'}} - » + {{translate 'Fields' scope='EntityManager'}}

@@ -17,7 +17,3 @@
- - - - diff --git a/client/res/templates/admin/integrations/index.tpl b/client/res/templates/admin/integrations/index.tpl index abc4023260..a9a3008cbb 100644 --- a/client/res/templates/admin/integrations/index.tpl +++ b/client/res/templates/admin/integrations/index.tpl @@ -1,4 +1,6 @@ -

{{translate 'Administration'}} » {{translate 'Integrations' scope='Admin'}}

+

{{translate 'Administration'}} + +{{translate 'Integrations' scope='Admin'}}

diff --git a/client/res/templates/admin/label-manager/index.tpl b/client/res/templates/admin/label-manager/index.tpl index 74255a8355..c86c0eaee5 100644 --- a/client/res/templates/admin/label-manager/index.tpl +++ b/client/res/templates/admin/label-manager/index.tpl @@ -1,4 +1,6 @@ -

{{translate 'Administration'}} » {{translate 'Label Manager' scope='Admin'}}

+

{{translate 'Administration'}} + +{{translate 'Label Manager' scope='Admin'}}

diff --git a/client/res/templates/admin/layouts/index.tpl b/client/res/templates/admin/layouts/index.tpl index eb3bb1c6f4..b326a164d6 100644 --- a/client/res/templates/admin/layouts/index.tpl +++ b/client/res/templates/admin/layouts/index.tpl @@ -1,4 +1,6 @@ -

{{translate 'Administration'}} » {{translate 'Layout Manager' scope='Admin'}}

+

{{translate 'Administration'}} + +{{translate 'Layout Manager' scope='Admin'}}

@@ -31,7 +33,3 @@
- - - - diff --git a/client/res/templates/admin/link-manager/index.tpl b/client/res/templates/admin/link-manager/index.tpl index 9664e6068f..e5f9bc0f3e 100644 --- a/client/res/templates/admin/link-manager/index.tpl +++ b/client/res/templates/admin/link-manager/index.tpl @@ -1,11 +1,11 @@

{{translate 'Administration'}} - » + {{translate 'Entity Manager' scope='Admin'}} - » + {{translate scope category='scopeNames'}} - » + {{translate 'Relationships' scope='EntityManager'}}

diff --git a/client/res/templates/admin/settings/headers/authentication.tpl b/client/res/templates/admin/settings/headers/authentication.tpl index b36d2f0589..2e3e73c040 100644 --- a/client/res/templates/admin/settings/headers/authentication.tpl +++ b/client/res/templates/admin/settings/headers/authentication.tpl @@ -1 +1 @@ -

{{translate 'Administration'}} » {{translate 'Authentication' scope='Admin'}}

+

{{translate 'Administration'}} {{translate 'Authentication' scope='Admin'}}

diff --git a/client/res/templates/admin/settings/headers/currency.tpl b/client/res/templates/admin/settings/headers/currency.tpl index 80fbd5531e..3d72d57559 100644 --- a/client/res/templates/admin/settings/headers/currency.tpl +++ b/client/res/templates/admin/settings/headers/currency.tpl @@ -1 +1 @@ -

{{translate 'Administration'}} » {{translate 'Currency' scope='Admin'}}

+

{{translate 'Administration'}} {{translate 'Currency' scope='Admin'}}

diff --git a/client/res/templates/admin/settings/headers/inbound-emails.tpl b/client/res/templates/admin/settings/headers/inbound-emails.tpl index 7312347d46..c1e4e3e381 100644 --- a/client/res/templates/admin/settings/headers/inbound-emails.tpl +++ b/client/res/templates/admin/settings/headers/inbound-emails.tpl @@ -1 +1,3 @@ -

{{translate 'Administration'}} » {{translate 'Inbound Emails' scope='Admin'}}

+

{{translate 'Administration'}} + +{{translate 'Inbound Emails' scope='Admin'}}

diff --git a/client/res/templates/admin/settings/headers/jobs-settings.tpl b/client/res/templates/admin/settings/headers/jobs-settings.tpl index 188ac3c771..45417ff1f7 100644 --- a/client/res/templates/admin/settings/headers/jobs-settings.tpl +++ b/client/res/templates/admin/settings/headers/jobs-settings.tpl @@ -1 +1,3 @@ -

{{translate 'Administration'}} » {{translate 'Jobs' category='labels' scope='Admin'}}

+

{{translate 'Administration'}} + +{{translate 'Jobs' category='labels' scope='Admin'}}

diff --git a/client/res/templates/admin/settings/headers/notifications.tpl b/client/res/templates/admin/settings/headers/notifications.tpl index 5e5b3ed6c3..512e8aa815 100644 --- a/client/res/templates/admin/settings/headers/notifications.tpl +++ b/client/res/templates/admin/settings/headers/notifications.tpl @@ -1 +1,3 @@ -

{{translate 'Administration'}} » {{translate 'Notifications' scope='Admin'}}

+

{{translate 'Administration'}} + +{{translate 'Notifications' scope='Admin'}}

diff --git a/client/res/templates/admin/settings/headers/outbound-emails.tpl b/client/res/templates/admin/settings/headers/outbound-emails.tpl index e208b4b50f..45997fe4ac 100644 --- a/client/res/templates/admin/settings/headers/outbound-emails.tpl +++ b/client/res/templates/admin/settings/headers/outbound-emails.tpl @@ -1 +1,3 @@ -

{{translate 'Administration'}} » {{translate 'Outbound Emails' scope='Admin'}}

+

{{translate 'Administration'}} + +{{translate 'Outbound Emails' scope='Admin'}}

diff --git a/client/res/templates/admin/settings/headers/settings.tpl b/client/res/templates/admin/settings/headers/settings.tpl index 59ba0a0492..23ed1ec588 100644 --- a/client/res/templates/admin/settings/headers/settings.tpl +++ b/client/res/templates/admin/settings/headers/settings.tpl @@ -1 +1,3 @@ -

{{translate 'Administration'}} » {{translate 'Settings' scope='Admin'}}

+

{{translate 'Administration'}} + +{{translate 'Settings' scope='Admin'}}

diff --git a/client/res/templates/admin/settings/headers/user-interface.tpl b/client/res/templates/admin/settings/headers/user-interface.tpl index f107b99071..8474eaec02 100644 --- a/client/res/templates/admin/settings/headers/user-interface.tpl +++ b/client/res/templates/admin/settings/headers/user-interface.tpl @@ -1 +1,3 @@ -

{{translate 'Administration'}} » {{translate 'User Interface' scope='Admin'}}

+

{{translate 'Administration'}} + +{{translate 'User Interface' scope='Admin'}}

diff --git a/client/res/templates/admin/system-requirements/index.tpl b/client/res/templates/admin/system-requirements/index.tpl index ca23e3327d..ee4e55dbe3 100644 --- a/client/res/templates/admin/system-requirements/index.tpl +++ b/client/res/templates/admin/system-requirements/index.tpl @@ -1,4 +1,6 @@ -

{{translate 'Administration'}} » {{translate 'System Requirements' scope='Admin'}}

+

{{translate 'Administration'}} + +{{translate 'System Requirements' scope='Admin'}}

diff --git a/client/res/templates/admin/template-manager/index.tpl b/client/res/templates/admin/template-manager/index.tpl index b3af16fcd1..996282be19 100644 --- a/client/res/templates/admin/template-manager/index.tpl +++ b/client/res/templates/admin/template-manager/index.tpl @@ -1,4 +1,6 @@ -

{{translate 'Administration'}} » {{translate 'Template Manager' scope='Admin'}}

+

{{translate 'Administration'}} + +{{translate 'Template Manager' scope='Admin'}}

diff --git a/client/res/templates/admin/upgrade/index.tpl b/client/res/templates/admin/upgrade/index.tpl index 56ee048f95..ffc2f48bfb 100644 --- a/client/res/templates/admin/upgrade/index.tpl +++ b/client/res/templates/admin/upgrade/index.tpl @@ -1,4 +1,6 @@ -

{{translate 'Administration'}} » {{translate 'Upgrade' scope='Admin'}}

+

{{translate 'Administration'}} + +{{translate 'Upgrade' scope='Admin'}}

diff --git a/client/src/views/main.js b/client/src/views/main.js index 0d9e163a16..78e90afc14 100644 --- a/client/src/views/main.js +++ b/client/src/views/main.js @@ -111,7 +111,8 @@ define('views/main', 'view', function (Dep) { a.push('
' + item + '
'); }, this); - return '
' + a.join('
›
') + '
'; + return '
' + + a.join('
') + '
'; }, getHeaderIconHtml: function () { diff --git a/client/src/views/modals/detail.js b/client/src/views/modals/detail.js index 23a0fd7044..ddefab36ce 100644 --- a/client/src/views/modals/detail.js +++ b/client/src/views/modals/detail.js @@ -225,7 +225,7 @@ define('views/modals/detail', 'views/modal', function (Dep) { this.headerHtml += this.getLanguage().translate(scope, 'scopeNames'); if (model.get('name')) { - this.headerHtml += ' » ' + Handlebars.Utils.escapeExpression(model.get('name')); + this.headerHtml += ' ' + Handlebars.Utils.escapeExpression(model.get('name')); } if (!this.fullFormDisabled) { this.headerHtml = '' + this.headerHtml + ''; diff --git a/frontend/less/espo/custom.less b/frontend/less/espo/custom.less index 4da56a4f0c..8faa717da8 100644 --- a/frontend/less/espo/custom.less +++ b/frontend/less/espo/custom.less @@ -289,6 +289,14 @@ label { margin-bottom: 10px; } +.chevron-right { + &::before { + content: "\203A"; + display: inline-block; + } + padding: 0 0.1em; +} + .page-header { margin: 10px 0; border-bottom: 0; @@ -373,7 +381,7 @@ label { .header-breadcrumbs { .breadcrumb-separator { - padding: 0 8px; + padding: 0 0.26em; } .breadcrumb-item,