Une nouvelle version du portail de gestion des comptes externes sera mise en production lundi 09 août. Elle permettra d'allonger la validité d'un compte externe jusqu'à 3 ans. Pour plus de détails sur cette version consulter : https://doc-si.inria.fr/x/FCeS

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

Cosmetic changes

parent b39ba4b3
...@@ -54,9 +54,9 @@ ...@@ -54,9 +54,9 @@
<textarea id="ballot" rows="1" cols="80" name="encrypted_vote" readonly="readonly"></textarea> <textarea id="ballot" rows="1" cols="80" name="encrypted_vote" readonly="readonly"></textarea>
</div> </div>
</div> </div>
<p>Your ballot has been successfully encrypted!</p> <p>Your ballot has been successfully encrypted, <b>but has not been cast yet</b>!</p>
<p>Your smart ballot tracker is <span id="ballot_tracker"></span>.</p> <p>Your smart ballot tracker is <span id="ballot_tracker"></span></p>
<input type="submit" value="Confirm and submit"/> <input type="submit" value="Continue"/>
</form> </form>
</div> </div>
<button onclick="location.reload();">Restart</button> <button onclick="location.reload();">Restart</button>
......
...@@ -5,3 +5,7 @@ ...@@ -5,3 +5,7 @@
#footer #bottom { #footer #bottom {
line-height: 1.5em; line-height: 1.5em;
} }
#ballot_tracker {
font-weight: bold;
}
...@@ -269,7 +269,7 @@ let make_login_box style auth links = ...@@ -269,7 +269,7 @@ let make_login_box style auth links =
let make_button ~service contents = let make_button ~service contents =
let uri = Eliom_uri.make_string_uri ~service () in let uri = Eliom_uri.make_string_uri ~service () in
Printf.ksprintf Unsafe.data (* FIXME: unsafe *) Printf.ksprintf Unsafe.data (* FIXME: unsafe *)
"<button onclick=\"location.href='%s';\">%s</button>" "<button onclick=\"location.href='%s';\" style=\"font-size:30px;\">%s</button>"
uri uri
contents contents
...@@ -662,21 +662,22 @@ let make_login_box style auth links = ...@@ -662,21 +662,22 @@ let make_login_box style auth links =
else [] else []
in in
let ballots_link = let ballots_link =
p [ p ~a:[a_style "text-align:center;"] [
a ~service:election_pretty_ballots [ a
pcdata "List of accepted ballots" ~a:[a_style "font-size:25px;"]
~service:election_pretty_ballots [
pcdata "See accepted ballots"
] ((params.e_uuid, ()), 1) ] ((params.e_uuid, ()), 1)
] ]
in in
let audit_info = div [ let footer = div ~a:[a_style "line-height:1.5em;"] [
h3 [pcdata "Audit Info"];
div [ div [
div [ div [
pcdata "Election fingerprint: "; pcdata "Election fingerprint: ";
code [ pcdata W.election.e_fingerprint ]; code [ pcdata W.election.e_fingerprint ];
]; ];
div [ div [
pcdata "Election data: "; pcdata "Audit data: ";
a ~service:(file w ESRaw) [ a ~service:(file w ESRaw) [
pcdata "parameters" pcdata "parameters"
] (); ] ();
...@@ -697,28 +698,27 @@ let make_login_box style auth links = ...@@ -697,28 +698,27 @@ let make_login_box style auth links =
] ]
] in ] in
let content = [ let content = [
p ~a:[a_style "margin: 1em; padding: 2pt; font-style: italic; border: 1pt solid;"] [
pcdata params.e_description
];
p (voting_period @ state); p (voting_period @ state);
p permissions; p permissions;
div [ br ();
div ~a:[a_style "text-align:center;"] [
div [ div [
make_button make_button
~service:(Eliom_service.preapply election_vote (params.e_uuid, ())) ~service:(Eliom_service.preapply election_vote (params.e_uuid, ()))
"Go to the booth"; "Go to the booth";
pcdata " or "; ];
make_button div [
pcdata "or ";
a
~service:(Eliom_service.preapply election_cast (params.e_uuid, ())) ~service:(Eliom_service.preapply election_cast (params.e_uuid, ()))
"Submit a raw ballot"; [pcdata "submit a raw ballot"] ();
]; ];
]; ];
ballots_link;
br (); br ();
audit_info; ballots_link;
] in ] in
lwt login_box = election_login_box w () in lwt login_box = election_login_box w () in
base ~title:params.e_name ~login_box ~content () base ~title:params.e_name ~login_box ~content ~footer ()
let election_admin w ~is_featured () = let election_admin w ~is_featured () =
let module W = (val w : WEB_ELECTION_) in let module W = (val w : WEB_ELECTION_) in
...@@ -858,7 +858,7 @@ let make_login_box style auth links = ...@@ -858,7 +858,7 @@ let make_login_box style auth links =
] ]
in in
let progress = div ~a:[a_style "text-align:center;margin-bottom:20px;"] [ let progress = div ~a:[a_style "text-align:center;margin-bottom:20px;"] [
pcdata "Introduction — Answer to questions — Review and encrypt"; pcdata "Input credential — Answer to questions — Review and encrypt";
pcdata " — Authenticate — "; pcdata " — Authenticate — ";
b [pcdata "Confirm"]; b [pcdata "Confirm"];
pcdata " — Done"; pcdata " — Done";
...@@ -894,7 +894,7 @@ let make_login_box style auth links = ...@@ -894,7 +894,7 @@ let make_login_box style auth links =
let params = W.election.e_params in let params = W.election.e_params in
let name = params.e_name in let name = params.e_name in
let progress = div ~a:[a_style "text-align:center;margin-bottom:20px;"] [ let progress = div ~a:[a_style "text-align:center;margin-bottom:20px;"] [
pcdata "Introduction — Answer to questions — Review and encrypt"; pcdata "Input credential — Answer to questions — Review and encrypt";
pcdata " — Authenticate — Confirm — "; pcdata " — Authenticate — Confirm — ";
b [pcdata "Done"]; b [pcdata "Done"];
hr (); hr ();
...@@ -905,7 +905,7 @@ let make_login_box style auth links = ...@@ -905,7 +905,7 @@ let make_login_box style auth links =
pcdata "Your ballot for "; pcdata "Your ballot for ";
em [pcdata name]; em [pcdata name];
(match result with (match result with
| `Valid hash -> pcdata (" has been accepted, its hash is " ^ hash ^ ".") | `Valid hash -> pcdata (" has been accepted, your smart ballot tracker is " ^ hash ^ ".")
| `Error e -> pcdata (" is rejected, because " ^ Web_common.explain_error e ^ ".") | `Error e -> pcdata (" is rejected, because " ^ Web_common.explain_error e ^ ".")
); );
]; ];
...@@ -947,6 +947,7 @@ let pretty_ballots w hashes () = ...@@ -947,6 +947,7 @@ let pretty_ballots w hashes () =
(params.e_uuid, ())] (params.e_uuid, ())]
in in
let content = [ let content = [
p [pcdata "This is the list of ballots accepted so far."];
ul ballots; ul ballots;
links; links;
] in ] in
......
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