Usertest: add 'back to theme overview'-button on theme intro page, fix #1457

This commit is contained in:
Pieter Vander Vennet 2023-06-15 16:11:36 +02:00
parent 6d337e8775
commit 1b99be524f
3 changed files with 107 additions and 82 deletions

View file

@ -17,7 +17,7 @@
} }
</script> </script>
<div class="tabbedgroup h-full w-full"> <div class="tabbedgroup h-full flex w-full">
<TabGroup <TabGroup
class="flex h-full w-full flex-col" class="flex h-full w-full flex-col"
defaultIndex={1} defaultIndex={1}
@ -67,23 +67,23 @@
</TabList> </TabList>
<slot name="post-tablist" /> <slot name="post-tablist" />
</div> </div>
<div class="normal-background overflow-y-auto"> <div class="normal-background overflow-y-auto h-full">
<TabPanels defaultIndex={$tab}> <TabPanels class="tabpanels" defaultIndex={$tab}>
<TabPanel> <TabPanel class="tabpanel">
<slot name="content0"> <slot name="content0">
<div>Empty</div> <div>Empty</div>
</slot> </slot>
</TabPanel> </TabPanel>
<TabPanel> <TabPanel class="tabpanel">
<slot name="content1" /> <slot name="content1" />
</TabPanel> </TabPanel>
<TabPanel> <TabPanel class="tabpanel">
<slot name="content2" /> <slot name="content2" />
</TabPanel> </TabPanel>
<TabPanel> <TabPanel class="tabpanel">
<slot name="content3" /> <slot name="content3" />
</TabPanel> </TabPanel>
<TabPanel> <TabPanel class="tabpanel">
<slot name="content4" /> <slot name="content4" />
</TabPanel> </TabPanel>
</TabPanels> </TabPanels>
@ -97,6 +97,15 @@
height: 100%; height: 100%;
} }
:global(.tabpanel) {
height:100%;
}
:global(.tabpanels) {
height: calc( 100% - 2rem );
}
:global(.tab) { :global(.tab) {
margin: 0.25rem; margin: 0.25rem;
padding: 0.25rem; padding: 0.25rem;

View file

@ -11,6 +11,7 @@
import {UIEventSource} from "../../Logic/UIEventSource" import {UIEventSource} from "../../Logic/UIEventSource"
import {SearchIcon} from "@rgossiaux/svelte-heroicons/solid" import {SearchIcon} from "@rgossiaux/svelte-heroicons/solid"
import {twJoin} from "tailwind-merge" import {twJoin} from "tailwind-merge"
import {Utils} from "../../Utils";
/** /**
* The theme introduction panel * The theme introduction panel
@ -38,6 +39,11 @@
} }
</script> </script>
<div class="flex flex-col justify-between h-full">
<div>
<!-- Intro, description, ... -->
<Tr t={layout.description}/> <Tr t={layout.description}/>
<Tr t={Translations.t.general.welcomeExplanation.general}/> <Tr t={Translations.t.general.welcomeExplanation.general}/>
{#if layout.layers.some((l) => l.presets?.length > 0)} {#if layout.layers.some((l) => l.presets?.length > 0)}
@ -46,10 +52,10 @@
</If> </If>
{/if} {/if}
<!--toTheMap,
loginStatus.SetClass("block mt-6 pt-2 md:border-t-2 border-dotted border-gray-400"),
-->
<Tr t={layout.descriptionTail}/> <Tr t={layout.descriptionTail}/>
<!-- Buttons: open map, go to location, search -->
<NextButton clss="primary w-full" on:click={() => state.guistate.themeIsOpened.setData(false)}> <NextButton clss="primary w-full" on:click={() => state.guistate.themeIsOpened.setData(false)}>
<div class="flex w-full justify-center text-2xl"> <div class="flex w-full justify-center text-2xl">
<Tr t={Translations.t.general.openTheMap}/> <Tr t={Translations.t.general.openTheMap}/>
@ -86,3 +92,13 @@ loginStatus.SetClass("block mt-6 pt-2 md:border-t-2 border-dotted border-gray-40
</button> </button>
</div> </div>
</div> </div>
</div>
<div class="links-as-button links-w-full m-2 flex flex-col gap-y-1">
<!-- bottom buttons, a bit hidden away: switch layout -->
<a class="flex" href={Utils.HomepageLink()}>
<img class="h-6 w-6" src="./assets/svg/add.svg"/>
<Tr t={Translations.t.general.backToIndex}/>
</a>
</div>
</div>

View file

@ -269,7 +269,7 @@
<Tr t={layout.title}/> <Tr t={layout.title}/>
</div> </div>
<div class="m-4" slot="content0"> <div class="m-4 h-full" slot="content0">
<ThemeIntroPanel {state}/> <ThemeIntroPanel {state}/>
</div> </div>