From e0d0fb8379e5033e562368cce9b27d2aaeec413c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damian=20B=C3=BCchel?= Date: Thu, 6 Aug 2020 14:30:37 +0200 Subject: [PATCH] Removed unused load error page. --- .../BrowserApplicationInstance.cs | 7 ++----- SafeExamBrowser.Browser/Pages/HtmlLoader.cs | 18 ------------------ SafeExamBrowser.Browser/Pages/LoadError.html | 15 --------------- .../SafeExamBrowser.Browser.csproj | 3 --- SafeExamBrowser.I18n.Contracts/TextKey.cs | 5 ++--- SafeExamBrowser.I18n/Data/de.xml | 7 ++----- SafeExamBrowser.I18n/Data/en.xml | 7 ++----- 7 files changed, 8 insertions(+), 54 deletions(-) delete mode 100644 SafeExamBrowser.Browser/Pages/LoadError.html diff --git a/SafeExamBrowser.Browser/BrowserApplicationInstance.cs b/SafeExamBrowser.Browser/BrowserApplicationInstance.cs index a3f6f088..747c081b 100644 --- a/SafeExamBrowser.Browser/BrowserApplicationInstance.cs +++ b/SafeExamBrowser.Browser/BrowserApplicationInstance.cs @@ -220,9 +220,6 @@ namespace SafeExamBrowser.Browser window.UpdateAddress(address); } - /// - /// TODO: LoadError.html is not used, as navigating back from it doesn't work! Remove page if no better solution can be found. - /// private void Control_LoadFailed(int errorCode, string errorText, string url) { if (errorCode == (int) CefErrorCode.None) @@ -239,8 +236,8 @@ namespace SafeExamBrowser.Browser } else { - var title = text.Get(TextKey.Browser_LoadErrorPageTitle); - var message = text.Get(TextKey.Browser_LoadErrorPageMessage).Replace("%%URL%%", url) + $" {errorText} ({errorCode})"; + var title = text.Get(TextKey.Browser_LoadErrorTitle); + var message = text.Get(TextKey.Browser_LoadErrorMessage).Replace("%%URL%%", url) + $" {errorText} ({errorCode})"; logger.Warn($"Request for '{url}' failed: {errorText} ({errorCode})."); diff --git a/SafeExamBrowser.Browser/Pages/HtmlLoader.cs b/SafeExamBrowser.Browser/Pages/HtmlLoader.cs index eb1b361f..27c2393f 100644 --- a/SafeExamBrowser.Browser/Pages/HtmlLoader.cs +++ b/SafeExamBrowser.Browser/Pages/HtmlLoader.cs @@ -54,23 +54,5 @@ namespace SafeExamBrowser.Browser.Pages return html; } } - - internal string LoadErrorPage() - { - var assembly = Assembly.GetAssembly(typeof(HtmlLoader)); - var path = $"{typeof(HtmlLoader).Namespace}.LoadError.html"; - - using (var stream = assembly.GetManifestResourceStream(path)) - using (var reader = new StreamReader(stream)) - { - var html = reader.ReadToEnd(); - - html = html.Replace("%%MESSAGE%%", text.Get(TextKey.Browser_LoadErrorPageMessage)); - html = html.Replace("%%RETRY_BUTTON%%", text.Get(TextKey.Browser_LoadErrorPageButton)); - html = html.Replace("%%TITLE%%", text.Get(TextKey.Browser_LoadErrorPageTitle)); - - return html; - } - } } } diff --git a/SafeExamBrowser.Browser/Pages/LoadError.html b/SafeExamBrowser.Browser/Pages/LoadError.html deleted file mode 100644 index f2ab90e0..00000000 --- a/SafeExamBrowser.Browser/Pages/LoadError.html +++ /dev/null @@ -1,15 +0,0 @@ - - - - - %%TITLE%% - - -
-

%%TITLE%%

-

%%MESSAGE%%

-

%%STATUS%%

- -
- - \ No newline at end of file diff --git a/SafeExamBrowser.Browser/SafeExamBrowser.Browser.csproj b/SafeExamBrowser.Browser/SafeExamBrowser.Browser.csproj index 546bf5ff..60e9e784 100644 --- a/SafeExamBrowser.Browser/SafeExamBrowser.Browser.csproj +++ b/SafeExamBrowser.Browser/SafeExamBrowser.Browser.csproj @@ -134,9 +134,6 @@ - - - diff --git a/SafeExamBrowser.I18n.Contracts/TextKey.cs b/SafeExamBrowser.I18n.Contracts/TextKey.cs index 00f7e45a..83ca185c 100644 --- a/SafeExamBrowser.I18n.Contracts/TextKey.cs +++ b/SafeExamBrowser.I18n.Contracts/TextKey.cs @@ -20,9 +20,8 @@ namespace SafeExamBrowser.I18n.Contracts Browser_BlockedPageButton, Browser_BlockedPageMessage, Browser_BlockedPageTitle, - Browser_LoadErrorPageMessage, - Browser_LoadErrorPageButton, - Browser_LoadErrorPageTitle, + Browser_LoadErrorMessage, + Browser_LoadErrorTitle, Browser_Name, Browser_Tooltip, BrowserWindow_DeveloperConsoleMenuItem, diff --git a/SafeExamBrowser.I18n/Data/de.xml b/SafeExamBrowser.I18n/Data/de.xml index eb56b7bb..08eceba8 100644 --- a/SafeExamBrowser.I18n/Data/de.xml +++ b/SafeExamBrowser.I18n/Data/de.xml @@ -18,13 +18,10 @@ Seite blockiert - + Beim Laden der Seite "%%URL%%" ist folgender Fehler aufgetreten: - - Erneut versuchen - - + Seiten-Ladefehler diff --git a/SafeExamBrowser.I18n/Data/en.xml b/SafeExamBrowser.I18n/Data/en.xml index 36cdb0a3..c09d532f 100644 --- a/SafeExamBrowser.I18n/Data/en.xml +++ b/SafeExamBrowser.I18n/Data/en.xml @@ -18,13 +18,10 @@ Page Blocked - + An error occurred while loading page "%%URL%%": - - Retry - - + Page Load Error