Add info.serverTimezoneOffset and improve some styles
This commit is contained in:
parent
f6bbd1ca67
commit
2271ac4a5a
|
@ -1,12 +1,12 @@
|
|||
{
|
||||
"name": "uptime-kuma",
|
||||
"version": "1.18.4",
|
||||
"version": "1.18.5",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "uptime-kuma",
|
||||
"version": "1.18.4",
|
||||
"version": "1.18.5",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@louislam/sqlite3": "~15.0.6",
|
||||
|
|
|
@ -8,6 +8,7 @@ const server = UptimeKumaServer.getInstance();
|
|||
const io = server.io;
|
||||
const { setting } = require("./util-server");
|
||||
const checkVersion = require("./check-version");
|
||||
const dayjs = require("dayjs");
|
||||
|
||||
/**
|
||||
* Send list of notification providers to client
|
||||
|
@ -124,6 +125,7 @@ async function sendInfo(socket) {
|
|||
latestVersion: checkVersion.latestVersion,
|
||||
primaryBaseURL: await setting("primaryBaseURL"),
|
||||
serverTimezone: await server.getTimezone(),
|
||||
serverTimezoneOffset: dayjs().format("Z"),
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
@ -101,6 +101,11 @@ optgroup {
|
|||
}
|
||||
}
|
||||
|
||||
// Override Bootstrap
|
||||
.btn-group > .btn:hover {
|
||||
z-index: initial;
|
||||
}
|
||||
|
||||
.btn {
|
||||
padding-left: 20px;
|
||||
padding-right: 20px;
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<form @submit.prevent="submit">
|
||||
<div class="shadow-box">
|
||||
<div class="row">
|
||||
<div class="col-xl-7">
|
||||
<div class="col-xl-10">
|
||||
<!-- Title -->
|
||||
<div class="mb-3">
|
||||
<label for="name" class="form-label">{{ $t("Title") }}</label>
|
||||
|
@ -82,7 +82,7 @@
|
|||
|
||||
<h2 class="mt-5">{{ $t("Date and Time") }}</h2>
|
||||
|
||||
<div>⚠️ {{ $t("warningTimezone") }}: {{ $root.info.serverTimezone }}</div>
|
||||
<div>⚠️ {{ $t("warningTimezone") }}: <mark>{{ $root.info.serverTimezone }} ({{ $root.info.serverTimezoneOffset }})</mark></div>
|
||||
|
||||
<!-- Strategy -->
|
||||
<div class="my-3">
|
||||
|
|
|
@ -35,6 +35,7 @@
|
|||
<div class="buttons">
|
||||
<router-link v-if="false" :to="maintenanceURL(item.id)" class="btn btn-light">{{ $t("Details") }}</router-link>
|
||||
|
||||
<div class="btn-group" role="group">
|
||||
<button v-if="item.active" class="btn btn-normal" @click="pauseDialog">
|
||||
<font-awesome-icon icon="pause" /> {{ $t("Pause") }}
|
||||
</button>
|
||||
|
@ -53,6 +54,7 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="text-center mt-3" style="font-size: 13px;">
|
||||
<a href="https://github.com/louislam/uptime-kuma/wiki/Maintenance" target="_blank">Learn More</a>
|
||||
|
|
|
@ -363,7 +363,6 @@ function utcToISODateTime(input) {
|
|||
return dayjs.utc(input).toISOString();
|
||||
}
|
||||
exports.utcToISODateTime = utcToISODateTime;
|
||||
/**
|
||||
/**
|
||||
* For SQL_DATETIME_FORMAT
|
||||
*/
|
||||
|
|
|
@ -409,7 +409,6 @@ export function utcToISODateTime(input : string) {
|
|||
return dayjs.utc(input).toISOString();
|
||||
}
|
||||
|
||||
/**
|
||||
/**
|
||||
* For SQL_DATETIME_FORMAT
|
||||
*/
|
||||
|
|
Loading…
Reference in New Issue