From 79344b1efee7e914b8d23bd0dfd92664cf698c11 Mon Sep 17 00:00:00 2001 From: Guilhem Moulin Date: Sat, 1 Sep 2012 03:43:48 +0200 Subject: W3C Validator (HTML 5 + XHTML 1.1 + CSS level 3) --- css/style.css | 88 ++++++++++++++++++++++++----------------------- lib/FPanel/Interface.pm | 9 +++-- template/domain-list.html | 22 +++++++----- template/error.html | 7 ++-- template/login.html | 62 +++++++++++++++++---------------- 5 files changed, 98 insertions(+), 90 deletions(-) diff --git a/css/style.css b/css/style.css index fe42282..87b0275 100644 --- a/css/style.css +++ b/css/style.css @@ -1,12 +1,12 @@ /* Global */ body { - font-family: "DejaVu Sans", Helvetica, Arial, sans-serif; - font-size: 11pt; - line-height: 140%; - color: #1a1a1a; + font-family: "DejaVu Sans", Helvetica, Arial, sans-serif; + font-size: 11pt; + line-height: 140%; + color: #1a1a1a; } .error { - color: #FF0040; + color: #FF0040; } @@ -15,83 +15,85 @@ form.loginform { margin: 0px auto; border: 1px solid #cccccc; padding: 10pt; - float: center; position: relative; width: 300px; background: #F5F5F5; } table.loginform { - margin:0 auto 5pt auto; - border-collapse:collapse; + margin:0 auto 5pt auto; + border-collapse:collapse; } table.loginform td { - padding:0 5pt 0 0; + padding:0 5pt 0 0; } .loginform { text-align: center; font-size: 12pt; } +.label { + text-align: right; +} /* Header */ #header { - width: 100%; + width: 100%; } #header .column { - position: relative; - padding: 0pt; - border: 0pt; - font-size: 9pt; + position: relative; + padding: 0pt; + border: 0pt; + font-size: 9pt; } #header .left { - width: 50%; - float: left; - text-align: left; + width: 50%; + float: left; + text-align: left; } #header .right { - width: 45%; - float: right; - text-align: right; + width: 45%; + float: right; + text-align: right; } /* Listing table */ table.list { - width:90%; - border-top:1px solid #e5eff8; - border-right:1px solid #e5eff8; - margin:1em auto; - border-collapse:collapse; + width:90%; + border-top:1px solid #e5eff8; + border-right:1px solid #e5eff8; + margin:1em auto; + border-collapse:collapse; } table.list td { - color:#678197; - border-bottom:1px solid #e5eff8; - border-left:1px solid #e5eff8; - padding:.3em 1em; - text-align:center; + color:#678197; + border-bottom:1px solid #e5eff8; + border-left:1px solid #e5eff8; + padding:.3em 1em; + text-align:center; } table.list tr.odd td { - background:#f7fbff + background:#f7fbff } table.list th { - font-weight:normal; - color: #678197; - text-align:left; - border-bottom: 1px solid #e5eff8; - border-left:1px solid #e5eff8; - padding:.3em 1em; + font-weight:normal; + color: #678197; + text-align:left; + border-bottom: 1px solid #e5eff8; + border-left:1px solid #e5eff8; + padding:.3em 1em; } table.list thead th { - background:#f4f9fe; - text-align:center; - font-weight:bold; - color:#66a3d3 + background:#f4f9fe; + text-align:center; + font-weight:bold; + color:#66a3d3 } .nonactive { - color: #FF0040; + color: #FF0040; } .active { - color: #32CD32; + color: #32CD32; } .none { font-size: 6pt; diff --git a/lib/FPanel/Interface.pm b/lib/FPanel/Interface.pm index 0d2cd0e..72fa29f 100644 --- a/lib/FPanel/Interface.pm +++ b/lib/FPanel/Interface.pm @@ -60,16 +60,15 @@ sub DomainList : StartRunmode { my $template = $self->load_tmpl('domain-list.html' , cache => 1 , utf8 => 1 - , loop_context_vars => 1 ); - my $url = $self->query->url(); - $template->param( URL => $url ); + , loop_context_vars => 1 + , global_vars => 1 ); + $template->param( URL => $self->query->url ); $template->param( USER_LOCALPART => $u, USER_DOMAINPART => $d); - $template->param( DOMAIN => [ + $template->param( DOMAINS => [ map { { DOMAIN => $_->get_value('fvd') , PERMS => &list_perms($_, $dn) , DESCRIPTION => join ("\n", $_->get_value('description')) , ISACTIVE => $_->get_value('fripostIsStatusActive') eq 'TRUE' ? 1 : 0 - , URL => $url }; } $domains->sorted('fvd') diff --git a/template/domain-list.html b/template/domain-list.html index 3dae0bb..52d819e 100644 --- a/template/domain-list.html +++ b/template/domain-list.html @@ -1,11 +1,12 @@ - + + Domain names for <TMPL_VAR NAME=USER> -

Manage domains

- +
- + - + + - - - + + + +
Domain (/?a=AddDomain>add)Domain (add) Permissions Description Active?
(none)(none)✔✘(none)(none)✔✘
diff --git a/template/error.html b/template/error.html index 34a4762..d9d4eb1 100644 --- a/template/error.html +++ b/template/error.html @@ -1,4 +1,5 @@ - + + <TMPL_IF NAME=NAME> <TMPL_VAR NAME=NAME> </TMPL_IF> @@ -6,13 +7,13 @@ -

This is the page. +

This is the page. You are not suppose to see this. If you think it is a bug, please report it to admin@fripost.org.

-

+

Back

 diff --git a/template/login.html b/template/login.html index 676cc09..e0f648b 100644 --- a/template/login.html +++ b/template/login.html @@ -1,38 +1,40 @@ - + + Log In | Fripost's Administrator panel - -
- Fripost -

Administrator Panel

-
-
-
- - - - - - - - - - -
Username
Password
-
- - -
-
-

Invalid username or password.

 + +
+
+ Fripost +

Administrator Panel

+
+
+
+ + + + + + + + + +
Username
Password
+
+ + +
+
+

Invalid username or password.

 +
-- cgit v1.2.3