From ec23a5cb32f85d77045d45950a92f19b87b1a581 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Tue, 7 Dec 2021 18:47:44 +0100 Subject: [PATCH] ui: calendar event: add once daily example and clarify workday one Using 00:00 with relying on the implied default is sub optimal as its a bit of a magic example that new users may not understand as easily. So spell it out explicitly, even if there'd be a shorter version possible. We also had some request for the once-daily every day, and its a sensible example to have in general, could help getting the difference between an hour list and a single one. Signed-off-by: Thomas Lamprecht --- aplinfo/aplinfo.dat | 27 +++++++++++++++++++++++++++ www/manager6/form/CalendarEvent.js | 3 ++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/aplinfo/aplinfo.dat b/aplinfo/aplinfo.dat index 31837e00..5f812378 100644 --- a/aplinfo/aplinfo.dat +++ b/aplinfo/aplinfo.dat @@ -56,6 +56,19 @@ sha512sum: 87709566840d4ef5fe7bba63afce183f12c27e7499315d1729886ab0ca0c14599093b Infopage: https://linuxcontainers.org Description: LXC default image for alpine 3.14 (20210623) +Package: alpine-3.15-default +Version: 20211202 +Type: lxc +OS: alpine +Section: system +Maintainer: Proxmox Support Team +Architecture: amd64 +Location: system/alpine-3.15-default_20211202_amd64.tar.xz +md5sum: 31fac55c59c899e71500e39ea4d868be +sha512sum: 6fa966787de6f18fc502016cd3516bcac0a5de0dfa5e906aa08a1c0cc51b51b0df08d9efbe221e0914dbece295d1b32ccae14909a04fbfc263b8e0ecd4831491 +Infopage: https://linuxcontainers.org +Description: LXC default image for alpine 3.15 (20211202) + Package: archlinux-base Version: 20210420-1 Type: lxc @@ -70,6 +83,20 @@ Infopage: https://www.archlinux.org Description: ArchLinux base image. ArchLinux template with the 'base' group and the 'openssh' package installed. +Package: archlinux-base +Version: 20211202-1 +Type: lxc +OS: archlinux +Section: system +Maintainer: Proxmox Support Team +Architecture: amd64 +Location: system/archlinux-base_20211202-1_amd64.tar.zst +md5sum: cf2071dd794f0cbd444c84d22cc70a1a +sha512sum: 586eb8f0751b39e70331afc6632b4488fd0703b4a21f17ab8dc9393e358f90240bf9eda1445854006de7a0ace15f2bca4c11cc8efb2b7e94bf84b49516ea94b6 +Infopage: https://www.archlinux.org +Description: ArchLinux base image. + ArchLinux template with the 'base' group and the 'openssh' package installed. + Package: centos-7-default Version: 20190926 Type: lxc diff --git a/www/manager6/form/CalendarEvent.js b/www/manager6/form/CalendarEvent.js index fc0e07e4..9923dbc9 100644 --- a/www/manager6/form/CalendarEvent.js +++ b/www/manager6/form/CalendarEvent.js @@ -18,8 +18,9 @@ Ext.define('PVE.form.CalendarEvent', { data: [ { value: '*/30', text: Ext.String.format(gettext("Every {0} minutes"), 30) }, { value: '*/2:00', text: gettext("Every two hours") }, + { value: '21:00', text: gettext("Every day") + " 21:00" }, { value: '2,22:30', text: gettext("Every day") + " 02:30, 22:30" }, - { value: 'mon..fri', text: gettext("Monday to Friday") + " 00:00" }, + { value: 'mon..fri 00:00', text: gettext("Monday to Friday") + " 00:00" }, { value: 'mon..fri */1:00', text: gettext("Monday to Friday") + ': ' + gettext("hourly") }, { value: 'mon..fri 7..18:00/15',