Restore desktop navigation and refine layouts

core/tests.py

@@ -118,6 +118,35 @@ class FormattingToolbarTests(TestCase):
         self.assertContains(response, "u:'underline'")
 
 
+class NavigationAndLayoutTests(TestCase):
+    def setUp(self):
+        self.user = get_user_model().objects.create_user(username='navigation', password='secret')
+        self.preferences = UserPreference.objects.create(user=self.user)
+        self.client.force_login(self.user)
+
+    def test_desktop_navigation_contains_overview_hidden_links_and_kanban(self):
+        self.preferences.show_notes = False
+        self.preferences.save(update_fields=['show_notes'])
+        response = self.client.get(reverse('index'))
+        self.assertContains(response, 'd-none d-md-flex')
+        self.assertContains(response, f'{reverse("index")}?kind=note')
+        self.assertContains(response, reverse('kanban_list'))
+
+    def test_preference_selects_are_stacked(self):
+        response = self.client.get(reverse('settings'))
+        preferences = response.content.decode().split('id="preferences"', 1)[1].split('name="due_first"', 1)[0]
+        self.assertEqual(preferences.count('<div class="col-12"><label class="form-label">'), 3)
+
+    def test_composer_menu_is_before_toolbar_and_file_controls(self):
+        response = self.client.get(reverse('index'))
+        html = response.content.decode()
+        menu_position = html.index('composer-slash-menu')
+        toolbar_position = html.index('format-toolbar', menu_position)
+        file_position = html.index('desktop-file', toolbar_position)
+        self.assertLess(menu_position, toolbar_position)
+        self.assertLess(toolbar_position, file_position)
+
+
 class CopyButtonTests(TestCase):
     def test_item_has_copy_button_with_original_text(self):
         user = get_user_model().objects.create_user(username='tester', password='secret')