mirror/mobilizon
1
0
Fork 0
mirror of https://framagit.org/framasoft/mobilizon.git synced 2024-12-26 09:49:12 +00:00
Code Issues Releases Wiki Activity

Merge branch 'fixes' into 'main'

Browse source 
Various fixes

See merge request framasoft/mobilizon!1402
This commit is contained in:
Thomas Citharel 2023-05-30 14:50:57 +00:00
commit 06594e8dd0
5 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
js/src/components/Event/EventCard.vue
View file

@ -3,7 +3,7 @@
class="mbz-card snap-center dark:bg-mbz-purple" class="mbz-card snap-center dark:bg-mbz-purple"
:class="{ :class="{
'sm:flex sm:items-start': mode === 'row', 'sm:flex sm:items-start': mode === 'row',
'sm:max-w-xs sm:w-[18rem] shrink-0 flex flex-col': mode === 'column', 'sm:max-w-xs w-[18rem] shrink-0 flex flex-col': mode === 'column',
}" }"
:to="to" :to="to"
:isInternal="isInternal" :isInternal="isInternal"
@ -119,8 +119,8 @@
{{ {{
t( t(
"{count} participants", "{count} participants",
event.participantStats?.participant, { count: event.participantStats?.participant },
{ count: event.participantStats?.participant } event.participantStats?.participant
) )
}} }}
</mobilizon-tag> </mobilizon-tag>

1
js/src/components/Event/FullAddressAutoComplete.vue
View file

@ -279,6 +279,7 @@ const setSelected = (newValue: IAddress | null) => {
if (!newValue) return; if (!newValue) return;
console.debug("setting selected to model value"); console.debug("setting selected to model value");
Object.assign(selected, newValue); Object.assign(selected, newValue);
emit("update:modelValue", selected);
}; };
const saveManualAddress = (): void => { const saveManualAddress = (): void => {

4
js/src/components/Group/GroupCard.vue
View file

@ -2,10 +2,10 @@
<LinkOrRouterLink <LinkOrRouterLink
:to="to" :to="to"
:isInternal="isInternal" :isInternal="isInternal"
class="mbz-card shrink-0 dark:bg-mbz-purple dark:text-white rounded-lg shadow-lg flex items-center flex-col" class="mbz-card snap-center shrink-0 dark:bg-mbz-purple dark:text-white rounded-lg shadow-lg flex items-center flex-col"
:class="{ :class="{
'sm:flex-row': mode === 'row', 'sm:flex-row': mode === 'row',
'sm:max-w-xs sm:w-[18rem] shrink-0 flex flex-col': mode === 'column', 'sm:max-w-xs w-[18rem] shrink-0 flex flex-col': mode === 'column',
}" }"
> >
<div class="flex-none p-2 md:p-4"> <div class="flex-none p-2 md:p-4">

14
js/src/components/Local/CloseContent.vue
View file

@ -19,10 +19,10 @@
</div> </div>
<slot name="subtitle" /> <slot name="subtitle" />
</div> </div>
<div class="hidden sm:block" v-show="showScrollLeftButton"> <div class="" v-show="showScrollLeftButton">
<button <button
@click="scrollLeft" @click="scrollLeft"
class="absolute inset-y-0 my-auto z-10 rounded-full bg-white dark:bg-transparent w-10 h-10 border border-shadowColor -left-5" class="absolute inset-y-0 my-auto z-10 rounded-full bg-white dark:bg-transparent w-10 h-10 border border-shadowColor -left-5 ml-2"
> >
<span class="">&lt;</span> <span class="">&lt;</span>
</button> </button>
@ -36,10 +36,10 @@
<slot name="content" /> <slot name="content" />
</div> </div>
</div> </div>
<div class="hidden sm:block" v-show="showScrollRightButton"> <div class="" v-show="showScrollRightButton">
<button <button
@click="scrollRight" @click="scrollRight"
class="absolute inset-y-0 my-auto z-10 rounded-full bg-white dark:bg-transparent w-10 h-10 border border-shadowColor -right-5" class="absolute inset-y-0 my-auto z-10 rounded-full bg-white dark:bg-transparent w-10 h-10 border border-shadowColor -right-5 mr-2"
> >
<span class="">&gt;</span> <span class="">&gt;</span>
</button> </button>
@ -63,7 +63,7 @@ const emit = defineEmits(["doGeoLoc"]);
const { t } = useI18n({ useScope: "global" }); const { t } = useI18n({ useScope: "global" });
const showScrollRightButton = ref(true); const showScrollRightButton = ref(false);
const showScrollLeftButton = ref(false); const showScrollLeftButton = ref(false);
const scrollContainer = ref<any>(); const scrollContainer = ref<any>();
@ -100,6 +100,10 @@ const scrollHorizontalToVertical = (evt: WheelEvent) => {
}; };
onMounted(async () => { onMounted(async () => {
// Make sure everything is mounted properly
setTimeout(() => {
scrollHandler();
}, 1500);
scrollContainer.value.addEventListener("wheel", scrollHorizontalToVertical); scrollContainer.value.addEventListener("wheel", scrollHorizontalToVertical);
}); });

2
priv/gettext/fr/LC_MESSAGES/errors.po
View file

@ -504,7 +504,7 @@ msgstr "Profile non trouvé"
#: lib/graphql/resolvers/report.ex:48 #: lib/graphql/resolvers/report.ex:48
#, elixir-autogen, elixir-format #, elixir-autogen, elixir-format
msgid "Report not found" msgid "Report not found"
msgstr "Groupe non trouvé" msgstr "Signalement non trouvé"
#: lib/graphql/resolvers/resource.ex:172 #: lib/graphql/resolvers/resource.ex:172
#: lib/graphql/resolvers/resource.ex:199 #: lib/graphql/resolvers/resource.ex:199