YunoHost/yunohost-admin
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost-admin.git synced 2024-09-03 20:06:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

[enh] Better more logs button

Browse source
This commit is contained in:
ljf 2018-06-04 03:51:12 +02:00
parent 07d2e1c3bd
commit de8459d753
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/locales/en.json
View file

@ -316,5 +316,12 @@
"logs_access": "List of access and bans", "logs_access": "List of access and bans",
"logs_service": "Services logs", "logs_service": "Services logs",
"logs_app": "Apps logs", "logs_app": "Apps logs",
"logs_no_logs_registered": "No log registered for this category" "logs_no_logs_registered": "No log registered for this category",
"logs_end_with_error": "This log finished with the error :",
"logs_error": "Error",
"logs_ended_at": "End",
"logs_started_at": "Start",
"logs_path": "Path",
"logs_context": "Context",
"logs_more": "Display more lines"
} }

14
src/views/tools/tools_log.ms
View file

@ -21,9 +21,10 @@
</div> </div>
<div class="panel-body"> <div class="panel-body">
<dl class="dl-horizontal" id="metadata"> <dl class="dl-horizontal" id="metadata">
<dt>{{t 'path'}}</dt> <dd>{{ log.log_path }}</dd> <dt>{{t 'logs_path'}}</dt> <dd>{{ log.log_path }}</dd>
{{#if log.metadata.started_at}}<dt>{{t 'started_at'}}</dt> <dd>{{formatTime log.metadata.started_at day="numeric" month="long" year="numeric" hour="numeric" minute="numeric"}}</dd> {{#if log.metadata.started_at}}<dt>{{t 'logs_started_at'}}</dt> <dd>{{formatTime log.metadata.started_at day="numeric" month="long" year="numeric" hour="numeric" minute="numeric"}}</dd>
{{/if}}{{#if log.metadata.ended_at}}<dt>{{t 'ended_at'}}</dt> <dd>{{formatTime log.metadata.ended_at day="numeric" month="long" year="numeric" hour="numeric" minute="numeric"}}</dd>{{/if}} {{/if}}{{#if log.metadata.ended_at}}<dt>{{t 'logs_ended_at'}}</dt> <dd>{{formatTime log.metadata.ended_at day="numeric" month="long" year="numeric" hour="numeric" minute="numeric"}}</dd>{{/if}}
{{#if log.metadata.error}}<dt>{{t 'logs_error'}}</dt> <dd>{{t 'logs_end_with_error'}} {{log.metadata.error}}</dd>{{/if}}
</dl> </dl>
</div> </div>
</div> </div>
@ -32,7 +33,7 @@
<div class="panel-heading" role="tab" id="heading-context"> <div class="panel-heading" role="tab" id="heading-context">
<h2 class="panel-title"> <h2 class="panel-title">
<a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse-context" aria-expanded="true" aria-controls="collapse-context"> <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapse-context" aria-expanded="true" aria-controls="collapse-context">
<span class="fa-fw fa-bug"></span>{{t 'Context'}} <span class="fa-fw fa-bug"></span>{{t 'logs_context'}}
</a> </a>
</h2> </h2>
</div> </div>
@ -53,10 +54,7 @@
<h2 class="panel-title"><span class="fa-fw fa-file-text"></span> {{#if log.metadata}}{{t 'logs'}}{{else}}{{log.log_path}}{{/if}}</h2> <h2 class="panel-title"><span class="fa-fw fa-file-text"></span> {{#if log.metadata}}{{t 'logs'}}{{else}}{{log.log_path}}{{/if}}</h2>
</div> </div>
<div class="panel-body overflow-auto"> <div class="panel-body overflow-auto">
{{#if log.metadata.error}} {{#if next_number}}<a href="#/tools/logs/{{#if log.name}}{{ log.name }}{{else}}{{ log.log_path }}{{/if}}?number={{ next_number }}" class="btn btn-default full-width"><span class="fa-fw fa-plus"></span> {{t 'logs_more'}}</a>{{/if}}
<div class="alert alert-warning" role="alert"><span class="fas fa-exclamation-triangle"></span> <strong>{{t 'Error'}}</strong>: {{log.metadata.error}}</div>
{{/if}}
{{#if next_number}}<a href="#/tools/logs/{{#if log.name}}{{ log.name }}{{else}}{{ log.log_path }}{{/if}}?number={{ next_number }}">MORE</a>{{/if}}
<!-- no indent because pre is sensible to whitespaces --> <!-- no indent because pre is sensible to whitespaces -->
<pre id="log" class="full-width">{{#log.logs}}{{.}} <pre id="log" class="full-width">{{#log.logs}}{{.}}
{{/log.logs}}</pre> {{/log.logs}}</pre>