[vhffs-dev] [1846] Clean up again

[subversion@xxxxxxxxxxxxx]

Revision: 1846
Author:   beuss
Date:     2011-06-03 00:03:43 +0200 (Fri, 03 Jun 2011)
Log Message:
-----------
Clean up again

Modified Paths:
--------------
    trunk/vhffs-api/src/Vhffs/Panel/Main.pm
    trunk/vhffs-panel/templates/Makefile.am

Removed Paths:
-------------
    trunk/vhffs-panel/templates/misc/infos.tmpl
    trunk/vhffs-panel/templates/misc/service_index.tmpl

Modified: trunk/vhffs-api/src/Vhffs/Panel/Main.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Main.pm	2011-06-02 22:03:35 UTC (rev 1845)
+++ trunk/vhffs-api/src/Vhffs/Panel/Main.pm	2011-06-02 22:03:43 UTC (rev 1846)
@@ -462,35 +462,6 @@
 }
 
 
-sub light
-{
-	my $panel = shift;
-	my $template = shift;
-	my $cgi = $panel->{cgi};
-	my $theme = $panel->{theme};
-	my $templatedir = $panel->{templatedir};
-
-	$panel->add_info( Encode::decode_utf8( $cgi->param('msg') ) ) if( defined $cgi->param('msg') );
-
-	$template->param( THEME => $theme ) if( ($template->query(name => 'THEME') || '') eq 'VAR' );
-
-	if( @{$panel->{errors}} > 0 ) {
-		my $tmplerrors = new HTML::Template( filename => $templatedir.'/panel/misc/errors.tmpl' );
-		$tmplerrors->param( ERRORS => $panel->{errors} );
-		$template->param( ERRORS => $tmplerrors->output );
-	}
-
-	if( @{$panel->{infos}} > 0 ) {
-		my $tmplinfos = new HTML::Template( filename => $templatedir.'/panel/misc/infos.tmpl' );
-		$tmplinfos->param( INFOS => $panel->{infos} );
-		$template->param( INFOS => $tmplinfos->output );
-	}
-
-	$panel->{content} = $template->output;
-	return;
-}
-
-
 =head2 $panel->display
 
 B<DEPRECATED> Render HTML::Template based template.

Modified: trunk/vhffs-panel/templates/Makefile.am
===================================================================
--- trunk/vhffs-panel/templates/Makefile.am	2011-06-02 22:03:35 UTC (rev 1845)
+++ trunk/vhffs-panel/templates/Makefile.am	2011-06-02 22:03:43 UTC (rev 1846)
@@ -14,8 +14,6 @@
 	menu/user.tmpl \
 	misc/group_service.tmpl \
 	misc/history_part.tmpl \
-	misc/infos.tmpl \
-	misc/service_index.tmpl \
 	acl/form.tt \
 	acl/view.tt \
 	admin/broadcast/create.tt \

Deleted: trunk/vhffs-panel/templates/misc/infos.tmpl
===================================================================
--- trunk/vhffs-panel/templates/misc/infos.tmpl	2011-06-02 22:03:35 UTC (rev 1845)
+++ trunk/vhffs-panel/templates/misc/infos.tmpl	2011-06-02 22:03:43 UTC (rev 1846)
@@ -1,5 +0,0 @@
-<div id="infos">
-<TMPL_LOOP NAME="infos">
-<p class="info"><TMPL_VAR ESCAPE=1 NAME="msg"></p>
-</TMPL_LOOP>
-</div>

Deleted: trunk/vhffs-panel/templates/misc/service_index.tmpl
===================================================================
--- trunk/vhffs-panel/templates/misc/service_index.tmpl	2011-06-02 22:03:35 UTC (rev 1845)
+++ trunk/vhffs-panel/templates/misc/service_index.tmpl	2011-06-02 22:03:43 UTC (rev 1846)
@@ -1,27 +0,0 @@
-<fieldset>
-    <legend><TMPL_VAR ESCAPE=1 NAME="TEXT_TITLE"></legend>
-    <ul class="<TMPL_VAR ESCAPE=1 NAME="SERVICE">List">
-<TMPL_IF NAME="SERVICES">
-        <TMPL_LOOP NAME="SERVICES">
-        <li><TMPL_VAR ESCAPE=1 NAME="DISPLAYNAME">
-<TMPL_IF NAME="active">
-    &mdash; <a href="/<TMPL_VAR ESCAPE=1 NAME="SERVICE">/prefs.pl?name=<TMPL_VAR ESCAPE=1 NAME="DISPLAYNAME">"><TMPL_VAR ESCAPE=1 NAME="ADMIN_TEXT"></a> -
-<tmpl_else>
-    (<TMPL_VAR ESCAPE=1 NAME="state">) &mdash;
-    <TMPL_IF NAME="refused">
-       <a href="/object/resubmit.pl?oid=<TMPL_VAR ESCAPE=1 NAME="OID">"><TMPL_VAR ESCAPE=1 NAME="RESUBMIT_TEXT"></a> -
-       <a href="/object/quickdelete.pl?oid=<TMPL_VAR ESCAPE=1 NAME="OID">"><TMPL_VAR ESCAPE=1 NAME="DELETE_TEXT"></a> -
-    </TMPL_IF>
-</TMPL_IF>
-<a href="/history.pl?OID=<TMPL_VAR ESCAPE=1 NAME="OID">"><TMPL_VAR ESCAPE=1 NAME="HISTORY_TEXT"></a>
-</li>
-        </TMPL_LOOP>
-<tmpl_else>
-        <li><TMPL_VAR ESCAPE=1 NAME="NO_SERVICE_TEXT"></li>
-</TMPL_IF>
-        <li><a href="/<TMPL_VAR ESCAPE=1 NAME="SERVICE">/create.pl?group=<TMPL_VAR ESCAPE=1 NAME="GROUPNAME">"><TMPL_VAR ESCAPE=1 NAME="NEW"></a></li>
-        <TMPL_IF NAME="HELP_URL">
-        <li><a href="<TMPL_VAR ESCAPE=1 NAME="HELP_URL">"><TMPL_VAR ESCAPE=1 NAME="HELP_TEXT"></a></li>
-        </TMPL_IF>
-    </ul>
-</fieldset>