ilja_space/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Small fixes to copyright-panel and restoring the state of the menus

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-08-02 13:33:29 +02:00
parent fda88fcccf
commit 97394a68cd
4 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

1
assets/layers/questions/questions.json
View file

@ -2088,7 +2088,6 @@
{
"if": "internet_access=no",
"icon": "wifi;cross_bottom_right:red",
"then": {
"en": "This place <b>does not</b> offer internet access",
"nl": "Deze plaats biedt <b>geen</b> internettoegang aan",

39
src/Logic/Web/ThemeViewStateHashActor.ts
View file

@ -17,7 +17,7 @@ export default class ThemeViewStateHashActor {
"The possible hashes are:",
"",
MenuState._menuviewTabs.map((tab) => "`menu:" + tab + "`").join(","),
MenuState._themeviewTabs.map((tab) => "`theme-menu:" + tab + "`").join(","),
MenuState._themeviewTabs.map((tab) => "`theme-menu:" + tab + "`").join(",")
]
/**
@ -120,27 +120,30 @@ export default class ThemeViewStateHashActor {
private loadStateFromHash(hash: string) {
const state = this._state
const parts = hash.split(":")
outer: for (const { toggle, name, submenu } of state.guistate.allToggles) {
for (const part of parts) {
if (part === name) {
for (const superpart of hash.split(";")) {
const parts = superpart.at(-1)?.split(":") ?? []
outer: for (const { toggle, name, submenu } of state.guistate.allToggles) {
for (const part of parts) {
if (part.indexOf(":") < 0) {
if (part === name) {
toggle.setData(true)
continue outer
}
continue
}
const [main, submenuValue] = part.split(":")
if (part !== main) {
continue
}
toggle.setData(true)
submenu?.setData(submenuValue)
continue outer
}
if (part.indexOf(":") < 0) {
continue
}
const [main, submenuValue] = part.split(":")
if (part !== main) {
continue
}
toggle.setData(true)
submenu?.setData(submenuValue)
continue outer
}
// If we arrive here, the loop above has not found any match
toggle.setData(false)
// If we arrive here, the loop above has not found any match
toggle.setData(false)
}
}
}

5
src/UI/BigComponents/CopyrightPanel.svelte
View file

@ -13,11 +13,10 @@
import ContributorCount from "../../Logic/ContributorCount"
import BaseUIElement from "../BaseUIElement"
import Github from "../../assets/svg/Github.svelte"
import { DatabaseIcon, TranslateIcon } from "@rgossiaux/svelte-heroicons/solid"
import { TranslateIcon } from "@rgossiaux/svelte-heroicons/solid"
import Osm_logo from "../../assets/svg/Osm_logo.svelte"
import Generic_map from "../../assets/svg/Generic_map.svelte"
import { PencilIcon, UserGroupIcon, UsersIcon } from "@babeard/svelte-heroicons/solid"
import Loading from "../Base/Loading.svelte"
import { UserGroupIcon} from "@babeard/svelte-heroicons/solid"
import Marker from "../Map/Marker.svelte"
export let state: SpecialVisualizationState

5
src/UI/ThemeViewGUI.svelte
View file

@ -46,7 +46,6 @@
import PendingChangesIndicator from "./BigComponents/PendingChangesIndicator.svelte"
import Cross from "../assets/svg/Cross.svelte"
import LanguagePicker from "./InputElement/LanguagePicker.svelte"
import Bug from "../assets/svg/Bug.svelte"
import Min from "../assets/svg/Min.svelte"
import Plus from "../assets/svg/Plus.svelte"
import Filter from "../assets/svg/Filter.svelte"
@ -650,7 +649,7 @@
</If>
<If condition={state.guistate.copyrightPanelIsOpened}>
<FloatOver on:close={() => state.guistate.privacyPanelIsOpened.setData(false)}>
<FloatOver on:close={() => state.guistate.copyrightPanelIsOpened.setData(false)}>
<div class="flex h-full flex-col overflow-hidden">
<h1 class="low-interaction m-0 flex items-center p-4 drop-shadow-md">
<Tr t={Translations.t.general.attribution.title} />
@ -660,7 +659,7 @@
<Tr t={Translations.t.general.menu.aboutMapComplete} />
</h2>
<AboutMapComplete {state} />
<ToSvelte construct={() => new CopyrightPanel(state)} />
<CopyrightPanel {state}/>
</div>
</div>
</FloatOver>