clones/Froxlor
1
0
Fork 0
mirror of https://github.com/Froxlor/Froxlor.git synced 2024-09-22 02:47:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #167 from BNoiZe/master

Browse Source 
Updated language definitions for the new error reporting system; added templates for Froxlor-theme
This commit is contained in:
Michael Kaufmann 2013-11-29 04:51:12 -08:00
commit b38479f92d
9 changed files with 115 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lng/english.lng.php
View File

@ -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.<br />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.<br />This is the email which will be sent to the froxlor developer team:';
$lng['error']['send_report'] = 'Send report';

3
lng/german.lng.php
View File

@ -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.<br />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.<br />Folgender Bericht wird per Mail an das Froxlor Entwickler Team gesendet.';
$lng['error']['send_report'] = 'Fehlerbericht senden';

43
templates/Froxlor/admin/index/send_error_report.tpl Normal file
View File

@ -0,0 +1,43 @@
$header
<article>
<header>
<h2>
<img src="templates/{$theme}/assets/img/icons/display.png" alt="" />&nbsp;
{$lng['error']['send_report_title']}
</h2>
</header>
<section>
<form method="post" action="{$linker->getLink(array('section' => 'index', 'errorid' => $errid))}" enctype="application/x-www-form-urlencoded">
<fieldset>
<input type="hidden" name="s" value="$s" />
<input type="hidden" name="page" value="$page" />
<input type="hidden" name="send" value="send" />
<table class="bradiusodd">
<thead>
<tr>
<th>
<p>{$lng['error']['send_report_desc']}</p>
</th>
</tr>
</thead>
<tbody>
<tr>
<td>
<code>{$mail_html}</code>
</td>
</tr>
</tbody>
<tfoot>
<tr>
<td align="center">
<input class="bottom" type="submit" value="{$lng['error']['send_report']}" />
</td>
</tr>
</tfoot>
</table>
</fieldset>
</form>
</section>
</article>
$footer

1
templates/Froxlor/assets/css/main.css
View File

@ -266,6 +266,7 @@ p.submit {
text-align: left;
padding-top: 10px;
padding-left: 10px;
padding-right: 10px;
}
.messagewrapper {

43
templates/Froxlor/customer/index/send_error_report.tpl Normal file
View File

@ -0,0 +1,43 @@
$header
<article>
<header>
<h2>
<img src="templates/{$theme}/assets/img/icons/display.png" alt="" />&nbsp;
{$lng['error']['send_report_title']}
</h2>
</header>
<section>
<form method="post" action="{$linker->getLink(array('section' => 'index', 'errorid' => $errid))}" enctype="application/x-www-form-urlencoded">
<fieldset>
<input type="hidden" name="s" value="$s" />
<input type="hidden" name="page" value="$page" />
<input type="hidden" name="send" value="send" />
<table class="bradiusodd">
<thead>
<tr>
<th>
<p>{$lng['error']['send_report_desc']}</p>
</th>
</tr>
</thead>
<tbody>
<tr>
<td>
<code>{$mail_html}</code>
</td>
</tr>
</tbody>
<tfoot>
<tr>
<td align="center">
<input class="bottom" type="submit" value="{$lng['error']['send_report']}" />
</td>
</tr>
</tfoot>
</table>
</fieldset>
</form>
</section>
</article>
$footer

14
templates/Froxlor/misc/dberrornice.tpl
View File

@ -31,9 +31,15 @@
<pre style="overflow:auto;"><DEBUG></pre>
</div>
</div>
<p class="submit">
<a href="#" title="Click here to go back" id="historyback">Go back</a>
</p>
<aside>
<div style="float:left;">
<a href="#" title="Click here to go back" id="historyback">Go back</a>
</div>
<div style="float:right;">
<a href="<LINK>" title="Click here to report error">Report error</a>
</div>
<div style="clear:both;"></div>
</aside>
</section>
</article>
@ -44,4 +50,4 @@
</span>
</footer>
</body>
</html>
</html>

13
templates/Sparkle/admin/index/send_error_report.tpl vendored
View File

@ -2,23 +2,22 @@ $header
<article>
<header>
<h2>
<img src="templates/{$theme}/assets/img/icons/display_big.png" alt="" />&nbsp;
Send error report
<img src="templates/{$theme}/assets/img/icons/error_report_big.png" alt="" />&nbsp;
{$lng['error']['send_report_title']}
</h2>
</header>
<section>
<section class="fullform bradius">
<form method="post" action="{$linker->getLink(array('section' => 'index', 'errorid' => $errid))}" enctype="application/x-www-form-urlencoded">
<fieldset>
<input type="hidden" name="s" value="$s" />
<input type="hidden" name="page" value="$page" />
<input type="hidden" name="send" value="send" />
<table class="bradius">
<table class="formtable">
<thead>
<tr>
<th>
<p>Thank you for reporting this error and helping us to make froxlor better.</p>
<p>This is the e-mail that will be sent to the froxlor developer team:</p>
<p>{$lng['error']['send_report_desc']}</p>
</th>
</tr>
</thead>
@ -32,7 +31,7 @@ $header
<tfoot>
<tr>
<td align="center">
<input class="bottom" type="submit" value="Send report" />
<input class="bottom" type="submit" value="{$lng['error']['send_report']}" />
</td>
</tr>
</tfoot>

BIN
templates/Sparkle/assets/img/icons/error_report_big.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB

13
templates/Sparkle/customer/index/send_error_report.tpl vendored
View File

@ -2,23 +2,22 @@ $header
<article>
<header>
<h2>
<img src="templates/{$theme}/assets/img/icons/display_big.png" alt="" />&nbsp;
Send error report
<img src="templates/{$theme}/assets/img/icons/error_report_big.png" alt="" />&nbsp;
{$lng['error']['send_report_title']}
</h2>
</header>
<section>
<section class="fullform bradius">
<form method="post" action="{$linker->getLink(array('section' => 'index', 'errorid' => $errid))}" enctype="application/x-www-form-urlencoded">
<fieldset>
<input type="hidden" name="s" value="$s" />
<input type="hidden" name="page" value="$page" />
<input type="hidden" name="send" value="send" />
<table class="bradius">
<table class="formtable">
<thead>
<tr>
<th>
<p>Thank you for reporting this error and helping us to make froxlor better.</p>
<p>This is the e-mail that will be sent to the froxlor developer team:</p>
<p>{$lng['error']['send_report_desc']}</p>
</th>
</tr>
</thead>
@ -32,7 +31,7 @@ $header
<tfoot>
<tr>
<td align="center">
<input class="bottom" type="submit" value="Send report" />
<input class="bottom" type="submit" value="{$lng['error']['send_report']}" />
</td>
</tr>
</tfoot>