2 files changed, 17 insertions, 9 deletions

diff --git a/lib/FPanel/Interface.pm b/lib/FPanel/Interface.pm
index adac0f0..0d2cd0e 100644
--- a/lib/FPanel/Interface.pm
+++ b/lib/FPanel/Interface.pm
@@ -18,7 +18,9 @@ sub cgiapp_init {
 
 sub index : Runmode {
   my $self = shift;
-  my $template = $self->load_tmpl("index.html");
+  my $template = $self->load_tmpl('index.html'
+                                 , cache => 1
+                                 , utf8 => 1 );
   my $domain = (split /\//, $ENV{PATH_INFO},3)[1];
   $template->param({
       NAME  => 'INDEX',
@@ -55,19 +57,19 @@ sub DomainList : StartRunmode {
   die $domains->error if $domains->code;
 
 
-  my $template = $self->load_tmpl("domain-list.html");
+  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 );
   $template->param( USER_LOCALPART => $u, USER_DOMAINPART => $d);
-  my $i = 1;
   $template->param( DOMAIN => [
-          map { $i = 1-$i;
-                { DOMAIN => $_->get_value('fvd')
+          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
-                , ODD => $i
                 };
               }
               $domains->sorted('fvd') 
diff --git a/lib/FPanel/Login.pm b/lib/FPanel/Login.pm
index 332a380..dc5ae3a 100644
--- a/lib/FPanel/Login.pm
+++ b/lib/FPanel/Login.pm
@@ -67,7 +67,7 @@ sub setup {
 }
 
 
-# This method choses the Run Mode depending on the URL and query string.
+# This method chooses the Run Mode depending on the URL and query string.
 sub mymode_param {
     my $self = shift;
     my $q = $self->query;
@@ -135,7 +135,9 @@ sub login : Runmode {
 sub login_box {
   my $self = shift;
 
-  my $template = $self->load_tmpl('login.html');
+  my $template = $self->load_tmpl('login.html'
+                                 , cache => 1
+                                 , utf8 => 1 );
 
   my $destination = $self->query->param('destination') //
                     $self->mymode_param();
@@ -159,10 +161,14 @@ sub logout : Runmode {
 sub error_rm : ErrorRunmode {
   my $self = shift;
   my $error = shift;
-  my $template = $self->load_tmpl("template/error.html");
+
+  my $template = $self->load_tmpl('error.html'
+                                 , cache => 1
+                                 , utf8 => 1 );
   $template->param(NAME => 'ERROR');
   $template->param(MESSAGE => $error);
   $template->param(URL => $self->query->url);
+
   return $template->output;
 }