makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11150] Console liek output

Browse source 
PHPBB3-11150
This commit is contained in:
Tristan Darricau 2015-12-11 20:12:42 +01:00 • committed by Tristan Darricau
parent 6571067719
commit 4617037feb
No known key found for this signature in database
GPG key ID: 817043C2E29DB881
3 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/adm/style/admin.css
View file

@ -2969,3 +2969,10 @@ fieldset.permissions .permissions-switch {
/* stylelint-enable selector-no-qualifying-type */ /* stylelint-enable selector-no-qualifying-type */
/* stylelint-enable declaration-property-unit-blacklist */ /* stylelint-enable declaration-property-unit-blacklist */
/* stylelint-enable declaration-property-unit-whitelist */ /* stylelint-enable declaration-property-unit-whitelist */
.console-output {
background-color: #2a2a2a;
color: #f1f1f1;
font-family: monospace;
overflow-x:scroll;
}

7
phpBB/adm/style/detailed_message_body.html
View file

@ -5,11 +5,8 @@
<p>{{ MESSAGE_TEXT }}</p> <p>{{ MESSAGE_TEXT }}</p>
</div> </div>
<div style="overflow-x:scroll"> <div>
<fieldset> <fieldset class="console-output">
{%- if MESSAGE_DETAIL_LEGEND -%}
<legend>{{ MESSAGE_DETAIL_LEGEND|nl2br }}</legend>
{%- endif -%}
<pre>{{ MESSAGE_DETAIL }}</pre> <pre>{{ MESSAGE_DETAIL }}</pre>
</fieldset> </fieldset>
</div> </div>

10
phpBB/includes/acp/acp_extensions.php
View file

@ -453,7 +453,7 @@ class acp_extensions
$this->display_composer_exception($language, $e, $composer_io); $this->display_composer_exception($language, $e, $composer_io);
return; return;
} }
$this->tpl_name = 'detailled_message_body'; $this->tpl_name = 'detailed_message_body';
$this->template->assign_vars(array( $this->template->assign_vars(array(
'MESSAGE_TITLE' => $language->lang('ACP_EXTENSIONS_INSTALL'), 'MESSAGE_TITLE' => $language->lang('ACP_EXTENSIONS_INSTALL'),
@ -492,7 +492,7 @@ class acp_extensions
$this->display_composer_exception($language, $e, $composer_io); $this->display_composer_exception($language, $e, $composer_io);
return; return;
} }
$this->tpl_name = 'detailled_message_body'; $this->tpl_name = 'detailed_message_body';
$this->template->assign_vars(array( $this->template->assign_vars(array(
'MESSAGE_TITLE' => $language->lang('ACP_EXTENSIONS_REMOVE'), 'MESSAGE_TITLE' => $language->lang('ACP_EXTENSIONS_REMOVE'),
@ -531,7 +531,7 @@ class acp_extensions
$this->display_composer_exception($language, $e, $composer_io); $this->display_composer_exception($language, $e, $composer_io);
return; return;
} }
$this->tpl_name = 'detailled_message_body'; $this->tpl_name = 'detailed_message_body';
$this->template->assign_vars(array( $this->template->assign_vars(array(
'MESSAGE_TITLE' => $language->lang('ACP_EXTENSIONS_UPDATE'), 'MESSAGE_TITLE' => $language->lang('ACP_EXTENSIONS_UPDATE'),
@ -570,7 +570,7 @@ class acp_extensions
$this->display_composer_exception($language, $e, $composer_io); $this->display_composer_exception($language, $e, $composer_io);
return; return;
} }
$this->tpl_name = 'detailled_message_body'; $this->tpl_name = 'detailed_message_body';
$this->template->assign_vars(array( $this->template->assign_vars(array(
'MESSAGE_TITLE' => $language->lang('ACP_EXTENSIONS_MANAGE'), 'MESSAGE_TITLE' => $language->lang('ACP_EXTENSIONS_MANAGE'),
@ -689,7 +689,7 @@ class acp_extensions
*/ */
private function display_composer_exception(\phpbb\language\language $language, \phpbb\exception\runtime_exception $e, \phpbb\composer\io\web_io $composer_io) private function display_composer_exception(\phpbb\language\language $language, \phpbb\exception\runtime_exception $e, \phpbb\composer\io\web_io $composer_io)
{ {
$this->tpl_name = 'detailled_message_body'; $this->tpl_name = 'detailed_message_body';
if ($e->getPrevious()) if ($e->getPrevious())
{ {