From 21f7c82a95130625b5565d3dc9ed92e847a31ab2 Mon Sep 17 00:00:00 2001 From: BNoiZe Date: Fri, 29 Nov 2013 13:44:57 +0100 Subject: [PATCH] Updated language definitions for the new error reporting system, added templates to "Froxlor" theme --- lng/english.lng.php | 3 ++ lng/german.lng.php | 3 ++ .../Froxlor/admin/index/send_error_report.tpl | 43 ++++++++++++++++++ templates/Froxlor/assets/css/main.css | 1 + .../customer/index/send_error_report.tpl | 43 ++++++++++++++++++ templates/Froxlor/misc/dberrornice.tpl | 14 ++++-- .../Sparkle/admin/index/send_error_report.tpl | 13 +++--- .../assets/img/icons/error_report_big.png | Bin 0 -> 4137 bytes .../customer/index/send_error_report.tpl | 13 +++--- 9 files changed, 115 insertions(+), 18 deletions(-) create mode 100644 templates/Froxlor/admin/index/send_error_report.tpl create mode 100644 templates/Froxlor/customer/index/send_error_report.tpl create mode 100644 templates/Sparkle/assets/img/icons/error_report_big.png diff --git a/lng/english.lng.php b/lng/english.lng.php index 17b5dd66..9122d13e 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -1979,3 +1979,6 @@ $lng['serversettings']['phpfpm_settings']['ipcdir']['description'] = 'The direct $lng['panel']['news'] = 'News'; $lng['error']['sslredirectonlypossiblewithsslipport'] = 'Using the SSL redirect is only possible when the domain has at least one ssl-enabled IP/port combination assigned.'; $lng['error']['fcgidstillenableddeadlock'] = 'FCGID is currently active.
Please deactivate it before switching to another webserver than Apache2'; +$lng['error']['send_report_title'] = 'Send error report'; +$lng['error']['send_report_desc'] = 'Thank you for reporting this error and helping us to froxlor improve froxlor.
This is the email which will be sent to the froxlor developer team:'; +$lng['error']['send_report'] = 'Send report'; \ No newline at end of file diff --git a/lng/german.lng.php b/lng/german.lng.php index 796fcf6f..81577091 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -1705,3 +1705,6 @@ $lng['serversettings']['phpfpm_settings']['ipcdir']['description'] = 'In dieses $lng['panel']['news'] = 'Neuigkeiten'; $lng['error']['sslredirectonlypossiblewithsslipport'] = 'Eine SSL-Weiterleitung ist nur möglich, wenn der Domain mindestens eine IP/Port Kombination zugewiesen wurde, bei der SSL aktiviert ist.'; $lng['error']['fcgidstillenableddeadlock'] = 'FCGID ist derzeit aktiviert.
Bitte deaktiviere es, um einen anderen Webserver als Apache2 auswählen zu können.'; +$lng['error']['send_report_title'] = 'Fehler melden'; +$lng['error']['send_report_desc'] = 'Danke, dass Sie uns diesen Fehler melden und damit helfen Froxlor zu verbessern.
Folgender Bericht wird per Mail an das Froxlor Entwickler Team gesendet.'; +$lng['error']['send_report'] = 'Fehlerbericht senden'; \ No newline at end of file diff --git a/templates/Froxlor/admin/index/send_error_report.tpl b/templates/Froxlor/admin/index/send_error_report.tpl new file mode 100644 index 00000000..76c49e7d --- /dev/null +++ b/templates/Froxlor/admin/index/send_error_report.tpl @@ -0,0 +1,43 @@ +$header +
+
+

+   + {$lng['error']['send_report_title']} +

+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + +
+

{$lng['error']['send_report_desc']}

+
+ {$mail_html} +
+ +
+
+
+
+
+$footer diff --git a/templates/Froxlor/assets/css/main.css b/templates/Froxlor/assets/css/main.css index 6d610246..49a64048 100644 --- a/templates/Froxlor/assets/css/main.css +++ b/templates/Froxlor/assets/css/main.css @@ -266,6 +266,7 @@ p.submit { text-align: left; padding-top: 10px; padding-left: 10px; + padding-right: 10px; } .messagewrapper { diff --git a/templates/Froxlor/customer/index/send_error_report.tpl b/templates/Froxlor/customer/index/send_error_report.tpl new file mode 100644 index 00000000..76c49e7d --- /dev/null +++ b/templates/Froxlor/customer/index/send_error_report.tpl @@ -0,0 +1,43 @@ +$header +
+
+

+   + {$lng['error']['send_report_title']} +

+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + +
+

{$lng['error']['send_report_desc']}

+
+ {$mail_html} +
+ +
+
+
+
+
+$footer diff --git a/templates/Froxlor/misc/dberrornice.tpl b/templates/Froxlor/misc/dberrornice.tpl index 84b00ee8..80c14961 100644 --- a/templates/Froxlor/misc/dberrornice.tpl +++ b/templates/Froxlor/misc/dberrornice.tpl @@ -31,9 +31,15 @@
-

- Go back -

+ @@ -44,4 +50,4 @@ - + \ No newline at end of file diff --git a/templates/Sparkle/admin/index/send_error_report.tpl b/templates/Sparkle/admin/index/send_error_report.tpl index 6da355dd..7ddda746 100644 --- a/templates/Sparkle/admin/index/send_error_report.tpl +++ b/templates/Sparkle/admin/index/send_error_report.tpl @@ -2,23 +2,22 @@ $header

-   - Send error report +   + {$lng['error']['send_report_title']}

-
+
- +
@@ -32,7 +31,7 @@ $header diff --git a/templates/Sparkle/assets/img/icons/error_report_big.png b/templates/Sparkle/assets/img/icons/error_report_big.png new file mode 100644 index 0000000000000000000000000000000000000000..e3f1fbf5df7cf062d01e0deeae8f14993af2c2f0 GIT binary patch literal 4137 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 literal 0 HcmV?d00001 diff --git a/templates/Sparkle/customer/index/send_error_report.tpl b/templates/Sparkle/customer/index/send_error_report.tpl index 6da355dd..7ddda746 100644 --- a/templates/Sparkle/customer/index/send_error_report.tpl +++ b/templates/Sparkle/customer/index/send_error_report.tpl @@ -2,23 +2,22 @@ $header

-   - Send error report +   + {$lng['error']['send_report_title']}

-
+
-
-

Thank you for reporting this error and helping us to make froxlor better.

-

This is the e-mail that will be sent to the froxlor developer team:

+

{$lng['error']['send_report_desc']}
- +
+
@@ -32,7 +31,7 @@ $header
-

Thank you for reporting this error and helping us to make froxlor better.

-

This is the e-mail that will be sent to the froxlor developer team:

+

{$lng['error']['send_report_desc']}
- +