diff --git a/config/docker.exs b/config/docker.exs
index 01b74300..ec238770 100644
--- a/config/docker.exs
+++ b/config/docker.exs
@@ -78,3 +78,5 @@ config :mobilizon, :exports,
config :tz_world,
data_dir: System.get_env("MOBILIZON_TIMEZONES_DIR", "/var/lib/mobilizon/timezones")
+
+config :tzdata, :data_dir, System.get_env("MOBILIZON_TIMEZONES_DIR", "/var/lib/mobilizon/tzdata")
diff --git a/js/src/assets/oruga-tailwindcss.css b/js/src/assets/oruga-tailwindcss.css
index 9a332b20..f0683358 100644
--- a/js/src/assets/oruga-tailwindcss.css
+++ b/js/src/assets/oruga-tailwindcss.css
@@ -272,11 +272,14 @@ button.menubar__button {
@apply px-3 dark:text-black;
}
.pagination-link-current {
- @apply bg-primary cursor-not-allowed pointer-events-none border-primary text-white dark:text-zinc-900;
+ @apply bg-primary dark:bg-primary cursor-not-allowed pointer-events-none border-primary text-white dark:text-zinc-900;
}
.pagination-ellipsis {
@apply text-center m-1 text-gray-300;
}
+.pagination-link-disabled {
+ @apply bg-gray-200 dark:bg-gray-400;
+}
/** Tabs */
.tabs-nav {
diff --git a/js/src/components/Comment/EventComment.vue b/js/src/components/Comment/EventComment.vue
index 4792553f..d0069c25 100644
--- a/js/src/components/Comment/EventComment.vue
+++ b/js/src/components/Comment/EventComment.vue
@@ -194,6 +194,8 @@
has-modal-card
ref="reportModal"
:close-button-aria-label="t('Close')"
+ :autoFocus="false"
+ :trapFocus="false"
>
();
const router = useRouter();
+const route = useRoute();
const emit = defineEmits<{
(event: "update:location", location: IAddress | null): void;
@@ -89,6 +90,7 @@ const submit = () => {
router.push({
name: RouteName.SEARCH,
query: {
+ ...route.query,
locationName: location.value?.locality ?? location.value?.region,
lat,
lon,
diff --git a/js/src/components/Report/ReportModal.vue b/js/src/components/Report/ReportModal.vue
index 30269cc4..9726e067 100644
--- a/js/src/components/Report/ReportModal.vue
+++ b/js/src/components/Report/ReportModal.vue
@@ -20,38 +20,40 @@
}}
-
-
-
-
-
-
-
-
-
-
{{ comment?.actor?.name }}
-
@{{ usernameWithDomain(comment?.actor) }}
-
-
-
-
-
-
+
+
+
+
+
+
+
+
{{ comment?.actor?.name }}
+
@{{ usernameWithDomain(comment?.actor) }}
+
+
+
+
-
+
@@ -91,6 +93,7 @@ import { useI18n } from "vue-i18n";
import { IComment } from "../../types/comment.model";
import { usernameWithDomain } from "@/types/actor";
import AccountCircle from "vue-material-design-icons/AccountCircle.vue";
+import { useFocus } from "@vueuse/core";
const props = withDefaults(
defineProps<{
@@ -108,18 +111,17 @@ const props = withDefaults(
const emit = defineEmits(["close"]);
-// @Component({
-// mounted() {
-// this.$data.isActive = true;
-// },
-// })
-
-// isActive = false;
-
const content = ref("");
const forward = ref(false);
+const reportAdditionalCommentsInput = ref();
+// https://github.com/oruga-ui/oruga/issues/339
+const reportAdditionalCommentsInputComp = computed(
+ () => reportAdditionalCommentsInput.value?.$refs.textarea
+);
+useFocus(reportAdditionalCommentsInputComp, { initialValue: true });
+
const { t } = useI18n({ useScope: "global" });
const translatedCancelText = computed((): string => {
diff --git a/js/src/components/core/CustomDialog.vue b/js/src/components/core/CustomDialog.vue
index c2de32cf..df802e04 100644
--- a/js/src/components/core/CustomDialog.vue
+++ b/js/src/components/core/CustomDialog.vue
@@ -31,6 +31,7 @@
ref="input"
v-bind="inputAttrs"
@keydown.enter="confirm"
+ autofocus
/>
@@ -48,6 +49,7 @@