aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm/style
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2015-12-11 21:31:27 +0100
committerTristan Darricau <tristan.darricau@sensiolabs.com>2016-01-09 15:35:17 +0100
commit78349ed80f24cb61ad05f997e97d805cc5b0409f (patch)
treea9daf2a506047e74c585beadf601ff697fd4f34a /phpBB/adm/style
parentf6524f4902bc843908ade3583d5453ce58b5327a (diff)
downloadforums-78349ed80f24cb61ad05f997e97d805cc5b0409f.tar
forums-78349ed80f24cb61ad05f997e97d805cc5b0409f.tar.gz
forums-78349ed80f24cb61ad05f997e97d805cc5b0409f.tar.bz2
forums-78349ed80f24cb61ad05f997e97d805cc5b0409f.tar.xz
forums-78349ed80f24cb61ad05f997e97d805cc5b0409f.zip
[ticket/14306] Automatically enable a safe mode when container building fails
PHPBB3-14306
Diffstat (limited to 'phpBB/adm/style')
-rw-r--r--phpBB/adm/style/overall_header.html20
1 files changed, 14 insertions, 6 deletions
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index ada88edff2..dbf27eb942 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -49,7 +49,7 @@ function marklist(id, name, state)
}
var rb = parent.getElementsByTagName('input');
-
+
for (var r = 0; r < rb.length; r++)
{
if (rb[r].name.substr(0, name.length) == name)
@@ -103,7 +103,7 @@ function popup(url, width, height, name)
<p><a href="{U_ADM_INDEX}">{L_ADMIN_INDEX}</a> &bull; <a href="{U_INDEX}">{L_FORUM_INDEX}</a></p>
<p id="skip"><a href="#acp">{L_SKIP}</a></p>
</div>
-
+
<div id="page-body">
<div id="tabs">
<ul>
@@ -120,7 +120,7 @@ function popup(url, width, height, name)
<!-- DEFINE $LI_USED = 0 -->
<!-- BEGIN l_block1 -->
<!-- IF l_block1.S_SELECTED -->
-
+
<!-- BEGIN l_block2 -->
<!-- IF .l_block1.l_block2.l_block3 -->
<!-- IF $LI_USED --></ul></div><!-- ENDIF -->
@@ -129,13 +129,13 @@ function popup(url, width, height, name)
<ul>
<!-- DEFINE $LI_USED = 1 -->
<!-- ENDIF -->
-
+
<!-- BEGIN l_block3 -->
<li<!-- IF l_block1.l_block2.l_block3.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.l_block2.l_block3.U_TITLE}"><span>{l_block1.l_block2.l_block3.L_TITLE}</span></a></li>
<!-- DEFINE $LI_USED = 1 -->
<!-- END l_block3 -->
<!-- END l_block2 -->
-
+
<!-- ENDIF -->
<!-- END l_block1 -->
<!-- IF $LI_USED -->
@@ -143,6 +143,14 @@ function popup(url, width, height, name)
</div>
<!-- ENDIF -->
</div>
-
+
<div id="main">
<div class="main">
+ <!-- IF CONTAINER_EXCEPTION !== false -->
+ <div class="errorbox">
+ <p>{L_CONTAINER_EXCEPTION}</p>
+ <p>{L_CONTAINER_EXCEPTION_DETAIL}</p>
+ <p>Exception message: {{ CONTAINER_EXCEPTION.getMessage() }}</p>
+ <pre>{{ CONTAINER_EXCEPTION.getTraceAsString() }}</pre>
+ </div>
+ <!-- ENDIF -->