From 58825808fb1fd2d9950e8f7a81ad62db18be4aa7 Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem.moulin@fripost.org>
Date: Sat, 29 Sep 2012 20:07:51 +0200
Subject: Fixed CSS and logout redirection.

---
 css/style.css              | 8 ++++----
 lib/Fripost/Panel/Login.pm | 2 +-
 misc/w3c-validator.pl      | 3 ++-
 template/add-alias.html    | 2 +-
 template/add-list.html     | 2 +-
 template/add-mailbox.html  | 2 +-
 template/edit-alias.html   | 2 +-
 template/edit-domain.html  | 2 +-
 template/edit-list.html    | 2 +-
 template/edit-mailbox.html | 2 +-
 template/list-locals.html  | 2 +-
 11 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/css/style.css b/css/style.css
index 79fd1b6..cee3337 100644
--- a/css/style.css
+++ b/css/style.css
@@ -4,6 +4,8 @@ body {
   font-size: 11pt;
   line-height: 140%;
   color: #1a1a1a;
+  width: 600pt;
+  margin: 5pt auto;
 }
 .error {
   color: #FF0040;
@@ -19,7 +21,6 @@ body {
 }
 h1, h2, h3 {
   margin: 15pt auto 10pt auto;
-  width: 600pt;
 }
 span.domain, span.email, span.alias, span.mailbox, span.list {
   font-family: Inconsolata, "Lucida Console", "Droid Sans Mono", Cousine, monospace;
@@ -84,13 +85,12 @@ td.label {
 /* Listing modes */
 #domainstatus {
   margin: 10pt auto;
-  width: 600pt;
 }
 .description {
   text-align: justify;
   font-style: italic;
   margin: auto;
-  width: 450pt;
+  width: 80%;
 }
 table.list {
   border-top:1px solid #e5eff8;
@@ -98,7 +98,7 @@ table.list {
   margin:1em auto;
   border-collapse:collapse;
   margin: 0 auto;
-  width: 500pt;
+  width: 90%;
 }
 table.list td {
   color:#678197;
diff --git a/lib/Fripost/Panel/Login.pm b/lib/Fripost/Panel/Login.pm
index 810f9e1..ccb4ca7 100644
--- a/lib/Fripost/Panel/Login.pm
+++ b/lib/Fripost/Panel/Login.pm
@@ -188,7 +188,7 @@ sub logout : Runmode {
     $self->query->delete('a') if (defined $self->query->param('a')) and
                               $self->query->param('a') eq 'logout';
 
-    return $self->redirect($self->query->self_url);
+    return $self->redirect( ($ENV{SCRIPT_NAME} // $self->query->url).'/' );
 }
 
 # This is the error Run Mode.
diff --git a/misc/w3c-validator.pl b/misc/w3c-validator.pl
index 29bfd73..76355ac 100755
--- a/misc/w3c-validator.pl
+++ b/misc/w3c-validator.pl
@@ -27,7 +27,8 @@
 #   ./misc/w3c-validator.pl /tmp/fpanel/*.html
 #
 # /!\ Note: There is a serious privacy concern here. Do *NOT* forget to  /!\
-# /!\ remove the postrun hook once you are done testing the application! /!\
+# /!\ remove the postrun hook, and to restart the FCGI, once you are     /!\
+# /!\ done testing the application!                                      /!\
 
 use 5.010_000;
 use strict;
diff --git a/template/add-alias.html b/template/add-alias.html
index 8ad887f..43ad960 100644
--- a/template/add-alias.html
+++ b/template/add-alias.html
@@ -14,7 +14,7 @@
       <div class="right column">
         Logged as <a href="<TMPL_VAR NAME=userURI>/?a=edit"
                   ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
-        | <a href="./?a=logout">Log out</a>
+        | <a href="../?a=logout">Log out</a>
       </div>
       <br/>
     </div>
diff --git a/template/add-list.html b/template/add-list.html
index e69690b..221d66a 100644
--- a/template/add-list.html
+++ b/template/add-list.html
@@ -14,7 +14,7 @@
       <div class="right column">
         Logged as <a href="<TMPL_VAR NAME=userURI>/?a=edit"
                   ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
-        | <a href="./?a=logout">Log out</a>
+        | <a href="../?a=logout">Log out</a>
       </div>
       <br/>
     </div>
diff --git a/template/add-mailbox.html b/template/add-mailbox.html
index 6bcc748..64d116f 100644
--- a/template/add-mailbox.html
+++ b/template/add-mailbox.html
@@ -14,7 +14,7 @@
       <div class="right column">
         Logged as <a href="<TMPL_VAR NAME=userURI>/?a=edit"
                   ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
-        | <a href="./?a=logout">Log out</a>
+        | <a href="../?a=logout">Log out</a>
       </div>
       <br/>
     </div>
diff --git a/template/edit-alias.html b/template/edit-alias.html
index aa18faf..ec8e10c 100644
--- a/template/edit-alias.html
+++ b/template/edit-alias.html
@@ -15,7 +15,7 @@
       <div class="right column">
         Logged as <a href="<TMPL_VAR NAME=userURI>/?a=edit"
                   ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
-        | <a href="./?a=logout">Log out</a>
+        | <a href="../../?a=logout">Log out</a>
       </div>
       <br/>
     </div>
diff --git a/template/edit-domain.html b/template/edit-domain.html
index a6d6b34..3844775 100644
--- a/template/edit-domain.html
+++ b/template/edit-domain.html
@@ -14,7 +14,7 @@
       <div class="right column">
         Logged as <a href="<TMPL_VAR NAME=userURI>/?a=edit"
                   ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
-        | <a href="./?a=logout">Log out</a>
+        | <a href="../?a=logout">Log out</a>
       </div>
       <br/>
     </div>
diff --git a/template/edit-list.html b/template/edit-list.html
index 1cc8148..357390e 100644
--- a/template/edit-list.html
+++ b/template/edit-list.html
@@ -15,7 +15,7 @@
       <div class="right column">
         Logged as <a href="<TMPL_VAR NAME=userURI>/?a=edit"
                   ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
-        | <a href="./?a=logout">Log out</a>
+        | <a href="../../?a=logout">Log out</a>
       </div>
       <br/>
     </div>
diff --git a/template/edit-mailbox.html b/template/edit-mailbox.html
index 892c643..98bd2ea 100644
--- a/template/edit-mailbox.html
+++ b/template/edit-mailbox.html
@@ -15,7 +15,7 @@
       <div class="right column">
         Logged as <a href="<TMPL_VAR NAME=userURI>/?a=edit"
                   ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
-        | <a href="./?a=logout">Log out</a>
+        | <a href="../../?a=logout">Log out</a>
       </div>
       <br/>
     </div>
diff --git a/template/list-locals.html b/template/list-locals.html
index 47b99cf..d87f4c9 100644
--- a/template/list-locals.html
+++ b/template/list-locals.html
@@ -13,7 +13,7 @@
       <div class="right column">
         Logged as <a href="<TMPL_VAR NAME=userURI>/?a=edit"
                   ><TMPL_VAR NAME=user_localpart>@<TMPL_VAR NAME=user_domainpart></a>
-        | <a href="./?a=logout">Log out</a>
+        | <a href="../?a=logout">Log out</a>
       </div>
       <br/>
     </div>
-- 
cgit v1.2.3