Skip to content

Commit 10c98f6

Browse files
committed
Merge branch 'issue2939' into develop
2 parents a1cb363 + 7d3904e commit 10c98f6

File tree

4 files changed

+457
-407
lines changed

4 files changed

+457
-407
lines changed

conf/glances.conf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ check_update=true
1313
# Default is 1200 values (~1h with the default refresh rate)
1414
history_size=1200
1515
# Set the way Glances should display the date (default is %Y-%m-%d %H:%M:%S %Z)
16-
#strftime_format="%Y-%m-%d %H:%M:%S %Z"
16+
# strftime_format=%Y-%m-%d %H:%M:%S %Z
17+
strftime_format=%Y-%m-%d
1718
# Define external directory for loading additional plugins
1819
# The layout follows the glances standard for plugin definitions
1920
#plugin_dir=/home/user/dev/plugins

glances/outputs/static/js/components/plugin-now.vue

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<section id="now" class="plugin">
33
<div class="table-row">
4-
<div class="table-cell text-left">{{ localDate(date_iso) }}</div>
4+
<div class="table-cell text-left">{{ date_custom }}</div>
55
</div>
66
</section>
77
</template>
@@ -14,13 +14,8 @@ export default {
1414
}
1515
},
1616
computed: {
17-
date_iso() {
18-
return this.data.stats['now']['iso'];
19-
}
20-
},
21-
methods: {
22-
localDate(date) {
23-
return new Date(date).toLocaleString();
17+
date_custom() {
18+
return this.data.stats['now']['custom'];
2419
}
2520
}
2621
};

0 commit comments

Comments
 (0)