Une MAJ de sécurité est nécessaire sur notre version actuelle. Elle sera effectuée lundi 02/08 entre 12h30 et 13h. L'interruption de service devrait durer quelques minutes (probablement moins de 5 minutes).

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

Add style to Web_templates pages

parent 956c1411
@import url('style.css');
@import url('superfish.css');
#page-title-home {
height:223px;
}
ol {
list-style: decimal;
}
ul {
list-style: disc;
}
#wrapper {
min-height: 0px;
}
#header {
color: #ffffff;
height: 80px;
}
#main {
border-radius: 0px 0px 0px 0px;
padding: 10px;
}
#footer #bottom {
line-height: 3em;
}
#header a {
color: #ffffff;
}
...@@ -10,3 +10,4 @@ style.css ...@@ -10,3 +10,4 @@ style.css
superfish.css superfish.css
booth.css booth.css
vote.html vote.html
site.css
...@@ -88,8 +88,10 @@ let make_login_box style auth links = ...@@ -88,8 +88,10 @@ let make_login_box style auth links =
Lwt.return (html ~a:[a_dir `Ltr; a_xml_lang "en"] Lwt.return (html ~a:[a_dir `Ltr; a_xml_lang "en"]
(head (Eliom_content.Html5.F.title (pcdata title)) [ (head (Eliom_content.Html5.F.title (pcdata title)) [
script (pcdata "window.onbeforeunload = function () {};"); script (pcdata "window.onbeforeunload = function () {};");
link ~rel:[`Stylesheet] ~href:(uri_of_string (fun () -> "/static/site.css")) ();
]) ])
(body [ (body [
div ~a:[a_id "wrapper"] [
div ~a:[a_id "header"] [ div ~a:[a_id "header"] [
div [ div [
div ~a:[a_style "float: left;"] [ div ~a:[a_style "float: left;"] [
...@@ -98,16 +100,18 @@ let make_login_box style auth links = ...@@ -98,16 +100,18 @@ let make_login_box style auth links =
login_box; login_box;
div ~a:[a_style "clear: both;"] []; div ~a:[a_style "clear: both;"] [];
]; ];
h1 ~a:[a_style "text-align: center;"] [pcdata title];
]; ];
div ~a:[a_id "content"] content; div ~a:[a_id "main"] content;
hr ();
div ~a:[a_id "footer"; a_style "text-align: center;" ] [ div ~a:[a_id "footer"; a_style "text-align: center;" ] [
pcdata "Powered by "; div ~a:[a_id "bottom"] [
a ~service:source_code [pcdata "Belenios"] (); pcdata "Powered by ";
pcdata ". "; a ~service:source_code [pcdata "Belenios"] ();
a ~service:admin [pcdata "Administer elections"] (); pcdata ". ";
pcdata "."; a ~service:admin [pcdata "Administer elections"] ();
] pcdata ".";
]
]]
])) ]))
let format_election kind election = let format_election kind election =
...@@ -138,7 +142,6 @@ let make_login_box style auth links = ...@@ -138,7 +142,6 @@ let make_login_box style auth links =
] ]
in in
let content = [ let content = [
h1 [pcdata site_title];
div [ div [
pcdata welcome_message; pcdata welcome_message;
featured_box; featured_box;
...@@ -155,7 +158,6 @@ let make_login_box style auth links = ...@@ -155,7 +158,6 @@ let make_login_box style auth links =
| _ -> ul @@ List.map (format_election `Admin) elections | _ -> ul @@ List.map (format_election `Admin) elections
in in
let content = [ let content = [
h1 [pcdata title];
div [ div [
div [a ~service:new_election [pcdata "Create a new election"] ()]; div [a ~service:new_election [pcdata "Create a new election"] ()];
div [a ~service:election_setup_index [pcdata "Elections being prepared"] ()]; div [a ~service:election_setup_index [pcdata "Elections being prepared"] ()];
...@@ -195,7 +197,6 @@ let make_login_box style auth links = ...@@ -195,7 +197,6 @@ let make_login_box style auth links =
]) () ]) ()
in in
let content = [ let content = [
h1 [pcdata title];
form; form;
] in ] in
lwt login_box = login_box () in lwt login_box = login_box () in
...@@ -221,7 +222,6 @@ let make_login_box style auth links = ...@@ -221,7 +222,6 @@ let make_login_box style auth links =
]) () ]) ()
in in
let content = [ let content = [
h1 [pcdata "Password login"];
form; form;
] in ] in
lwt login_box = login_box () in lwt login_box = login_box () in
...@@ -241,7 +241,6 @@ let make_login_box style auth links = ...@@ -241,7 +241,6 @@ let make_login_box style auth links =
) () ) ()
in in
let content = [ let content = [
h1 [pcdata title];
div [form]; div [form];
] in ] in
lwt login_box = site_login_box () in lwt login_box = site_login_box () in
...@@ -255,7 +254,6 @@ let make_login_box style auth links = ...@@ -255,7 +254,6 @@ let make_login_box style auth links =
) |> list_join (pcdata ", ") ) |> list_join (pcdata ", ")
in in
let content = [ let content = [
h1 [pcdata "Log in"];
div [p ( div [p (
[pcdata "Please log in: ["] @ auth_systems @ [pcdata "]"] [pcdata "Please log in: ["] @ auth_systems @ [pcdata "]"]
)] )]
...@@ -317,7 +315,6 @@ let make_login_box style auth links = ...@@ -317,7 +315,6 @@ let make_login_box style auth links =
return [form; setup_form] return [form; setup_form]
in in
let content = [ let content = [
h1 [pcdata title];
div body; div body;
] in ] in
lwt login_box = site_login_box () in lwt login_box = site_login_box () in
...@@ -331,7 +328,6 @@ let make_login_box style auth links = ...@@ -331,7 +328,6 @@ let make_login_box style auth links =
| `Exception e -> pcdata @@ Printexc.to_string e | `Exception e -> pcdata @@ Printexc.to_string e
in in
let content = [ let content = [
h1 [pcdata title];
div [ div [
p [pcdata "The creation failed."]; p [pcdata "The creation failed."];
p [reason]; p [reason];
...@@ -354,7 +350,6 @@ let make_login_box style auth links = ...@@ -354,7 +350,6 @@ let make_login_box style auth links =
| us -> ul us | us -> ul us
in in
let content = [ let content = [
h1 [pcdata title];
div [list]; div [list];
] in ] in
lwt login_box = site_login_box () in lwt login_box = site_login_box () in
...@@ -363,7 +358,6 @@ let make_login_box style auth links = ...@@ -363,7 +358,6 @@ let make_login_box style auth links =
let generic_error_page message () = let generic_error_page message () =
let title = "Error" in let title = "Error" in
let content = [ let content = [
h1 [pcdata title];
p [pcdata message]; p [pcdata message];
] in ] in
let login_box = pcdata "" in let login_box = pcdata "" in
...@@ -435,7 +429,6 @@ let make_login_box style auth links = ...@@ -435,7 +429,6 @@ let make_login_box style auth links =
) uuid ) uuid
in in
let content = [ let content = [
h1 [pcdata title];
form_trustees; form_trustees;
div_credentials; div_credentials;
form_group; form_group;
...@@ -460,7 +453,6 @@ let make_login_box style auth links = ...@@ -460,7 +453,6 @@ let make_login_box style auth links =
uuid uuid
in in
let content = [ let content = [
h1 [pcdata title];
form; form;
] in ] in
lwt login_box = site_login_box () in lwt login_box = site_login_box () in
...@@ -526,7 +518,6 @@ let make_login_box style auth links = ...@@ -526,7 +518,6 @@ let make_login_box style auth links =
in in
let div_textarea = div [group; interactivity; form_textarea; disclaimer] in let div_textarea = div [group; interactivity; form_textarea; disclaimer] in
let content = [ let content = [
h1 [pcdata title];
div_download; div_download;
div_textarea; div_textarea;
form_file; form_file;
...@@ -573,7 +564,6 @@ let make_login_box style auth links = ...@@ -573,7 +564,6 @@ let make_login_box style auth links =
] ]
in in
let content = [ let content = [
h1 [pcdata title];
group; group;
interactivity; interactivity;
form; form;
...@@ -706,7 +696,6 @@ let make_login_box style auth links = ...@@ -706,7 +696,6 @@ let make_login_box style auth links =
] ]
] in ] in
let content = [ let content = [
h1 [ pcdata params.e_name ];
p ~a:[a_style "margin: 1em; padding: 2pt; font-style: italic; border: 1pt solid;"] [ p ~a:[a_style "margin: 1em; padding: 2pt; font-style: italic; border: 1pt solid;"] [
pcdata params.e_description pcdata params.e_description
]; ];
...@@ -753,7 +742,6 @@ let make_login_box style auth links = ...@@ -753,7 +742,6 @@ let make_login_box style auth links =
in in
let uuid = W.election.e_params.e_uuid in let uuid = W.election.e_params.e_uuid in
let content = [ let content = [
h1 [pcdata title];
div [ div [
a ~service:Web_services.election_home [pcdata "Election home"] (uuid, ()); a ~service:Web_services.election_home [pcdata "Election home"] (uuid, ());
]; ];
...@@ -944,7 +932,6 @@ let pretty_ballots w hashes () = ...@@ -944,7 +932,6 @@ let pretty_ballots w hashes () =
(params.e_uuid, ())] (params.e_uuid, ())]
in in
let content = [ let content = [
h1 [pcdata title];
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