[vhffs-dev] [1857] Removed dead code and refs to Panel::Template

[subversion@xxxxxxxxxxxxx]

Revision: 1857
Author:   beuss
Date:     2011-06-03 00:05:56 +0200 (Fri, 03 Jun 2011)
Log Message:
-----------
Removed dead code and refs to Panel::Template

Modified Paths:
--------------
    trunk/vhffs-panel/repository/prefs.pl
    trunk/vhffs-panel/user/prefs.pl

Removed Paths:
-------------
    trunk/vhffs-api/src/Vhffs/Panel/Template.pm

Deleted: trunk/vhffs-api/src/Vhffs/Panel/Template.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Template.pm	2011-06-02 22:05:48 UTC (rev 1856)
+++ trunk/vhffs-api/src/Vhffs/Panel/Template.pm	2011-06-02 22:05:56 UTC (rev 1857)
@@ -1,86 +0,0 @@
-#!%PERL%
-# Copyright (c) vhffs project and its contributors
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without 
-# modification, are permitted provided that the following conditions 
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright 
-#   notice, this list of conditions and the following disclaimer.
-#2. Redistributions in binary form must reproduce the above copyright
-#   notice, this list of conditions and the following disclaimer in 
-#   the documentation and/or other materials provided with the 
-#   distribution.
-#3. Neither the name of vhffs nor the names of its contributors 
-#   may be used to endorse or promote products derived from this 
-#   software without specific prior written permission.
-#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
-#FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE 
-#COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, 
-#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
-#BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
-#LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 
-#CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
-# POSSIBILITY OF SUCH DAMAGE.
-
-=pod
-
-=head1 NAME
-
-Vhffs::Panel::Template - HTML::Template::Expr sublasse with utility functions
-
-=head1 SYNOPSIS
-
-    my $template = new Vhffs::Panel::Template(same params as
-    HTML::Template::Expr)
-
-This class allow you to use <tmpl_i18n key="k"> constructs in your template
-files. Each tmpl_i18n tag is replaced by the corresponding translation using
-gettext.
-
-=cut
-
-use strict;
-use utf8;
-
-package Vhffs::Panel::Template;
-
-use base qw(HTML::Template::Expr);
-use Locale::gettext;
-
-sub new {
-    my $class = shift;
-    my %options = (@_);
-
-    if(exists $options{filter}) {
-        my $filter = $options{filter};
-        if(ref($filter) eq 'ARRAY') {
-            $filter->[@{$filter}] = \&i18n_filter;
-        } else {
-            $filter = [$filter, \&i18n_filter];
-        }
-        $options{filter} = $filter;
-    } else {
-        $options{filter} = \&i18n_filter;
-    }
-    
-    return $class->SUPER::new(%options);
-}
-
-sub i18n_filter {
-    my $txt = shift;
-    $$txt =~ s/<\s*[Tt][Mm][Pp][Ll]_[Ii]18[Nn]\s+[Kk][Ee][Yy]="([^"]+)"\s*>/gettext($1)/ge;
-}
-
-1;
-
-__END__
-=head1 AUTHORS
-
-Sebastien Le Ray < beuss at tuxfamily dot org >

Modified: trunk/vhffs-panel/repository/prefs.pl
===================================================================
--- trunk/vhffs-panel/repository/prefs.pl	2011-06-02 22:05:48 UTC (rev 1856)
+++ trunk/vhffs-panel/repository/prefs.pl	2011-06-02 22:05:56 UTC (rev 1857)
@@ -72,34 +72,6 @@
     };
 	$panel->set_title( gettext('Admin Download repository') );
     $panel->render('repository/prefs.tt', $vars);
-
-	$template = new Vhffs::Panel::Template( filename => $templatedir."/panel/repository/prefs.tmpl" );
-
-	$template->param( TEXT_REPONAME => $repo->get_name );
-
-	$template->param( THEME => $panel->{theme} );
-	$template->param( QUOTA_VALUE => sprintf( gettext("Quota (used/total) : %s/%s") , $repo->get_quota_used , $repo->get_quota ) );
-	$template->param( QUOTA_WIDTH => ( ($repo->get_quota_used / $repo->get_quota) * 300 ) );
-
-	$template->param( TEXT_DELETE_REPOSITORY => gettext("Delete this project") );
-	$template->param( TEXT_BEFORE_DELETE => gettext("This action is non-reversible. This download repository will be DESTROYED.") );
-	$template->param( ASK_DELETE_REPOSITORY => gettext("Are you SURE you want DELETE this download repository ?") );
-	$template->param( YES => gettext("Yes I'm sure of what I do") );
-	$template->param( NO => gettext("No, I'm not sure, I prefer to keep this project.") );
-	$template->param( TEXT_DELETE => gettext("Delete") );
-
-	$template->param( VALUE_OID => $repo->get_oid );
-	$template->param( TEXT_ACL_ADMIN => "Admin Rights on this object (ACL)" );
-	$template->param( EXPLAIN_ADMIN_ACL => "You can Manage rights on this service for each user in the VHFFS database. Please read help before manage it." );
-	$template->param( ADMIN_ACL => "Ok, go to ACL admin" );
-
-	if($user->is_admin() == 1) {
-		$template->param( ADMIN => 1);
-		my $adminpart = Vhffs::Panel::Object::admin_part( $panel, $repo );
-		$template->param( ADMIN_PART => $adminpart->output ) if( defined $adminpart );
-		$template->param( QUOTA => $repo->get_quota() );
-		$template->param( USED_QUOTA => $repo->get_quota_used() );
-	}
 }
 
 sub update_quota {

Modified: trunk/vhffs-panel/user/prefs.pl
===================================================================
--- trunk/vhffs-panel/user/prefs.pl	2011-06-02 22:05:48 UTC (rev 1856)
+++ trunk/vhffs-panel/user/prefs.pl	2011-06-02 22:05:56 UTC (rev 1857)
@@ -44,7 +44,6 @@
 use Vhffs::Panel::Main;
 use Vhffs::Panel::User;
 use Vhffs::Panel::Object;
-use Vhffs::Panel::Template;
 use Vhffs::Services::MailUser;
 use Vhffs::Services::Newsletter;