Skip to content

Fix refresh-icon overlays name of recipe #1033

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
christianlupus merged 3 commits into from
Jun 8, 2022
Merged

Fix refresh-icon overlays name of recipe #1033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4abcc8
Fix refresh-icon overlays name of recipe
MarcelRobitaille Jun 8, 2022
1ce2bd3
Update changelog
MarcelRobitaille Jun 8, 2022
52f7195
Removed overlaying text
christianlupus Jun 8, 2022
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
- Correct singular/plural translations
[#1026](https://github.com/nextcloud/cookbook/pull/1026) @christianlupus
- Update eslint-plugin-vue
- Fix refresh-icon overlays name of recipe
[#1033](https://github.com/nextcloud/cookbook/pull/1033) @MarcelRobitaille

### Codebase maintenance
- Removed codecov.io upload of intermediate merge commits during pull requests [#1028](https://github.com/nextcloud/cookbook/issues/1028)
Expand Down
71 changes: 46 additions & 25 deletions src/components/AppControls.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,18 +62,13 @@
:title="$store.state.recipe.name"
:disable-drop="true"
>
<ActionButton
:icon="
$store.state.reloadingRecipe ===
parseInt($route.params.id)
? 'icon-loading-small'
: 'icon-history'
"
class="action-button"
:aria-label="t('cookbook', 'Reload recipe')"
@click="reloadRecipeEdit()"
>{{ t("cookbook", "Reload recipe") }}</ActionButton
>
</Breadcrumb>
<Breadcrumb
v-if="isLoading || isLoadingRecipe"
class="active"
:title="t('cookbook', 'Loading…')"
:disable-drop="true"
>
</Breadcrumb>
<!-- Create new recipe -->
<Breadcrumb
Expand Down Expand Up @@ -106,6 +101,31 @@
class="active"
:title="$store.state.recipe.name"
:disable-drop="true"
>
</Breadcrumb>
<Breadcrumb
v-if="isRecipe"
class="no-arrow"
title=""
:disable-drop="true"
>
<ActionButton
icon="icon-rename"
class="action-button"
:aria-label="t('cookbook', 'Edit recipe')"
@click="
$window.goTo(
'/recipe/' + $store.state.recipe.id + '/edit'
)
"
>{{ t("cookbook", "Edit recipe") }}</ActionButton
>
</Breadcrumb>
<Breadcrumb
v-if="isEdit"
class="no-arrow"
title=""
:disable-drop="true"
>
<ActionButton
:icon="
Expand All @@ -116,7 +136,7 @@
"
class="action-button"
:aria-label="t('cookbook', 'Reload recipe')"
@click="reloadRecipeView()"
@click="reloadRecipeEdit()"
>{{ t("cookbook", "Reload recipe") }}</ActionButton
>
</Breadcrumb>
Expand All @@ -127,15 +147,16 @@
:disable-drop="true"
>
<ActionButton
icon="icon-rename"
class="action-button"
:aria-label="t('cookbook', 'Edit recipe')"
@click="
$window.goTo(
'/recipe/' + $store.state.recipe.id + '/edit'
)
:icon="
$store.state.reloadingRecipe ===
parseInt($route.params.id)
? 'icon-loading-small'
: 'icon-history'
"
>{{ t("cookbook", "Edit recipe") }}</ActionButton
class="action-button"
:aria-label="t('cookbook', 'Reload recipe')"
@click="reloadRecipeView()"
>{{ t("cookbook", "Reload recipe") }}</ActionButton
>
</Breadcrumb>
<Breadcrumb
Expand Down Expand Up @@ -170,24 +191,24 @@
<Breadcrumb
v-if="isLoading"
class="active no-arrow"
:title="t('cookbook', 'App is loading')"
title=""
:disable-drop="true"
>
<ActionButton
icon="icon-loading-small"
:aria-label="t('cookbook', 'Loading…')"
:aria-label="t('cookbook', 'Loading app')"
/>
</Breadcrumb>
<!-- Is a recipe loading? -->
<Breadcrumb
v-else-if="isLoadingRecipe"
class="active no-arrow"
:title="t('cookbook', 'Loading recipe')"
title=""
:disable-drop="true"
>
<ActionButton
icon="icon-loading-small"
:aria-label="t('cookbook', 'Loading…')"
:aria-label="t('cookbook', 'Loading recipe')"
/>
</Breadcrumb>
<!-- No recipe found -->
Expand Down