Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Translate tooltip text in semi collapsed mode and add title attributes to entries in left nav #1283

Merged
merged 34 commits into from
Apr 24, 2020
Merged

Translate tooltip text in semi collapsed mode and add title attributes to entries in left nav #1283

Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
72d4cef
Update
zarkosimic Sep 18, 2019
dff04c5
Merge remote-tracking branch 'upstream/master'
zarkosimic Sep 20, 2019
f19e8aa
Merge remote-tracking branch 'upstream/master'
zarkosimic Sep 24, 2019
1deffe2
Merge remote-tracking branch 'upstream/master'
zarkosimic Sep 25, 2019
69b33fc
Merge remote-tracking branch 'upstream/master'
zarkosimic Oct 1, 2019
ad2cbfb
Merge remote-tracking branch 'upstream/master'
zarkosimic Oct 8, 2019
9afc6b1
Merge remote-tracking branch 'upstream/master'
zarkosimic Oct 9, 2019
f969fba
Merge remote-tracking branch 'upstream/master'
zarkosimic Oct 24, 2019
5e7c452
Merge remote-tracking branch 'upstream/master'
zarkosimic Oct 25, 2019
06ba748
Merge remote-tracking branch 'upstream/master'
zarkosimic Oct 31, 2019
846f861
Docu app changes
zarkosimic Nov 7, 2019
7a410c0
Update
zarkosimic Nov 25, 2019
b566ee8
Merge remote-tracking branch 'upstream/master'
zarkosimic Nov 25, 2019
423ef12
Merge remote-tracking branch 'upstream/master'
zarkosimic Mar 20, 2020
fd88fb9
update
zarkosimic Mar 20, 2020
9cf5222
Merge remote-tracking branch 'upstream/master'
zarkosimic Mar 20, 2020
b8c3a75
Merge remote-tracking branch 'upstream/master'
zarkosimic Mar 24, 2020
3b7bad8
Merge remote-tracking branch 'upstream/master'
zarkosimic Mar 25, 2020
1b6139f
Merge remote-tracking branch 'upstream/master'
zarkosimic Mar 27, 2020
a799c03
Merge remote-tracking branch 'upstream/master'
zarkosimic Apr 7, 2020
161b6d5
Merge remote-tracking branch 'upstream/master'
zarkosimic Apr 8, 2020
4befd08
Merge remote-tracking branch 'upstream/master'
zarkosimic Apr 9, 2020
8bfe475
Merge remote-tracking branch 'upstream/master'
zarkosimic Apr 14, 2020
78880b5
Merge remote-tracking branch 'upstream/master'
zarkosimic Apr 17, 2020
832f16f
Merge remote-tracking branch 'upstream/master'
zarkosimic Apr 20, 2020
fa30b70
Fix tooltips
zarkosimic Apr 21, 2020
701ca25
Merge branch 'master' into 1276_tooltip_in_semi-collapsed_mode_not_tr…
zarkosimic Apr 21, 2020
081ccae
Fix website docu
zarkosimic Apr 21, 2020
f5304bd
Merge branch 'master' into 1276_tooltip_in_semi-collapsed_mode_not_tr…
zarkosimic Apr 22, 2020
04d5c57
Remove getNodeLabel function and use getTranslation instead
zarkosimic Apr 22, 2020
ff070b3
Merge branch 'master' into 1276_tooltip_in_semi-collapsed_mode_not_tr…
JohannesDoberer Apr 23, 2020
a6ea1e9
Merge branch 'master' into 1276_tooltip_in_semi-collapsed_mode_not_tr…
maxmarkus Apr 24, 2020
c2dbb5b
Add missing translation mechanism for tabNav
zarkosimic Apr 24, 2020
456338b
Merge branch '1276_tooltip_in_semi-collapsed_mode_not_translated' of …
zarkosimic Apr 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
44 changes: 32 additions & 12 deletions client/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 30 additions & 11 deletions core/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 4 additions & 7 deletions core/src/navigation/LeftNav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@
{#if key === 'undefined' || key.startsWith(virtualGroupPrefix)}
<!-- Single nodes -->
{#each nodes as node} {#if !node.hideFromNav} {#if node.label}
<li
class="fd-nested-list__item"
title="{isSemiCollapsed ? getNodeLabel(node) : ''}"
>
<li class="fd-nested-list__item" title="{getNodeLabel(node)}">
zarkosimic marked this conversation as resolved.
Show resolved Hide resolved
<a
href="{getRouteLink(node)}"
class="fd-nested-list__link {node === selectedNode ? 'is-selected' : ''}"
Expand Down Expand Up @@ -59,7 +56,7 @@
<li
class="fd-nested-list__item lui-collapsible-item"
on:click|stopPropagation="{() => handleIconClick(nodes, event.currentTarget)}"
title="{isSemiCollapsed ? key : ''}"
title="{$getTranslation(key)}"
data-testid="{getTestIdForCat(nodes.metaInfo, key)}"
>
<a
Expand Down Expand Up @@ -142,7 +139,7 @@
<!-- Category nodes -->
<li
class="fd-nested-list__group-header lui-category"
title="{isSemiCollapsed ? key : ''}"
title="{$getTranslation(key)}"
data-testid="{getTestIdForCat(nodes.metaInfo, key)}"
>
{#if hasCategoriesWithIcon && nodes.metaInfo.icon}
Expand All @@ -163,7 +160,7 @@
{$getTranslation(key)}
</li>
{#each nodes as node} {#if !node.hideFromNav} {#if node.label}
<li class="fd-nested-list__item">
<li class="fd-nested-list__item" title="{getNodeLabel(node)}">
<a
href="{getRouteLink(node)}"
class="fd-nested-list__link {node === selectedNode ? 'is-selected' : ''}"
Expand Down