diff --git a/Base/res/html/directory.html b/Base/res/ladybird/directory.html similarity index 100% rename from Base/res/html/directory.html rename to Base/res/ladybird/directory.html diff --git a/Base/res/html/error.html b/Base/res/ladybird/error.html similarity index 100% rename from Base/res/html/error.html rename to Base/res/ladybird/error.html diff --git a/Base/res/html/inspector/inspector.css b/Base/res/ladybird/inspector.css similarity index 100% rename from Base/res/html/inspector/inspector.css rename to Base/res/ladybird/inspector.css diff --git a/Base/res/html/inspector/inspector.js b/Base/res/ladybird/inspector.js similarity index 100% rename from Base/res/html/inspector/inspector.js rename to Base/res/ladybird/inspector.js diff --git a/Base/res/html/misc/new-tab.html b/Base/res/ladybird/new-tab.html similarity index 97% rename from Base/res/html/misc/new-tab.html rename to Base/res/ladybird/new-tab.html index cf69818562..d18313c6c9 100644 --- a/Base/res/html/misc/new-tab.html +++ b/Base/res/ladybird/new-tab.html @@ -40,7 +40,7 @@

-

+



diff --git a/Ladybird/Android/src/main/cpp/WebContentService.cpp b/Ladybird/Android/src/main/cpp/WebContentService.cpp index b0f10d7174..f0924bfbbc 100644 --- a/Ladybird/Android/src/main/cpp/WebContentService.cpp +++ b/Ladybird/Android/src/main/cpp/WebContentService.cpp @@ -73,8 +73,8 @@ ErrorOr service_main(int ipc_socket, int fd_passing_socket) Web::Platform::FontPlugin::install(*new Ladybird::FontPlugin(is_layout_test_mode)); Web::set_resource_directory_url(TRY(String::formatted("file://{}/res", s_serenity_resource_root))); - Web::set_error_page_url(TRY(String::formatted("file://{}/res/html/error.html", s_serenity_resource_root))); - Web::set_directory_page_url(TRY(String::formatted("file://{}/res/html/directory.html", s_serenity_resource_root))); + Web::set_error_page_url(TRY(String::formatted("file://{}/res/ladybird/error.html", s_serenity_resource_root))); + Web::set_directory_page_url(TRY(String::formatted("file://{}/res/ladybird/directory.html", s_serenity_resource_root))); TRY(Web::Bindings::initialize_main_thread_vm()); diff --git a/Ladybird/WebContent/main.cpp b/Ladybird/WebContent/main.cpp index 52cd886d9f..33c9b8f955 100644 --- a/Ladybird/WebContent/main.cpp +++ b/Ladybird/WebContent/main.cpp @@ -107,8 +107,8 @@ ErrorOr serenity_main(Main::Arguments arguments) Web::Platform::FontPlugin::install(*new Ladybird::FontPlugin(is_layout_test_mode)); Web::set_resource_directory_url(TRY(String::formatted("file://{}/res", s_serenity_resource_root))); - Web::set_error_page_url(TRY(String::formatted("file://{}/res/html/error.html", s_serenity_resource_root))); - Web::set_directory_page_url(TRY(String::formatted("file://{}/res/html/directory.html", s_serenity_resource_root))); + Web::set_error_page_url(TRY(String::formatted("file://{}/res/ladybird/error.html", s_serenity_resource_root))); + Web::set_directory_page_url(TRY(String::formatted("file://{}/res/ladybird/directory.html", s_serenity_resource_root))); TRY(Web::Bindings::initialize_main_thread_vm()); diff --git a/Ladybird/WebWorker/main.cpp b/Ladybird/WebWorker/main.cpp index ecb84f6b1a..75b6c9533f 100644 --- a/Ladybird/WebWorker/main.cpp +++ b/Ladybird/WebWorker/main.cpp @@ -48,8 +48,8 @@ ErrorOr serenity_main(Main::Arguments arguments) VERIFY(fd_passing_socket >= 0); Web::set_resource_directory_url(TRY(String::formatted("file://{}/res", s_serenity_resource_root))); - Web::set_error_page_url(TRY(String::formatted("file://{}/res/html/error.html", s_serenity_resource_root))); - Web::set_directory_page_url(TRY(String::formatted("file://{}/res/html/directory.html", s_serenity_resource_root))); + Web::set_error_page_url(TRY(String::formatted("file://{}/res/ladybird/error.html", s_serenity_resource_root))); + Web::set_directory_page_url(TRY(String::formatted("file://{}/res/ladybird/directory.html", s_serenity_resource_root))); TRY(Web::Bindings::initialize_main_thread_vm()); diff --git a/Userland/Applications/BrowserSettings/Defaults.h b/Userland/Applications/BrowserSettings/Defaults.h index 4090d4e4ff..f9347d08d1 100644 --- a/Userland/Applications/BrowserSettings/Defaults.h +++ b/Userland/Applications/BrowserSettings/Defaults.h @@ -33,7 +33,7 @@ inline String const& default_new_tab_url() { // FIXME: Teach LibWeb how to load resource:// URLs, rather than converting to a file:// URL here. static auto default_new_tab_url = []() { - static constexpr auto url = "resource://html/misc/new-tab.html"sv; + static constexpr auto url = "resource://ladybird/new-tab.html"sv; return MUST(Core::Resource::load_from_uri(url))->file_url(); }(); diff --git a/Userland/Libraries/LibWeb/Loader/GeneratedPagesLoader.cpp b/Userland/Libraries/LibWeb/Loader/GeneratedPagesLoader.cpp index c407d7e4dc..21d0a7b4ee 100644 --- a/Userland/Libraries/LibWeb/Loader/GeneratedPagesLoader.cpp +++ b/Userland/Libraries/LibWeb/Loader/GeneratedPagesLoader.cpp @@ -26,7 +26,7 @@ void set_resource_directory_url(String resource_directory_url) s_resource_directory_url = resource_directory_url; } -static String s_error_page_url = "file:///res/html/error.html"_string; +static String s_error_page_url = "file:///res/ladybird/error.html"_string; String error_page_url() { @@ -38,7 +38,7 @@ void set_error_page_url(String error_page_url) s_error_page_url = error_page_url; } -static String s_directory_page_url = "file:///res/html/directory.html"_string; +static String s_directory_page_url = "file:///res/ladybird/directory.html"_string; String directory_page_url() { diff --git a/Userland/Libraries/LibWebView/InspectorClient.cpp b/Userland/Libraries/LibWebView/InspectorClient.cpp index 525782f025..8e4e84c49b 100644 --- a/Userland/Libraries/LibWebView/InspectorClient.cpp +++ b/Userland/Libraries/LibWebView/InspectorClient.cpp @@ -201,8 +201,8 @@ void InspectorClient::load_inspector() StringBuilder builder; // FIXME: Teach LibWeb how to load resource:// URIs instead of needing to read these files here. - auto inspector_css = MUST(Core::Resource::load_from_uri("resource://html/inspector/inspector.css"sv)); - auto inspector_js = MUST(Core::Resource::load_from_uri("resource://html/inspector/inspector.js"sv)); + auto inspector_css = MUST(Core::Resource::load_from_uri("resource://ladybird/inspector.css"sv)); + auto inspector_js = MUST(Core::Resource::load_from_uri("resource://ladybird/inspector.js"sv)); builder.append(R"~~~(