Skip to content

fixed tooltip bug and closes #1679 #1713

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

Merged
juliusknorr merged 4 commits into from
Apr 20, 2020
Merged

fixed tooltip bug and closes #1679 #1713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6009c10
fixed tooltip bug and closes #1679
ishantgupta777 Apr 18, 2020
ec5a8e9
translations added
ishantgupta777 Apr 18, 2020
7234e3a
title changes with tooltip
ishantgupta777 Apr 19, 2020
ef1f899
Merge branch 'master' into tooltip_fix
ishantgupta777 Apr 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions src/components/Controls.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,11 @@
</p>
</div>
<div v-if="board" class="board-actions">
<div v-if="canManage && !showArchived" id="stack-add" v-click-outside="hideAddStack">
<Actions v-if="!isAddStackVisible">
<ActionButton icon="icon-add" :title="t('deck', 'Add new list')" @click.stop="showAddStack" />
<div v-if="canManage && !showArchived"
id="stack-add"
v-click-outside="hideAddStack">
<Actions v-if="!isAddStackVisible" :title="t('deck', 'Add new list')">
<ActionButton icon="icon-add" @click.stop="showAddStack" />
</Actions>
<form v-else @submit.prevent="addNewStack()">
<label for="new-stack-input-main" class="hidden-visually">{{ t('deck', 'Add new list') }}</label>
Expand All @@ -52,8 +54,8 @@
</div>
<div class="board-action-buttons">
<Popover>
<Actions slot="trigger" :style="filterOpacity">
<ActionButton icon="icon-filter" :title="t('deck', 'Apply filter')" />
<Actions slot="trigger" :style="filterOpacity" :title="t('deck', 'Apply filter')">
<ActionButton icon="icon-filter" />
</Actions>

<template>
Expand Down Expand Up @@ -148,28 +150,24 @@
</template>
</Popover>

<Actions :style="archivedOpacity">
<Actions :style="archivedOpacity" :title="t('deck', 'Show archived cards')">
<ActionButton v-if="showArchived"
icon="icon-archive"
:title="t('deck', 'Show archived cards')"
@click="toggleShowArchived" />
<ActionButton v-else
icon="icon-archive"
:title="t('deck', 'Hide archived cards')"
@click="toggleShowArchived" />
</Actions>
<Actions>
<Actions :title="t('deck', 'Toggle compact mode')">
<ActionButton v-if="compactMode"
icon="icon-toggle-compact-collapsed"
:title="t('deck', 'Toggle compact mode')"
@click="toggleCompactMode" />
<ActionButton v-else
icon="icon-toggle-compact-expanded"
:title="t('deck', 'Toggle compact mode')"
@click="toggleCompactMode" />
</Actions>
<!-- FIXME: ActionRouter currently doesn't work as an inline action -->
<Actions>
<Actions :title="t('deck', 'Details')">
<ActionButton icon="icon-menu-sidebar" @click="toggleDetailsView" />
</Actions>
</div>
Expand Down
5 changes: 3 additions & 2 deletions src/components/boards/BoardItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,12 @@
<div class="board-list-title-cell">
{{ board.title }}
</div>
<div class="board-list-avatars-cell">
<Avatar :user="board.owner.uid" class="board-list-avatar" />
<div class="board-list-avatars-cell" title="">
<Avatar :user="board.owner.uid" :display-name="board.owner.displayname" class="board-list-avatar" />
<Avatar v-for="user in limitedAcl"
:key="user.id"
:user="user.participant.uid"
:display-name="user.participant.displayname"
class="board-list-avatar" />
<div v-if="board.acl.length > 5" v-tooltip="otherAcl" class="avatardiv popovermenu-wrapper board-list-avatar icon-more" />
</div>
Expand Down
8 changes: 6 additions & 2 deletions src/components/navigation/AppNavigationBoard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,17 @@
<ul>
<li class="app-navigation-entry-utils-menu-button">
<button v-if="board.acl.length === 0"
v-tooltip="t('deck', 'Share')"
class="icon-shared"
style="opacity: 0.3"
@click="showSidebar" />
<button v-else class="icon-shared" @click="showSidebar" />
<button v-else
v-tooltip="t('deck', 'Share')"
class="icon-shared"
@click="showSidebar" />
</li>
<li class="app-navigation-entry-utils-menu-button">
<button v-click-outside="hideMenu" @click="showMenu" />
<button v-click-outside="hideMenu" v-tooltip="t('deck', 'Options')" @click="showMenu" />
</li>
</ul>
</div>
Expand Down