Help also done

This commit is contained in:
nicolargo 2024-10-05 13:00:46 +02:00
parent 3f97874c63
commit e2d3179c43
9 changed files with 166 additions and 258 deletions

View File

@ -83,10 +83,6 @@
text-decoration: underline;
}
.text-right {
text-align: right;
}
.text-truncate {
display: block;
overflow: hidden;
@ -131,21 +127,33 @@
#quicklook {
span {
padding: 0;
margin: 0;
padding-left: 10px;
}
span:nth-child(1) {
padding-left: 0px;
}
* > th, td {
margin: 0;
padding: 0;
}
* > th:nth-child(1), td:nth-child(1) {
width: 4em;
}
* > th:nth-last-child(1), td:nth-last-child(1) {
width: 4em;
}
.progress {
margin-bottom: 0px;
min-width: 100px;
background-color: #000;
height: 12px;
height: 1.5em;
border-radius: 0px;
text-align: right;
}
.progress-bar-ok {
background-color: #3E7B04;
}
.progress-bar-careful {
background-color: #295183;

View File

@ -12,7 +12,10 @@
<div class="col" v-if="!args.disable_ip">
<glances-plugin-ip :data="data"></glances-plugin-ip>
</div>
<div class="col-auto ml-auto" v-if="!args.disable_uptime">
<div class="col-auto ms-auto" v-if="!args.disable_now">
<glances-plugin-now :data="data"></glances-plugin-now>
</div>
<div class="col-auto ms-auto" v-if="!args.disable_uptime">
<glances-plugin-uptime :data="data"></glances-plugin-uptime>
</div>
</div>

View File

@ -2,7 +2,7 @@
<div v-if="help">
<div class="container-fluid">
<div class="row">
<div class="col-sm-12 col-lg-24">{{ help.version }} {{ help.psutil_version }}</div>
<div class="col-sm-12 col-lg-24 title">{{ help.version }} {{ help.psutil_version }}</div>
</div>
<div class="row">&nbsp;</div>
<div class="row">
@ -12,241 +12,139 @@
</div>
<div class="row">&nbsp;</div>
</div>
<div class="divTable" style="width: 100%">
<div class="divTableBody">
<div class="divTableRow">
<div class="divTableHead">
{{ help.header_sort.replace(':', '') }}
</div>
<div class="divTableHead">
{{ help.header_show_hide.replace(':', '') }}
</div>
<div class="divTableHead">
{{ help.header_toggle.replace(':', '') }}
</div>
<div class="divTableHead">
{{ help.header_miscellaneous.replace(':', '') }}
</div>
</div>
<div class="divTableRow">
<div class="divTableCell">
{{ help.sort_auto }}
</div>
<div class="divTableCell">
{{ help.show_hide_application_monitoring }}
</div>
<div class="divTableCell">
{{ help.toggle_bits_bytes }}
</div>
<div class="divTableCell">
{{ help.misc_erase_process_filter }}
</div>
</div>
<div class="divTableRow">
<div class="divTableCell">
{{ help.sort_cpu }}
</div>
<div class="divTableCell">
{{ help.show_hide_diskio }}
</div>
<div class="divTableCell">
{{ help.toggle_count_rate }}
</div>
<div class="divTableCell">
{{ help.misc_generate_history_graphs }}
</div>
</div>
<div class="divTableRow">
<div class="divTableCell">
{{ help.sort_io_rate }}
</div>
<div class="divTableCell">
{{ help.show_hide_vms }}
</div>
<div class="divTableCell">
{{ help.show_hide_containers }}
</div>
<div class="divTableCell">
{{ help.toggle_used_free }}
</div>
<div class="divTableCell">
{{ help.misc_help }}
</div>
</div>
<div class="divTableRow">
<div class="divTableCell">
{{ help.sort_mem }}
</div>
<div class="divTableCell">
{{ help.show_hide_top_extended_stats }}
</div>
<div class="divTableCell">
{{ help.toggle_bar_sparkline }}
</div>
<div class="divTableCell">
{{ help.misc_accumulate_processes_by_program }}
</div>
</div>
<div class="divTableRow">
<div class="divTableCell">
{{ help.sort_process_name }}
</div>
<div class="divTableCell">
{{ help.show_hide_filesystem }}
</div>
<div class="divTableCell">
{{ help.toggle_separate_combined }}
</div>
<div class="divTableCell">
{{ help.misc_kill_process }} - N/A in WebUI
</div>
</div>
<div class="divTableRow">
<div class="divTableCell">
{{ help.sort_cpu_times }}
</div>
<div class="divTableCell">
{{ help.show_hide_gpu }}
</div>
<div class="divTableCell">
{{ help.toggle_live_cumulative }}
</div>
<div class="divTableCell">
{{ help.misc_reset_processes_summary_min_max }}
</div>
</div>
<div class="divTableRow">
<div class="divTableCell">
{{ help.sort_user }}
</div>
<div class="divTableCell">
{{ help.show_hide_ip }}
</div>
<div class="divTableCell">
{{ help.toggle_linux_percentage }}
</div>
<div class="divTableCell">{{ help.misc_quit }}</div>
</div>
<div class="divTableRow">
<div class="divTableCell">&nbsp;</div>
<div class="divTableCell">
{{ help.show_hide_tcp_connection }}
</div>
<div class="divTableCell">
{{ help.toggle_cpu_individual_combined }}
</div>
<div class="divTableCell">
{{ help.misc_reset_history }}
</div>
</div>
<div class="divTableRow">
<div class="divTableCell">&nbsp;</div>
<div class="divTableCell">
{{ help.show_hide_alert }}
</div>
<div class="divTableCell">
{{ help.toggle_gpu_individual_combined }}
</div>
<div class="divTableCell">
{{ help.misc_delete_warning_alerts }}
</div>
</div>
<div class="divTableRow">
<div class="divTableCell">&nbsp;</div>
<div class="divTableCell">
{{ help.show_hide_network }}
</div>
<div class="divTableCell">
{{ help.toggle_short_full }}
</div>
<div class="divTableCell">
{{ help.misc_delete_warning_and_critical_alerts }}
</div>
</div>
<div class="divTableRow">
<div class="divTableCell">&nbsp;</div>
<div class="divTableCell">
{{ help.sort_cpu_times }}
</div>
<div class="divTableCell">&nbsp;</div>
<div class="divTableCell">
{{ help.misc_edit_process_filter_pattern }} - N/A in WebUI
</div>
</div>
<div class="divTableRow">
<div class="divTableCell">&nbsp;</div>
<div class="divTableCell">
{{ help.show_hide_irq }}
</div>
<div class="divTableCell">&nbsp;</div>
<div class="divTableCell">&nbsp;</div>
</div>
<div class="divTableRow">
<div class="divTableCell">&nbsp;</div>
<div class="divTableCell">
{{ help.show_hide_raid_plugin }}
</div>
<div class="divTableCell">&nbsp;</div>
<div class="divTableCell">&nbsp;</div>
</div>
<div class="divTableRow">
<div class="divTableCell">&nbsp;</div>
<div class="divTableCell">
{{ help.show_hide_sensors }}
</div>
<div class="divTableCell">&nbsp;</div>
<div class="divTableCell">&nbsp;</div>
</div>
<div class="divTableRow">
<div class="divTableCell">&nbsp;</div>
<div class="divTableCell">
{{ help.show_hide_wifi_module }}
</div>
<div class="divTableCell">&nbsp;</div>
<div class="divTableCell">&nbsp;</div>
</div>
<div class="divTableRow">
<div class="divTableCell">&nbsp;</div>
<div class="divTableCell">
{{ help.show_hide_processes }}
</div>
<div class="divTableCell">&nbsp;</div>
<div class="divTableCell">&nbsp;</div>
</div>
<div class="divTableRow">
<div class="divTableCell">&nbsp;</div>
<div class="divTableCell">
{{ help.show_hide_left_sidebar }}
</div>
<div class="divTableCell">&nbsp;</div>
<div class="divTableCell">&nbsp;</div>
</div>
<div class="divTableRow">
<div class="divTableCell">&nbsp;</div>
<div class="divTableCell">
{{ help.show_hide_quick_look }}
</div>
<div class="divTableCell">&nbsp;</div>
<div class="divTableCell">&nbsp;</div>
</div>
<div class="divTableRow">
<div class="divTableCell">&nbsp;</div>
<div class="divTableCell">
{{ help.show_hide_cpu_mem_swap }}
</div>
<div class="divTableCell">&nbsp;</div>
<div class="divTableCell">&nbsp;</div>
</div>
<div class="divTableRow">
<div class="divTableCell">&nbsp;</div>
<div class="divTableCell">
{{ help.show_hide_all }}
</div>
<div class="divTableCell">&nbsp;</div>
<div class="divTableCell">&nbsp;</div>
</div>
</div>
</div>
<table class="table table-sm table-borderless table-striped table-hover">
<thead>
<tr>
<th>{{ help.header_sort.replace(':', '') }}</th>
<th>{{ help.header_show_hide.replace(':', '') }}</th>
<th>{{ help.header_toggle.replace(':', '') }}</th>
<th>{{ help.header_miscellaneous.replace(':', '') }}</th>
</tr>
</thead>
<tbody>
<tr>
<td>{{ help.sort_auto }}</td>
<td>{{ help.show_hide_application_monitoring }}</td>
<td>{{ help.toggle_bits_bytes }}</td>
<td>{{ help.misc_erase_process_filter }}</td>
</tr>
<tr>
<td>{{ help.sort_cpu }}</td>
<td>{{ help.show_hide_diskio }}</td>
<td>{{ help.toggle_count_rate }}</td>
<td>{{ help.misc_generate_history_graphs }}</td>
</tr>
<tr>
<td>{{ help.sort_io_rate }}</td>
<td>{{ help.show_hide_containers }}</td>
<td>{{ help.toggle_used_free }}</td>
<td>{{ help.misc_help }}</td>
</tr>
<tr>
<td>{{ help.sort_mem }}</td>
<td>{{ help.show_hide_top_extended_stats }}</td>
<td>{{ help.toggle_bar_sparkline }}</td>
<td>{{ help.misc_accumulate_processes_by_program }}</td>
</tr>
<tr>
<td>{{ help.sort_process_name }}</td>
<td>{{ help.show_hide_filesystem }}</td>
<td>{{ help.toggle_separate_combined }}</td>
<td>&nbsp;</td>
</tr>
<tr>
<td>{{ help.sort_cpu_times }}</td>
<td>{{ help.show_hide_gpu }}</td>
<td>{{ help.toggle_live_cumulative }}</td>
<td>{{ help.misc_reset_processes_summary_min_max }}</td>
</tr>
<tr>
<td>{{ help.sort_user }}</td>
<td>{{ help.show_hide_ip }}</td>
<td>{{ help.toggle_linux_percentage }}</td>
<td>{{ help.misc_quit }}</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>{{ help.show_hide_tcp_connection }}</td>
<td>{{ help.toggle_cpu_individual_combined }}</td>
<td>{{ help.misc_reset_history }}</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>{{ help.show_hide_alert }}</td>
<td>{{ help.toggle_gpu_individual_combined }}</td>
<td>{{ help.misc_delete_warning_alerts }}</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>{{ help.show_hide_network }}</td>
<td>{{ help.toggle_short_full }}</td>
<td>{{ help.misc_delete_warning_and_critical_alerts }}</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>{{ help.sort_cpu_times }}</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>{{ help.show_hide_irq }}</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>{{ help.show_hide_raid_plugin }}</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>{{ help.show_hide_sensors }}</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>{{ help.show_hide_wifi_module }}</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>{{ help.show_hide_processes }}</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>{{ help.show_hide_left_sidebar }}</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>{{ help.show_hide_quick_look }}</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>{{ help.show_hide_cpu_mem_swap }}</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr>
<td>&nbsp;</td>
<td>{{ help.show_hide_all }}</td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
</tbody>
</table>
<div class="row">&nbsp;</div>
<div>
<p>
For an exhaustive list of key bindings,

View File

@ -12,12 +12,12 @@
<!-- <div class="table">
<div class="table-row" v-for="(process, processId) in processes" :key="processId">
<div class="table-cell text-left" :class="getNameDecoration(process)">
<div class="table-cell text-start" :class="getNameDecoration(process)">
{{ process.name }}
</div>
<div class="table-cell text-left" v-if="process.regex">{{ process.count }}</div>
<div class="table-cell text-start" v-if="process.regex">{{ process.count }}</div>
<div
class="table-cell text-left process-result"
class="table-cell text-start process-result"
v-html="$filters.nl2br(process.result)"
></div>
</div>

View File

@ -1,7 +1,7 @@
<template>
<section id="now" class="plugin">
<div class="table-row">
<div class="table-cell text-left">{{ date_custom }}</div>
<div class="table-cell text-start">{{ date_custom }}</div>
</div>
</section>
</template>

View File

@ -46,7 +46,7 @@
IOR/s
</td>
<td scope="row"
v-show="ioReadWritePresent" class="text-left hidden-xs hidden-sm"
v-show="ioReadWritePresent" class="text-start hidden-xs hidden-sm"
:class="['sortable', sorter.column === 'io_counters' && 'sort']"
@click="$emit('update:sorter', 'io_counters')">
IOW/s

View File

@ -1,10 +1,10 @@
<template>
<section id="quicklook" class="plugin">
<div>
<span>
<div class="d-flex justify-content-between">
<span class="text-start">
{{ cpu_name }}
</span>
<span class="text-right" v-if="cpu_hz_current">
<span class="text-end" v-if="cpu_hz_current">
{{ cpu_hz_current }}/{{ cpu_hz }}Ghz
</span>
</div>

View File

@ -10,7 +10,6 @@
"folders",
"raid",
"smart",
"sensors",
"now"
"sensors"
]
}

File diff suppressed because one or more lines are too long