diff --git a/e2e/e2e_edit.py b/e2e/e2e_edit.py index 5e668f0..d979b0e 100644 --- a/e2e/e2e_edit.py +++ b/e2e/e2e_edit.py @@ -51,10 +51,34 @@ def test_create_in_folder(page: Page, login): create.click() page.wait_for_url("http://localhost:8080/edit/en/") - expect(page.locator("[name=page]")).to_have_value("en/") + expect(page.locator("[name=page-language]")).to_have_value("en") + expect(page.locator("[name=page-name]")).to_have_value("") expect(page.locator("#create-hint")).to_be_visible() +def test_create_page_with_picker(page: Page, login): + """Check that the language and name picked on the create form are used.""" + page.goto("http://localhost:8080/edit/en/") + + page.locator("[name=page-language]").select_option("de") + page.locator("[name=page-name]").fill("Picked") + page.locator("[name=content]").fill("Picked page") + with page.expect_navigation(): + page.locator("[name=save]").click() + page.wait_for_url("http://localhost:8080/de/Picked") + + expect(page.locator("text=Picked page")).to_be_visible() + + +def test_create_page_picker_types(page: Page, login): + """Check that File can only be picked when creating a file.""" + page.goto("http://localhost:8080/edit/en/") + expect(page.locator("[name=page-namespace] option")).to_have_text(["Page", "Template", "Category"]) + + page.goto("http://localhost:8080/edit/File/en/Picker.png") + expect(page.locator("[name=page-namespace] option")).to_have_text(["File"]) + + def test_create_in_folder_without_login(page: Page): """Check that the create-in-folder link is hidden when not logged in.""" page.goto("http://localhost:8080/en/Main%20Page") diff --git a/e2e/e2e_namespace_category.py b/e2e/e2e_namespace_category.py index b2a9af9..6376f08 100644 --- a/e2e/e2e_namespace_category.py +++ b/e2e/e2e_namespace_category.py @@ -78,7 +78,7 @@ def test_category_cannot_edit_root(page: Page, login): edit.click() page.wait_for_url("http://localhost:8080/edit/Category/en/") - page.locator("[name=page]").fill("Category/en/Main Page") + page.locator("[name=page-name]").fill("Main Page") page.locator("[name=content]").fill("Some text") with page.expect_navigation(): page.locator("[name=save]").click() @@ -99,7 +99,8 @@ def test_category_edit_missing_language(page: Page, login): edit.click() page.wait_for_url("http://localhost:8080/edit/Category/en/") - page.locator("[name=page]").fill("Category/test") + page.locator("[name=page-language]").evaluate("(el, v) => { el.add(new Option(v, v)); el.value = v; }", "") + page.locator("[name=page-name]").fill("test") page.locator("[name=content]").fill("Some text") with page.expect_navigation(): page.locator("[name=save]").click() @@ -118,7 +119,8 @@ def test_category_edit_invalid_language(page: Page, login): edit.click() page.wait_for_url("http://localhost:8080/edit/Category/en/") - page.locator("[name=page]").fill("Category/zz/test") + page.locator("[name=page-language]").evaluate("(el, v) => { el.add(new Option(v, v)); el.value = v; }", "zz") + page.locator("[name=page-name]").fill("test") page.locator("[name=content]").fill("Some text") with page.expect_navigation(): page.locator("[name=save]").click() diff --git a/e2e/e2e_namespace_file.py b/e2e/e2e_namespace_file.py index 00404dc..32be044 100644 --- a/e2e/e2e_namespace_file.py +++ b/e2e/e2e_namespace_file.py @@ -419,7 +419,7 @@ def test_file_cannot_edit_root(page: Page, login): edit.click() page.wait_for_url("http://localhost:8080/edit/File/en/Test2.png") - page.locator("[name=page]").fill("File/en/Testing/Main Page") + page.locator("[name=page-name]").fill("Testing/Main Page") page.locator("[name=content]").fill("Some text") with page.expect_navigation(): page.locator("[name=save]").click() @@ -440,7 +440,7 @@ def test_file_cannot_edit_language(page: Page, login): edit.click() page.wait_for_url("http://localhost:8080/edit/File/en/Test2.png") - page.locator("[name=page]").fill("File/en/Main Page") + page.locator("[name=page-name]").fill("Main Page") page.locator("[name=content]").fill("Some text") with page.expect_navigation(): page.locator("[name=save]").click() @@ -461,7 +461,8 @@ def test_file_edit_missing_language(page: Page, login): edit.click() page.wait_for_url("http://localhost:8080/edit/File/en/Test2.png") - page.locator("[name=page]").fill("File/test") + page.locator("[name=page-language]").evaluate("(el, v) => { el.add(new Option(v, v)); el.value = v; }", "") + page.locator("[name=page-name]").fill("test") page.locator("[name=content]").fill("Some text") with page.expect_navigation(): page.locator("[name=save]").click() @@ -480,7 +481,8 @@ def test_file_edit_invalid_language(page: Page, login): edit.click() page.wait_for_url("http://localhost:8080/edit/File/en/Test2.png") - page.locator("[name=page]").fill("File/zz/test") + page.locator("[name=page-language]").evaluate("(el, v) => { el.add(new Option(v, v)); el.value = v; }", "zz") + page.locator("[name=page-name]").fill("test") page.locator("[name=content]").fill("Some text") with page.expect_navigation(): page.locator("[name=save]").click() diff --git a/e2e/e2e_namespace_template.py b/e2e/e2e_namespace_template.py index bd5343f..391cc60 100644 --- a/e2e/e2e_namespace_template.py +++ b/e2e/e2e_namespace_template.py @@ -140,7 +140,7 @@ def test_template_cannot_edit_root(page: Page, login): edit.click() page.wait_for_url("http://localhost:8080/edit/Template/en/") - page.locator("[name=page]").fill("Template/en/Main Page") + page.locator("[name=page-name]").fill("Main Page") page.locator("[name=content]").fill("Some text") with page.expect_navigation(): page.locator("[name=save]").click() @@ -161,7 +161,8 @@ def test_template_edit_missing_language(page: Page, login): edit.click() page.wait_for_url("http://localhost:8080/edit/Template/en/") - page.locator("[name=page]").fill("Template/test") + page.locator("[name=page-language]").evaluate("(el, v) => { el.add(new Option(v, v)); el.value = v; }", "") + page.locator("[name=page-name]").fill("test") page.locator("[name=content]").fill("Some text") with page.expect_navigation(): page.locator("[name=save]").click() @@ -180,7 +181,8 @@ def test_template_edit_invalid_language(page: Page, login): edit.click() page.wait_for_url("http://localhost:8080/edit/Template/en/") - page.locator("[name=page]").fill("Template/zz/test") + page.locator("[name=page-language]").evaluate("(el, v) => { el.add(new Option(v, v)); el.value = v; }", "zz") + page.locator("[name=page-name]").fill("test") page.locator("[name=content]").fill("Some text") with page.expect_navigation(): page.locator("[name=save]").click() diff --git a/static/truewiki/truewiki.css b/static/truewiki/truewiki.css index 243f35b..3589218 100644 --- a/static/truewiki/truewiki.css +++ b/static/truewiki/truewiki.css @@ -419,6 +419,27 @@ h6:hover .anchor { font-size: 80%; margin: 0 0 4px 0; } +#page-picker { + align-items: flex-end; + display: flex; + flex-wrap: wrap; + gap: 4px 6px; + margin-bottom: 4px; +} +#page-picker label { + color: #555; + display: flex; + flex-direction: column; + font-size: 12px; +} +#page-picker select, #page-picker input { + box-sizing: border-box; + font-size: 14px; + height: 26px; +} +#page-picker-name { + flex: 1 1 240px; +} #categories { float: left; } diff --git a/templates/Edit.mediawiki b/templates/Edit.mediawiki index 6a3f4bc..2b3b8eb 100644 --- a/templates/Edit.mediawiki +++ b/templates/Edit.mediawiki @@ -91,17 +91,21 @@
Tip: to add sub-pages to this page later, end its name with "/Main Page", like "en/Bridges/Main Page".
+Tip: to add sub-pages to this page later, end its name with "/Main Page", like "Bridges/Main Page".
}}