Maj terminée. Pour consulter la release notes associée voici le lien :
https://about.gitlab.com/releases/2021/07/07/critical-security-release-gitlab-14-0-4-released/

Commit a1d1f141 authored by Stephane Glondu's avatar Stephane Glondu
Browse files

Cosmetic changes in election_admin page

parent fcbb18e5
Pipeline #55513 passed with stages
in 15 minutes and 2 seconds
......@@ -1767,17 +1767,28 @@ let election_admin election metadata state get_tokens_decrypt () =
return @@ post_form ~service:election_auto_post
(fun (lopen, lclose) ->
[
div [pcdata "Alternatively, you may setup automatic dates."];
div [
pcdata "Automatically open the election at: ";
input ~name:lopen ~input_type:`Text ~value:(format auto_dates.auto_open) string;
b [pcdata "Note:"];
pcdata " times are in UTC. Now is ";
pcdata (format (Some (now ())));
pcdata ".";
];
div [
pcdata "Automatically close the election at: ";
input ~name:lclose ~input_type:`Text ~value:(format auto_dates.auto_close) string;
div ~a:[a_style "margin-left: 3em;"] [
div [
pcdata "Automatically open the election at: ";
input ~name:lopen ~input_type:`Text ~value:(format auto_dates.auto_open) string;
];
div [
pcdata "Automatically close the election at: ";
input ~name:lclose ~input_type:`Text ~value:(format auto_dates.auto_close) string;
];
div [
pcdata "Enter dates in UTC, in format YYYY-MM-DD HH:MM:SS, leave empty for no date.";
];
];
div [
input ~input_type:`Submit ~value:"Change automatic dates" string;
pcdata " (Enter dates in UTC, in format YYYY-MM-DD HH:MM:SS, leave empty for no date.)";
];
]
) uuid
......@@ -1797,7 +1808,10 @@ let election_admin election metadata state get_tokens_decrypt () =
~service
(fun () ->
[
pcdata msg;
div ~a:[a_style "text-align: center;"] [
pcdata msg;
];
br ();
input ~input_type:`Submit ~value string;
pcdata msg2;
]) uuid
......@@ -1808,14 +1822,14 @@ let election_admin election metadata state get_tokens_decrypt () =
let%lwt auto_form = auto_form () in
return @@ div [
state_form true;
hr ();
br ();
auto_form;
]
| `Closed ->
let%lwt auto_form = auto_form () in
return @@ div [
state_form false;
hr ();
br ();
auto_form;
br ();
hr ();
......@@ -2032,6 +2046,7 @@ let election_admin election metadata state get_tokens_decrypt () =
a ~service:election_missing_voters [pcdata "Missing voters"] (uuid, ());
];
div_regenpwd;
hr ();
div [state_div];
div_archive;
div_delete;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment