From b9360d1dff13e5fde8d6073fc47ce6af5bccdecf Mon Sep 17 00:00:00 2001
From: Pieter Vander Vennet <pietervdvn@posteo.net>
Date: Mon, 10 Feb 2025 03:08:22 +0100
Subject: [PATCH] UX(menu drawer): add extra category, reorder buttons

---
 langs/en.json                          |  1 +
 langs/themes/en.json                   |  2 +-
 src/UI/BigComponents/MenuDrawer.svelte | 91 ++++++++++++++------------
 3 files changed, 52 insertions(+), 42 deletions(-)

diff --git a/langs/en.json b/langs/en.json
index cf86f4bc10..83b1916f78 100644
--- a/langs/en.json
+++ b/langs/en.json
@@ -292,6 +292,7 @@
             "aboutCurrentThemeTitle": "About this map",
             "aboutMapComplete": "About MapComplete",
             "filter": "Filter data",
+            "legal": "Legal notices",
             "moreUtilsTitle": "Discover more",
             "openHereDifferentApp": "Open the current location in other applications",
             "showIntroduction": "Show introduction",
diff --git a/langs/themes/en.json b/langs/themes/en.json
index e3b1f45a81..0b14e7c892 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -788,7 +788,7 @@
                     "11": {
                         "options": {
                             "0": {
-                                "quesiton": "All platforms"
+                                "question": "All platforms"
                             },
                             "1": {
                                 "question": "Made with Android"
diff --git a/src/UI/BigComponents/MenuDrawer.svelte b/src/UI/BigComponents/MenuDrawer.svelte
index 73767bf41e..13b7c6cbeb 100644
--- a/src/UI/BigComponents/MenuDrawer.svelte
+++ b/src/UI/BigComponents/MenuDrawer.svelte
@@ -160,11 +160,20 @@
           <ReviewsOverview {state} />
         </div>
       </Page>
+      <div class="hidden-on-mobile w-full">
+        <Page {onlyLink} shown={pg.hotkeys}>
+          <svelte:fragment slot="header">
+            <BoltIcon />
+            <Tr t={Translations.t.hotkeyDocumentation.title} />
+          </svelte:fragment>
+          <HotkeyTable />
+        </Page>
+      </div>
+
       <div class="self-end">
         <LogoutButton osmConnection={state.osmConnection} />
       </div>
     </LoginToggle>
-
     <LanguagePicker />
   </SidebarUnit>
 
@@ -261,6 +270,15 @@
       <ShareIcon />
       <Tr t={t.openHereDifferentApp} />
     </a>
+
+    <a
+      class="flex"
+      href={window.location.protocol + "//" + window.location.host + "/inspector.html"}
+    >
+      <MagnifyingGlassCircle class="mr-2 h-6 w-6" />
+      <Tr t={Translations.t.inspector.menu} />
+    </a>
+
   </SidebarUnit>
 
   <!-- About MC: various outward links, legal info, ... -->
@@ -274,46 +292,13 @@
       <Tr t={Translations.t.general.morescreen.createYourOwnTheme} />
     </a>
 
-    <div class="hidden-on-mobile w-full">
-      <Page {onlyLink} shown={pg.hotkeys}>
-        <svelte:fragment slot="header">
-          <BoltIcon />
-          <Tr t={Translations.t.hotkeyDocumentation.title} />
-        </svelte:fragment>
-        <HotkeyTable />
-      </Page>
-    </div>
 
-    <a
-      class="flex"
-      href={window.location.protocol + "//" + window.location.host + "/inspector.html"}
-    >
-      <MagnifyingGlassCircle class="mr-2 h-6 w-6" />
-      <Tr t={Translations.t.inspector.menu} />
-    </a>
 
-    <a class="flex" href="https://source.mapcomplete.org/MapComplete/MapComplete/" target="_blank">
-      <Forgejo class="h-6 w-6" />
-      <Tr t={Translations.t.general.attribution.gotoSourceCode} />
-    </a>
-
-    <a
-      class="flex"
-      href="https://source.mapcomplete.org/MapComplete/MapComplete/issues"
-      target="_blank"
-    >
-      <Bug class="h-6 w-6" />
-      <Tr t={Translations.t.general.attribution.openIssueTracker} />
-    </a>
 
     <a class="flex" href="mailto:info@mapcomplete.org">
       <EnvelopeOpen class="h-6 w-6" />
       <Tr t={Translations.t.general.attribution.emailCreators} />
     </a>
-    <a class="flex" href={`${Constants.weblate}projects/mapcomplete/`} target="_blank">
-      <TranslateIcon class="h-6 w-6" />
-      <Tr t={Translations.t.translations.activateButton} />
-    </a>
 
     <a class="flex" href="https://en.osm.town/@MapComplete" target="_blank">
       <Mastodon class="h-6 w-6" />
@@ -325,6 +310,30 @@
       <Tr t={Translations.t.general.attribution.donate} />
     </a>
 
+
+    <a
+      class="flex"
+      href="https://source.mapcomplete.org/MapComplete/MapComplete/issues"
+      target="_blank"
+    >
+      <Bug class="h-6 w-6" />
+      <Tr t={Translations.t.general.attribution.openIssueTracker} />
+    </a>
+
+    <a class="flex" href="https://source.mapcomplete.org/MapComplete/MapComplete/" target="_blank">
+      <Forgejo class="h-6 w-6" />
+      <Tr t={Translations.t.general.attribution.gotoSourceCode} />
+    </a>
+    <a class="flex" href={`${Constants.weblate}projects/mapcomplete/`} target="_blank">
+      <TranslateIcon class="h-6 w-6" />
+      <Tr t={Translations.t.translations.activateButton} />
+    </a>
+
+  </SidebarUnit>
+  <SidebarUnit>
+    <h3>
+      <Tr t={Translations.t.general.menu.legal} />
+    </h3>
     <Page {onlyLink} shown={pg.copyright}>
       <svelte:fragment slot="header">
         <Copyright />
@@ -332,7 +341,6 @@
       </svelte:fragment>
       <CopyrightPanel {state} />
     </Page>
-
     <Page {onlyLink} shown={pg.copyright_icons}>
       <svelte:fragment slot="header">
         <Copyright />
@@ -349,11 +357,12 @@
       <PrivacyPolicy {state} />
     </Page>
 
-    <div class="subtle self-end">
-      {Constants.vNumber}
-      {#if $isAndroid}
-        Android
-      {/if}
-    </div>
   </SidebarUnit>
+
+  <div class="subtle self-end">
+    {Constants.vNumber}
+    {#if $isAndroid}
+      Android
+    {/if}
+  </div>
 </div>