Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:fluidd-core/fluidd into my_develop
Browse files Browse the repository at this point in the history
Signed-off-by: vajonam <152501+vajonam@users.noreply.github.com>
  • Loading branch information
vajonam committed Dec 21, 2023
2 parents 736136c + af48f3c commit fec8230
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/components/widgets/job-queue/JobQueueCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
:draggable="!fullscreen"
:collapsable="!fullscreen"
layout-path="dashboard.job-queue-card"
:help-tooltip="$t('app.job_queue.tooltip.help')"
>
<template #menu>
<app-btn-collapse-group :collapsed="menuCollapsed">
Expand Down
1 change: 1 addition & 0 deletions src/components/widgets/jobs/JobsCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
icon="$files"
draggable
layout-path="dashboard.jobs-card"
:help-tooltip="$t('app.general.tooltip.file_browser_help')"
>
<template #menu>
<app-btn
Expand Down
7 changes: 7 additions & 0 deletions src/locales/en.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,10 @@ app:
restart_klipper: Restarts the klipper system service.
run_collector: Run collector
rollover_logs: Rollover logs
file_browser_help: >-
Drag and drop files or folders from outside the browser to upload them here<br>Move files and folders by dragging and dropping them onto sub-folders or ".."
file_browser_configuration_help: >-
Copy files and folders to the Configuration Files by dragging them from here and dropping them there
history:
msg:
confirm: Are you sure? This will clear all history, and printer statistics
Expand All @@ -463,6 +467,9 @@ app:
number_of_copies: Number of copies
title:
multiply_job: Multiply Job | Multiply Jobs
tooltip:
help: >-
Queue jobs by dragging files from the Jobs and dropping them here<br>Adjust the order of queued jobs by dragging them up or down
printer:
state:
busy: Busy
Expand Down
2 changes: 2 additions & 0 deletions src/views/Configure.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<collapsable-card
:title="$t('app.general.title.config_files')"
icon="$codeJson"
:help-tooltip="$t('app.general.tooltip.file_browser_help')"
>
<file-system
:roots="['config']"
Expand All @@ -23,6 +24,7 @@
<collapsable-card
:title="$t('app.general.title.other_files')"
icon="$files"
:help-tooltip="$t('app.general.tooltip.file_browser_configuration_help')"
>
<file-system
:roots="roots"
Expand Down
1 change: 1 addition & 0 deletions src/views/Jobs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
card-key="JobsPage"
icon="$files"
class="mb-2 mb-sm-4"
:help-tooltip="$t('app.general.tooltip.file_browser_help')"
>
<file-system
:roots="'gcodes'"
Expand Down

0 comments on commit fec8230

Please sign in to comment.