github
/
phpservermon
mirror of https://github.com/phpservermon/phpservermon
1
0
Fork 0
Code Issues Releases Wiki Activity

Issue #734, Truncate server outputs (#741) 

* Truncate outputs

* Add modals to show the complete output

* Add 'See complete...' buttons

* Improve "See Complete..." button

* Use nl2br filter

* Use button instead of <a> looks much better

* Removed font-family: Mono

and changed 'see complete' to 'show more'.
pull/776/head
Federico Vera 2019-09-17 08:06:12 -03:00 committed by TimZ99
parent accd55630a
commit 9db07f2c09
No known key found for this signature in database
GPG Key ID: 4D8268DC68E8339D
2 changed files with 70 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/psm/Module/Server/Controller/ServerController.php
View File

@ -453,6 +453,18 @@ class ServerController extends AbstractServerController {
'label' => $server_available['label'], 'label' => $server_available['label'],
); );
} }
$tpl_data['last_output_truncated'] = $tpl_data['last_output'];
$tpl_data['last_error_output_truncated'] = $tpl_data['last_error_output'];
if (strlen($tpl_data['last_output']) > 255) {
$tpl_data['last_output_truncated'] = substr($tpl_data['last_output'], 0, 255) . '...';
}
if (strlen($tpl_data['last_error_output']) > 255) {
$tpl_data['last_error_output_truncated'] = substr($tpl_data['last_error_output'], 0, 255) . '...';
}
return $this->twig->render('module/server/server/view.tpl.html', $tpl_data); return $this->twig->render('module/server/server/view.tpl.html', $tpl_data);
} }

61
src/templates/default/module/server/server/view.tpl.html
View File

@ -233,13 +233,30 @@
<li class="list-group-item"> <li class="list-group-item">
<dl class="row"> <dl class="row">
<dt class="col-md-3">{{ label_last_output }}:</dt> <dt class="col-md-3">{{ label_last_output }}:</dt>
<dd class="col-md-9">{{ last_output }}</dd> <dd class="col-md-9">{{ last_output_truncated }}</dd>
{% if last_output_truncated != last_output %}
<dt class="col-md-3"></dt>
<dd class="col-md-9">
<button type="button" class="btn btn-link" style="float: right;" data-toggle="modal" data-target="#modal_last_output">
Show more...
</button>
</dd>
{% endif %}
</dl> </dl>
</li> </li>
<li class="list-group-item"> <li class="list-group-item">
<dl class="row"> <dl class="row">
<dt class="col-md-3">{{ label_last_error_output }}:</dt> <dt class="col-md-3">{{ label_last_error_output }}:</dt>
<dd class="col-md-9">{{ last_error_output }}</dd> <dd class="col-md-9">{{ last_error_output_truncated }}</dd>
{% if last_error_output_truncated != last_error_output %}
<dt class="col-md-3"></dt>
<dd class="col-md-9">
<button type="button" class="btn btn-link" style="float: right;" data-toggle="modal" data-target="#modal_last_error">
Show more...
</button>
</dd>
{% endif %}
</dl> </dl>
</li> </li>
</ul> </ul>
@ -320,4 +337,42 @@
<div class="row"> <div class="row">
{{ html_history|raw }} {{ html_history|raw }}
</div> </div>
</div>
<div class="modal fade" id="modal_last_output" tabindex="-1" role="dialog" aria-labelledby="modal_last_output_label" aria-hidden="true">
<div class="modal-dialog" style="width:75%;max-width: 100%" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="modal_last_output_label">{{ label_last_output }}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body" style="word-wrap: break-word;">
{{ last_output|nl2br }}
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
<div class="modal fade" id="modal_last_error" tabindex="-1" role="dialog" aria-labelledby="modal_last_error_label" aria-hidden="true">
<div class="modal-dialog" style="width:75%;max-width: 100%" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="modal_last_error_label">{{ label_last_error_output }}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body" style="word-wrap: break-word;">
{{ last_error_output|nl2br }}
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
</div>