| [vhffs-dev] [629] Performed big template cleanup since we do not need menu templates anymore . |
[ Thread Index |
Date Index
| More vhffs.org/vhffs-dev Archives
]
Revision: 629
Author: beuss
Date: 2007-05-25 15:16:41 +0000 (Fri, 25 May 2007)
Log Message:
-----------
Performed big template cleanup since we do not need menu templates anymore.
Removed now useless javascript stuff in vhffs-ng.
Modified Paths:
--------------
trunk/vhffs-api/src/Vhffs/Panel/Admin.pm
trunk/vhffs-api/src/Vhffs/Panel/Cvs.pm
trunk/vhffs-api/src/Vhffs/Panel/DNS.pm
trunk/vhffs-api/src/Vhffs/Panel/Group.pm
trunk/vhffs-api/src/Vhffs/Panel/Mail.pm
trunk/vhffs-api/src/Vhffs/Panel/Mailinglist.pm
trunk/vhffs-api/src/Vhffs/Panel/Main.pm
trunk/vhffs-api/src/Vhffs/Panel/Menu.pm
trunk/vhffs-api/src/Vhffs/Panel/Mysql.pm
trunk/vhffs-api/src/Vhffs/Panel/Pgsql.pm
trunk/vhffs-api/src/Vhffs/Panel/Repository.pm
trunk/vhffs-api/src/Vhffs/Panel/Svn.pm
trunk/vhffs-api/src/Vhffs/Panel/Web.pm
trunk/vhffs-panel/Makefile.am
trunk/vhffs-panel/templates/Makefile.am
trunk/vhffs-panel/templates/main/panel.tmpl
trunk/vhffs-panel/templates/misc/service_index.tmpl
Removed Paths:
-------------
trunk/vhffs-panel/templates/admin/cvs/menu.tmpl
trunk/vhffs-panel/templates/admin/dns/menu.tmpl
trunk/vhffs-panel/templates/admin/group/menu.tmpl
trunk/vhffs-panel/templates/admin/mail/menu.tmpl
trunk/vhffs-panel/templates/admin/mailing/menu.tmpl
trunk/vhffs-panel/templates/admin/mysql/menu.tmpl
trunk/vhffs-panel/templates/admin/pgsql/menu.tmpl
trunk/vhffs-panel/templates/admin/repository/menu.tmpl
trunk/vhffs-panel/templates/admin/svn/menu.tmpl
trunk/vhffs-panel/templates/admin/user/menu.tmpl
trunk/vhffs-panel/templates/admin/web/menu.tmpl
trunk/vhffs-panel/templates/cvs/menu.tmpl
trunk/vhffs-panel/templates/cvs/menu_sub.tmpl
trunk/vhffs-panel/templates/cvs/menu_sub_wait.tmpl
trunk/vhffs-panel/templates/dns/menu.tmpl
trunk/vhffs-panel/templates/dns/menu_sub.tmpl
trunk/vhffs-panel/templates/dns/menu_sub_wait.tmpl
trunk/vhffs-panel/templates/group/menu.tmpl
trunk/vhffs-panel/templates/group/menu_sub.tmpl
trunk/vhffs-panel/templates/group/menu_sub_wait.tmpl
trunk/vhffs-panel/templates/mail/menu.tmpl
trunk/vhffs-panel/templates/mail/menu_sub.tmpl
trunk/vhffs-panel/templates/mail/menu_sub_wait.tmpl
trunk/vhffs-panel/templates/mailinglist/menu.tmpl
trunk/vhffs-panel/templates/mailinglist/menu_sub.tmpl
trunk/vhffs-panel/templates/mailinglist/menu_sub_wait.tmpl
trunk/vhffs-panel/templates/main/auth.html
trunk/vhffs-panel/templates/mysql/menu.tmpl
trunk/vhffs-panel/templates/mysql/menu_sub.tmpl
trunk/vhffs-panel/templates/mysql/menu_sub_wait.tmpl
trunk/vhffs-panel/templates/pgsql/menu.tmpl
trunk/vhffs-panel/templates/pgsql/menu_sub.tmpl
trunk/vhffs-panel/templates/pgsql/menu_sub_wait.tmpl
trunk/vhffs-panel/templates/repository/menu.tmpl
trunk/vhffs-panel/templates/repository/menu_sub.tmpl
trunk/vhffs-panel/templates/repository/menu_sub_wait.tmpl
trunk/vhffs-panel/templates/svn/menu.tmpl
trunk/vhffs-panel/templates/svn/menu_sub.tmpl
trunk/vhffs-panel/templates/svn/menu_sub_wait.tmpl
trunk/vhffs-panel/templates/web/menu.tmpl
trunk/vhffs-panel/templates/web/menu_sub.tmpl
trunk/vhffs-panel/templates/web/menu_sub_wait.tmpl
trunk/vhffs-panel/themes/vhffs-ng/js/
Modified: trunk/vhffs-api/src/Vhffs/Panel/Admin.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Admin.pm 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-api/src/Vhffs/Panel/Admin.pm 2007-05-25 15:16:41 UTC (rev 629)
@@ -324,186 +324,4 @@
return $categories;
}
-sub menu
-{
- my ($class , $data ) = @_;
-
- my $vhffs = $data->{'vhffs'};
- my $session = $data->{'session'};
- my $user = $data->{'user'};
- my $group = $data->{'group'};
- my $cgi = $data->{'cgi'};
-
- my $templatesdir = $vhffs->get_config->get_templatedir;
-
- my $template = new HTML::Template( filename => "$templatesdir/admin/main/main.tmpl" );
- $template->param( MENU_TITLE => gettext( "Administrator Menu" ) );
- my $subtemplate;
-
- #Print the General Admin/Modo Panel
- if( $user->is_admin == 1 )
- {
- $subtemplate = new HTML::Template( filename => "$templatesdir/admin/main/general.tmpl" );
- }
- else
- {
- $subtemplate = new HTML::Template( filename => "$templatesdir/admin/main/general-modo.tmpl" );
- }
-
-
- $subtemplate->param( TEXT_ADMIN_GENERAL => gettext( "General" ) );
- $subtemplate->param( TEXT_STATS => gettext( "Get Statistics" ) );
- $subtemplate->param( TEXT_MODERATION => gettext( "Moderation" ) );
-
- if( $user->is_admin == 1 ) {
- $subtemplate->param( TEXT_VHFFSSU => gettext( "Change user-id" ) );
- $subtemplate->param( TEXT_MAILING => gettext( "Mail to all hosted people" ) );
- $subtemplate->param( TEXT_AMAILING => gettext( "Manage mailings" ) );
- $subtemplate->param( TEXT_OBJECT_LIST => gettext( "List all objects" ) );
- $subtemplate->param( TEXT_OBJECT_SEARCH => gettext( "Search for an object" ) );
-
- }
-
- $template->param( ADMIN_GENERAL => $subtemplate->output );
-
-
- $subtemplate = new HTML::Template( filename => "$templatesdir/admin/user/menu.tmpl" );
- $subtemplate->param( TEXT_ADMIN_USER => gettext( "User Admin" ) );
- $subtemplate->param( TEXT_LIST_USER => gettext( "List all users" ) );
- $subtemplate->param( TEXT_SEARCH_USER => gettext( "Search for an user" ) );
-
- $template->param( ADMIN_USERS => $subtemplate->output );
-
-
- $subtemplate = new HTML::Template( filename => "$templatesdir/admin/group/menu.tmpl" );
- $subtemplate->param( TEXT_ADMIN_GROUP => gettext( "Group Admin" ) );
- $subtemplate->param( TEXT_LIST_GROUP => gettext( "List all groups" ) );
- $subtemplate->param( TEXT_SEARCH_GROUP => gettext( "Search for a group" ) );
-
- $template->param( ADMIN_GROUPS => $subtemplate->output );
-
-
- if( $vhffs->get_config->use_web == 1 )
- {
- $subtemplate = new HTML::Template( filename => "$templatesdir/admin/web/menu.tmpl" );
- $subtemplate->param( TEXT_ADMIN_WEB => gettext( "Web Admin" ) );
- $subtemplate->param( TEXT_LIST_WEB => gettext( "List websites" ) );
- $subtemplate->param( TEXT_SEARCH_WEB => gettext( "Search for a website" ) );
-
- $template->param( ADMIN_WEB => $subtemplate->output );
- }
- else
- {
- $template->param( ADMIN_WEB => "" );
- }
-
- if( $vhffs->get_config->use_svn == 1 )
- {
- $subtemplate = new HTML::Template( filename => "$templatesdir/admin/svn/menu.tmpl" );
- $subtemplate->param( TEXT_ADMIN_SVN => gettext( "Subversion Admin" ) );
- $subtemplate->param( TEXT_LIST_SVN => gettext( "List all SVN repo" ) );
- $subtemplate->param( TEXT_SEARCH_SVN => gettext( "Search for a SVN repository" ) );
- $template->param( ADMIN_SVN => $subtemplate->output );
- }
- else
- {
- $template->param( ADMIN_SVN => "" );
- }
-
-
- if( $vhffs->get_config->use_cvs == 1 )
- {
- $subtemplate = new HTML::Template( filename => "$templatesdir/admin/cvs/menu.tmpl" );
- $subtemplate->param( TEXT_ADMIN_CVS => gettext( "CVS Admin" ) );
- $subtemplate->param( TEXT_LIST_CVS => gettext( "List all CVS" ) );
- $subtemplate->param( TEXT_SEARCH_CVS => gettext( "CVS Search" ) );
- $template->param( ADMIN_CVS => $subtemplate->output );
- }
- else
- {
- $template->param( ADMIN_CVS => "" );
- }
-
- if( $vhffs->get_config->use_mysql == 1 )
- {
- $subtemplate = new HTML::Template( filename => "$templatesdir/admin/mysql/menu.tmpl" );
- $subtemplate->param( TEXT_ADMIN_MYSQL => gettext( "MYSQL Admin" ) );
- $subtemplate->param( TEXT_LIST_MYSQL => gettext( "List all DBs" ) );
- $subtemplate->param( TEXT_SEARCH_MYSQL => gettext( "DB Search" ) );
- $template->param( ADMIN_MYSQL => $subtemplate->output );
- }
- else
- {
- $template->param( ADMIN_MYSQL => "" );
- }
-
-
- if( $vhffs->get_config->use_mail == 1 )
- {
- $subtemplate = new HTML::Template( filename => "$templatesdir/admin/mail/menu.tmpl" );
- $subtemplate->param( TEXT_ADMIN_MAIL => gettext( "Mail Admin" ) );
- $subtemplate->param( TEXT_LIST_MAIL => gettext( "List all domain names" ) );
- $subtemplate->param( TEXT_SEARCH_MAIL => gettext( "Search for a mail domain" ) );
- $template->param( ADMIN_MAIL => $subtemplate->output );
- }
- else
- {
- $template->param( ADMIN_MAIL => "" );
- }
-
- if( $vhffs->get_config->use_mailing == 1 )
- {
- $subtemplate = new HTML::Template( filename => "$templatesdir/admin/mailing/menu.tmpl" );
- $subtemplate->param( TEXT_ADMIN_MAILLING => gettext( "Mailing-lists Admin" ) );
- $subtemplate->param( TEXT_LIST_MAILLING => gettext( "List all lists" ) );
- $subtemplate->param( TEXT_SEARCH_MAILLING => gettext( "Search for a list" ) );
- $template->param( ADMIN_MAILLINGLIST => $subtemplate->output );
- }
- else
- {
- $template->param( ADMIN_MAILLINGLIST => "" );
- }
-
- if( $vhffs->get_config->use_postgres == 1 )
- {
- $subtemplate = new HTML::Template( filename => "$templatesdir/admin/pgsql/menu.tmpl" );
- $subtemplate->param( TEXT_ADMIN_POSTGRES => gettext( "Postgres Admin" ) );
- $subtemplate->param( TEXT_LIST_POSTGRES => gettext( "List all Postgres DB" ) );
- $subtemplate->param( TEXT_SEARCH_POSTGRES => gettext( "Search for a PostgreSQL database" ) );
- $template->param( ADMIN_POSTGRESQL => $subtemplate->output );
- }
- else
- {
- $template->param( ADMIN_POSTGRESQL => "" );
- }
-
- if( $vhffs->get_config->use_dns == 1 )
- {
- $subtemplate = new HTML::Template( filename => "$templatesdir/admin/dns/menu.tmpl" );
- $subtemplate->param( TEXT_ADMIN_DNS => gettext( "NS Admin" ) );
- $subtemplate->param( TEXT_LIST_DNS => gettext( "List all domains" ) );
- $subtemplate->param( TEXT_SEARCH_DNS => gettext( "Search for a domain" ) );
- $template->param( ADMIN_DNS => $subtemplate->output );
- }
- else
- {
- $template->param( ADMIN_DNS => "" );
- }
-
- if( $vhffs->get_config->use_repository == 1 )
- {
- $subtemplate = new HTML::Template( filename => "$templatesdir/admin/repository/menu.tmpl" );
- $subtemplate->param( TEXT_ADMIN_REPOSITORY => gettext( "Download repository admin" ) );
- $subtemplate->param( TEXT_LIST_REPOSITORY => gettext( "List all download repositories" ) );
- $subtemplate->param( TEXT_SEARCH_REPOSITORY => gettext( "Search for a download repository" ) );
- $template->param( ADMIN_REPOSITORY => $subtemplate->output );
- }
- else
- {
- $template->param( ADMIN_REPOSITORY => "" );
- }
-
- return $template->output;
-}
-
1;
Modified: trunk/vhffs-api/src/Vhffs/Panel/Cvs.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Cvs.pm 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-api/src/Vhffs/Panel/Cvs.pm 2007-05-25 15:16:41 UTC (rev 629)
@@ -131,54 +131,4 @@
return $cvs;
}
-sub menu
-{
- my ( $class , $data ) = @_;
-
- my $vhffs = $data->{'vhffs'};
- my $session = $data->{'session'};
- my $user = $data->{'user'};
- my $group = $data->{'group'};
- my $cgi = $data->{'cgi'};
- my $templatesdir = $vhffs->get_config->get_templatedir;
- my $cvs;
- my $template = new HTML::Template( filename => "$templatesdir/cvs/menu.tmpl" );
- $template->param( TEXT_CREATE => gettext("Create") );
- $template->param( TEXT_CVS => gettext("CVS repository") );
- $template->param( TEXT_CVSDOC => gettext("Documentation") );
- $template->param( URL_CVSDOC => $vhffs->get_config->get_cvsdocurl );
-
- my $repos = Vhffs::Services::Cvs::getall_per_group( $vhffs , $group );
- my $output = "";
- my $subtemplate;
-
-
- foreach $cvs ( @{$repos} )
- {
- if( $cvs->get_status == Vhffs::Constants::ACTIVATED )
- {
- $subtemplate = new HTML::Template( filename => "$templatesdir/cvs/menu_sub.tmpl" );
- $subtemplate->param( NAME => $cvs->get_cvsroot );
- $subtemplate->param( HISTORY => gettext("History"));
- $subtemplate->param( GROUPNAME => $cvs->get_group->get_groupname );
- $subtemplate->param( OID => $cvs->get_oid );
- $subtemplate->param( CVSWEB => gettext("CVSweb") );
- $subtemplate->param( CVSWEBURL => $vhffs->get_config->get_cvsweburl );
- $output .= $subtemplate->output;
- }
- else
- {
- $subtemplate = new HTML::Template( filename => "$templatesdir/cvs/menu_sub_wait.tmpl" );
- $subtemplate->param( NAME => $cvs->get_cvsroot );
- $subtemplate->param( REASON => gettext( Vhffs::Functions::status_string_from_status_id( $cvs->get_status ) ) );
- $subtemplate->param( HISTORY => gettext("History"));
- $subtemplate->param( OID => $cvs->get_oid );
- $output .= $subtemplate->output;
- }
- }
-
- $template->param( SUB_CVS => $output );
- return $template->output;
-}
-
1;
Modified: trunk/vhffs-api/src/Vhffs/Panel/DNS.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/DNS.pm 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-api/src/Vhffs/Panel/DNS.pm 2007-05-25 15:16:41 UTC (rev 629)
@@ -149,50 +149,6 @@
return $dns;
}
-sub menu
-{
- my ( $class , $data ) = @_;
-
- my $vhffs = $data->{'vhffs'};
- my $session = $data->{'session'};
- my $user = $data->{'user'};
- my $group = $data->{'group'};
- my $cgi = $data->{'cgi'};
- my $templatesdir = $vhffs->get_config->get_templatedir;
- my $template = new HTML::Template( filename => "$templatesdir/dns/menu.tmpl" );
- my $ns;
- $template->param( TEXT_CREATE => gettext("Create") );
- $template->param( TEXT_DNS => gettext("DNS") );
-
- my $output = "";
- my $domains = Vhffs::Services::DNS::getall( $vhffs , undef , undef , $group );
- my $subtemplate;
- foreach $ns ( @{$domains} )
- {
- if( $ns->get_status == Vhffs::Constants::ACTIVATED )
- {
- $subtemplate = new HTML::Template( filename => "$templatesdir/dns/menu_sub.tmpl" );
- $subtemplate->param( DOMAIN => $ns->get_domain );
- $subtemplate->param( HISTORY => Vhffs::Functions::status_string_from_status_id( $ns->get_status ) );
- $subtemplate->param( OID => $ns->get_oid );
- $output .= $subtemplate->output;
- }
- else
- {
- $subtemplate = new HTML::Template( filename => "$templatesdir/dns/menu_sub_wait.tmpl" );
- $subtemplate->param( DOMAIN => $ns->get_domain );
- $subtemplate->param( HISTORY => gettext("History") );
- $subtemplate->param( REASON => Vhffs::Functions::status_string_from_status_id( $ns->get_status ) );
- $subtemplate->param( OID => $ns->get_oid );
- $output .= $subtemplate->output;
- }
- }
-
- $template->param( SUB_DNS => $output );
-
- return $template->output;
-}
-
=pod
=head2 delete_record
Modified: trunk/vhffs-api/src/Vhffs/Panel/Group.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Group.pm 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-api/src/Vhffs/Panel/Group.pm 2007-05-25 15:16:41 UTC (rev 629)
@@ -147,50 +147,4 @@
return $group;
}
-
-sub menu
-{
- my ( $class , $data ) = @_;
-
- my $vhffs = $data->{'vhffs'};
- my $session = $data->{'session'};
- my $user = $data->{'user'};
- my $cgi = $data->{'cgi'};
- my $output = "";
- my $templatedir = $vhffs->get_config->get_templatedir;
- my $template = new HTML::Template( filename => $templatedir."/group/menu.tmpl" );
- $template->param( TEXT_MYPROJECTS => gettext("My Projects") );
- $template->param( TEXT_CREATE => gettext("Create") );
-
- # projects
-
-# my $groups = getall_groups_per_user( $user , $vhffs );
- my $groups = $user->get_groups;
- my $obj;
- my $subtemplate;
- foreach $obj ( @{$groups} )
- {
- if( $obj->get_status == Vhffs::Constants::ACTIVATED )
- {
- $subtemplate = new HTML::Template( filename => $templatedir."/group/menu_sub.tmpl" );
- $subtemplate->param( PROJECTNAME => $obj->get_groupname );
- $subtemplate->param( OID => $obj->get_oid );
- $subtemplate->param( HISTORY_TEXT => gettext('History') );
- $output .= $subtemplate->output;
- }
- else
- {
- $subtemplate = new HTML::Template( filename => $templatedir."/group/menu_sub_wait.tmpl" );
- $subtemplate->param( PROJECTNAME => $obj->get_groupname );
- $subtemplate->param( REASON => "(". Vhffs::Functions::status_string_from_status_id( $obj->get_status ) .")" );
- $output .= $subtemplate->output;
- }
- }
-
-
- $template->param( SUB_GROUP => $output );
-
- return $template->output;
-}
-
1;
Modified: trunk/vhffs-api/src/Vhffs/Panel/Mail.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Mail.pm 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-api/src/Vhffs/Panel/Mail.pm 2007-05-25 15:16:41 UTC (rev 629)
@@ -159,54 +159,4 @@
return $mail;
}
-
-
-sub menu
-{
- my ( $class , $data ) = @_;
-
- my $vhffs = $data->{'vhffs'};
- my $session = $data->{'session'};
- my $user = $data->{'user'};
- my $group = $data->{'group'};
- my $cgi = $data->{'cgi'};
-
- my $templatesdir = $vhffs->get_config->get_templatedir;
- my $template = new HTML::Template( filename => "$templatesdir/mail/menu.tmpl" );
- $template->param( TEXT_CREATE => gettext("Create") );
- $template->param( TEXT_MAIL => gettext("Mail") );
-
- my $mails = Vhffs::Services::Mail::getall( $vhffs , undef , undef , $group );
- my $mail;
- my $output = "";
- my $subtemplate;
-
- foreach $mail ( @{$mails} )
- {
-
- if( $mail->get_status == Vhffs::Constants::ACTIVATED )
- {
- $subtemplate = new HTML::Template( filename => "$templatesdir/mail/menu_sub.tmpl" );
- $subtemplate->param( DOMAIN => $mail->get_domain);
- $subtemplate->param( HISTORY => gettext("History"));
- $subtemplate->param( OID => $mail->get_oid );
- $output .= $subtemplate->output;
- }
- else
- {
- $subtemplate = new HTML::Template( filename => "$templatesdir/mail/menu_sub_wait.tmpl" );
- $subtemplate->param( DOMAIN => $mail->get_domain );
- $subtemplate->param( HISTORY => gettext("History"));
- $subtemplate->param( REASON => Vhffs::Functions::status_string_from_status_id( $mail->get_status ));
- $subtemplate->param( OID => $mail->get_oid );
- $output .= $subtemplate->output;
- }
- }
-
-
- $template->param( SUB_MAIL => $output );
-
- return $template->output;
-}
-
1;
Modified: trunk/vhffs-api/src/Vhffs/Panel/Mailinglist.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Mailinglist.pm 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-api/src/Vhffs/Panel/Mailinglist.pm 2007-05-25 15:16:41 UTC (rev 629)
@@ -129,55 +129,4 @@
return $list;
}
-
-
-sub menu
-{
- my ( $class , $data ) = @_;
-
- my $vhffs = $data->{'vhffs'};
- my $session = $data->{'session'};
- my $user = $data->{'user'};
- my $group = $data->{'group'};
- my $cgi = $data->{'cgi'};
-
- my $templatesdir = $vhffs->get_config->get_templatedir;
- my $template = new HTML::Template( filename => "$templatesdir/mailinglist/menu.tmpl" );
- $template->param( TEXT_CREATE => gettext("Create") );
- $template->param( TEXT_MAILINGLIST => gettext("Mailing List") );
-
- my $subtemplate;
-
- my $mls = Vhffs::Services::Mailing::getall( $vhffs , undef , undef , $group );
- my $ml;
- my $output = "";
-
- foreach $ml ( @{$mls} ) {
- if( $ml->get_status == Vhffs::Constants::ACTIVATED ) {
- $subtemplate = new HTML::Template( filename => "$templatesdir/mailinglist/menu_sub.tmpl" );
- $subtemplate->param( NAME => $ml->get_localpart . "\@" . $ml->get_domain);
- $subtemplate->param( LOCAL => $ml->get_localpart );
- $subtemplate->param( DOMAIN => $ml->get_domain );
- $subtemplate->param( HISTORY => gettext("History"));
- $subtemplate->param( OID => $ml->get_oid );
- } else {
- $subtemplate = new HTML::Template( filename => "$templatesdir/mailinglist/menu_sub_wait.tmpl" );
- $subtemplate->param( NAME => $ml->get_localpart . "\@" . $ml->get_domain);
- $subtemplate->param( HISTORY => gettext("History"));
- $subtemplate->param( REASON => Vhffs::Functions::status_string_from_status_id( $ml->get_status ));
- $subtemplate->param( OID => $ml->get_oid );
- }
-
-
- $output .= $subtemplate->output if( defined $subtemplate );
- undef( $subtemplate );
- }
-
- $template->param( SUB_MAILINGLIST => $output );
-
- return $template->output;
-}
-
-
-
1;
Modified: trunk/vhffs-api/src/Vhffs/Panel/Main.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Main.pm 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-api/src/Vhffs/Panel/Main.pm 2007-05-25 15:16:41 UTC (rev 629)
@@ -20,7 +20,18 @@
use Vhffs::Panel::Menu;
use Vhffs::Panel::User;
use Vhffs::Panel::Commons;
+use Vhffs::Panel::Admin;
+use Vhffs::Panel::Cvs;
+use Vhffs::Panel::DNS;
+use Vhffs::Panel::Mail;
+use Vhffs::Panel::Mailinglist;
+use Vhffs::Panel::Mysql;
+use Vhffs::Panel::Pgsql;
+use Vhffs::Panel::Repository;
+use Vhffs::Panel::Svn;
+use Vhffs::Panel::Web;
+
=pod
=head1 NAME
@@ -369,6 +380,7 @@
}
$maintemplate->param( JSCRIPTS => \@jscripts );
$maintemplate->param( TEXT_HELP => gettext('Help') );
+ $maintemplate->param( TEXT_HELP_CONTENT => gettext('Stay over an icon to see its description.') );
$this->{session} = $session;
$this->{template} = $maintemplate;
@@ -378,12 +390,20 @@
$this->{'groupname'} = $projectname;
}
- $maintemplate->param( HEADER => $this->generate_menu );
+ $maintemplate->param( HEADER => $this->generate_header );
return $this;
}
-sub generate_menu {
+=head2 generate_header
+
+ print $panel->generate_header;
+
+Generates panel header (account name, project label, contextuel menu, etc.).
+
+=cut
+
+sub generate_header {
my $self = shift;
my $user = $self->{user};
my $theme = $self->{theme};
@@ -419,95 +439,20 @@
# Current project stuff (TODO stop handle it in session)
if( ( CGI::url( -absolute => 1) =~ /^\/admin\// ) ) {
if( $user->is_admin ) {
- $menutemplate->param( CONTEXTUAL_MENU => generate_admin_ctxmenu($vhffs->get_config) );
+ $menutemplate->param( CONTEXTUAL_MENU => Vhffs::Panel::Menu::generate_admin_ctxmenu($vhffs->get_config) );
} elsif( $user->is_moderator ) {
- $menutemplate->param( CONTEXTUAL_MENU => generate_moderator_ctxmenu($vhffs->get_config) );
+ $menutemplate->param( CONTEXTUAL_MENU => Vhffs::Panel::Menu::generate_moderator_ctxmenu($vhffs->get_config) );
}
} elsif($groupname) {
$menutemplate->param( CURRENT_GROUP_TEXT => gettext('Current group:') );
$menutemplate->param( PROJECT_HOME_TEXT => gettext('Project home') );
$menutemplate->param( GROUPNAME => $groupname );
- $menutemplate->param( CONTEXTUAL_MENU => generate_project_ctxmenu($vhffs->get_config));
+ $menutemplate->param( CONTEXTUAL_MENU => Vhffs::Panel::Menu::generate_project_ctxmenu($vhffs->get_config));
}
return $menutemplate->output();
}
-=head2 generate_project_ctxmenu
-
- print Vhffs::Panel::Main::generate_project_ctxmenu($vhffs->get_config);
-
-Generates and returns the contextual menu for a project.
-
-=cut
-
-sub generate_project_ctxmenu($) {
- my $config = shift;
- my $context_tmpl = new HTML::Template( filename => $config->get_templatedir.'/menu/context.tmpl' );
-
- my $items = [];
- push @$items, {path => 'web', label => gettext('Web') } if( $config->use_web );
- push @$items, {path => 'mysql', label => gettext('MySQL') } if( $config->use_mysql );
- push @$items, {path => 'pgsql', label => gettext('PgSQL') } if( $config->use_postgres );
- push @$items, {path => 'cvs', label => gettext('CVS') } if( $config->use_cvs );
- push @$items, {path => 'svn', label => gettext('SVN') } if( $config->use_svn );
- push @$items, {path => 'dns', label => gettext('Domain names') } if( $config->use_dns );
- push @$items, {path => 'repository', label => gettext('Dl repos') } if( $config->use_repository );
- push @$items, {path => 'mail', label => gettext('Mail') } if( $config->use_mail );
- push @$items, {path => 'mailinglist', label => gettext('ML') } if( $config->use_mailing );
- $context_tmpl->param( MENU_ITEMS => $items );
- return $context_tmpl->output();
-}
-
-=head2 generate_moderator_ctxmenu
-
- print Vhffs::Panel::Main::generate_moderator_ctxmenu($vhffs->get_config);
-
-Generates and returns the contextual menu for moderation part.
-
-=cut
-
-sub generate_moderator_ctxmenu {
- my $config = shift;
- my $context_tmpl = new HTML::Template( filename => $config->get_templatedir.'/menu/context-modo.tmpl' );
-
- my $items = [];
- push @$items, {path => 'admin/stats.pl', label => gettext('Get Statistics') };
- push @$items, {path => 'admin/moderation.pl', label => gettext('Moderation') };
- $context_tmpl->param( MENU_ITEMS => $items );
- return $context_tmpl->output();
-}
-
-=head2 generate_admin_ctxmenu
-
- print Vhffs::Panel::Main::generate_admin_ctxmenu($vhffs->get_config);
-
-Generates and returns the contextual menu for platform administration.
-
-=cut
-
-sub generate_admin_ctxmenu($) {
- my $config = shift;
- my $context_tmpl = new HTML::Template( filename => $config->get_templatedir.'/menu/context.tmpl' );
-
- my $items = [];
- push @$items, {path => 'admin', label => gettext('General') };
- push @$items, {path => 'admin/user', label => gettext('Users') };
- push @$items, {path => 'admin/group', label => gettext('Groups') };
- push @$items, {path => 'admin/web', label => gettext('Web') } if( $config->use_web );
- push @$items, {path => 'admin/mysql', label => gettext('MySQL') } if( $config->use_mysql );
- push @$items, {path => 'admin/pgsql', label => gettext('PgSQL') } if( $config->use_postgres );
- push @$items, {path => 'admin/cvs', label => gettext('CVS') } if( $config->use_cvs );
- push @$items, {path => 'admin/svn', label => gettext('SVN') } if( $config->use_svn );
- push @$items, {path => 'admin/dns', label => gettext('Domain names') } if( $config->use_dns );
- push @$items, {path => 'admin/repository', label => gettext('Dl repos') } if( $config->use_repository );
- push @$items, {path => 'admin/mail', label => gettext('Mail') } if( $config->use_mail );
- push @$items, {path => 'admin/mailing', label => gettext('ML') } if( $config->use_mailing );
- $context_tmpl->param( MENU_ITEMS => $items );
- return $context_tmpl->output();
-
-}
-
sub has_errors
{
my $self = shift;
Modified: trunk/vhffs-api/src/Vhffs/Panel/Menu.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Menu.pm 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-api/src/Vhffs/Panel/Menu.pm 2007-05-25 15:16:41 UTC (rev 629)
@@ -36,153 +36,90 @@
use HTML::Template;
use locale;
use Locale::gettext;
-use CGI;
-use CGI::Session;
use strict;
-use Vhffs::User;
-use Vhffs::Main;
-use Vhffs::Panel::Main;
-use Vhffs::Panel::Group;
-use Vhffs::Panel::Web;
-use Vhffs::Panel::Mysql;
-use Vhffs::Panel::Pgsql;
-use Vhffs::Panel::Cvs;
-use Vhffs::Panel::DNS;
-use Vhffs::Panel::Mail;
-use Vhffs::Panel::Mailinglist;
-use Vhffs::Panel::Repository;
-sub new
-{
- my ( $class , $data ) = @_;
- my $vhffs = $data->{'vhffs'};
- my $session = $data->{'session'};
- my $user = $data->{'user'};
- my $cgi = $data->{'cgi'};
- my $theme = $data->{'theme'};
- my $templatedir = $vhffs->get_config->get_templatedir;
- my $menu;
+=pod
- my $menutemplate = new HTML::Template( filename => $templatedir."/menu/main.tmpl" );
+=head1 NAME
- $menutemplate->param( THEME => $theme );
+Vhffs::Panel::Menu - Handle top menu in VHFFS panel.
- if( $user->is_admin == 1 ) {
- $menutemplate->param( TEXT_ACCOUNT => gettext('Admin account') );
- } elsif( $user->is_moderator == 1 ) {
- $menutemplate->param( TEXT_ACCOUNT => gettext('Moderator account') );
- } else {
- $menutemplate->param( TEXT_ACCOUNT => gettext('User account') );
- }
- $menutemplate->param( USERNAME => $user->get_username() );
- $menutemplate->param( TEXT_PROJECTS => gettext('My Projects') );
- $menutemplate->param( TEXT_PREFS => gettext("User Preferences") );
- $menutemplate->param( TEXT_HELP => gettext("Help") );
- $menutemplate->param( TEXT_SUBMITBUG => gettext("Submit a bug") );
- $menutemplate->param( TEXT_LOGOUT => gettext("Logout") );
- if( defined $vhffs->get_config->get_panel_helpurl ) {
- $menutemplate->param( HELP_URL => $vhffs->get_config->get_panel_helpurl );
- } else {
- $menutemplate->param( HELP_URL => "nolink" );
- }
-
+=head1 METHODS
- #Admin
- if( ( $user->is_admin == 1) || ( $user->is_moderator == 1 ) )
- {
- use Vhffs::Panel::Admin;
- $menutemplate->param( ADMIN_MENU => menu Vhffs::Panel::Admin( $data ) );
- }
- else
- {
- $menutemplate->param( ADMIN_MENU => "" );
- }
+=head2 generate_project_ctxmenu
- # Group
- #my $groupmenu = menu Vhffs::Panel::Group($data);
+ print Vhffs::Panel::Main::generate_project_ctxmenu($vhffs->get_config);
- my $projectname = $session->param("project");
- #$usertemplate->param( GROUP => $groupmenu );
- #$menutemplate->param( USER_MENU => $usertemplate->output );
- if( $projectname ) {
+Generates and returns the contextual menu for a project.
- my $projecttemplate = new HTML::Template( filename => $templatedir."/menu/group.tmpl" );
- $projecttemplate->param( PROJECTNAME => $projectname );
- $projecttemplate->param( TEXT_PROJECT => gettext("Project : ") );
- $projecttemplate->param( TEXT_CONFIG => gettext("Project Configuration") );
+=cut
- # Web
- if( $vhffs->get_config->use_web == 1 )
- {
- my $webmenu = menu Vhffs::Panel::Web($data);
- $projecttemplate->param( WEB_MENU => $webmenu );
- }
+sub generate_project_ctxmenu($) {
+ my $config = shift;
+ my $context_tmpl = new HTML::Template( filename => $config->get_templatedir.'/menu/context.tmpl' );
- # MySQL
- if( $vhffs->get_config->use_mysql == 1 )
- {
- my $mysqlmenu = menu Vhffs::Panel::Mysql($data);
- $projecttemplate->param( MYSQL_MENU => $mysqlmenu );
- }
+ my $items = [];
+ push @$items, {path => 'web', label => gettext('Web') } if( $config->use_web );
+ push @$items, {path => 'mysql', label => gettext('MySQL') } if( $config->use_mysql );
+ push @$items, {path => 'pgsql', label => gettext('PgSQL') } if( $config->use_postgres );
+ push @$items, {path => 'cvs', label => gettext('CVS') } if( $config->use_cvs );
+ push @$items, {path => 'svn', label => gettext('SVN') } if( $config->use_svn );
+ push @$items, {path => 'dns', label => gettext('Domain names') } if( $config->use_dns );
+ push @$items, {path => 'repository', label => gettext('Dl repos') } if( $config->use_repository );
+ push @$items, {path => 'mail', label => gettext('Mail') } if( $config->use_mail );
+ push @$items, {path => 'mailinglist', label => gettext('ML') } if( $config->use_mailing );
+ $context_tmpl->param( MENU_ITEMS => $items );
+ return $context_tmpl->output();
+}
- # PGSQL
- if( $vhffs->get_config->use_postgres == 1 )
- {
- my $pgsqlmenu = menu Vhffs::Panel::Pgsql($data);
- $projecttemplate->param( PGSQL_MENU => $pgsqlmenu );
- }
+=head2 generate_moderator_ctxmenu
- # CVS
- if( $vhffs->get_config->use_cvs == 1 )
- {
- my $cvsmenu = menu Vhffs::Panel::Cvs($data);
- $projecttemplate->param( CVS_MENU => $cvsmenu );
- }
+ print Vhffs::Panel::Main::generate_moderator_ctxmenu($vhffs->get_config);
+Generates and returns the contextual menu for moderation part.
- # SVN
- if( $vhffs->get_config->use_svn == 1 )
- {
- use Vhffs::Panel::Svn;
- my $svnmenu = menu Vhffs::Panel::Svn($data);
- $projecttemplate->param( SVN_MENU => $svnmenu );
- }
+=cut
+sub generate_moderator_ctxmenu {
+ my $config = shift;
+ my $context_tmpl = new HTML::Template( filename => $config->get_templatedir.'/menu/context-modo.tmpl' );
+ my $items = [];
+ push @$items, {path => 'admin/stats.pl', label => gettext('Get Statistics') };
+ push @$items, {path => 'admin/moderation.pl', label => gettext('Moderation') };
+ $context_tmpl->param( MENU_ITEMS => $items );
+ return $context_tmpl->output();
+}
- # DNS
- if( $vhffs->get_config->use_dns == 1 )
- {
- my $dnsmenu = menu Vhffs::Panel::DNS($data);
- $projecttemplate->param( DNS_MENU => $dnsmenu );
- }
+=head2 generate_admin_ctxmenu
- # Mail
- if( $vhffs->get_config->use_mail == 1 )
- {
- my $mailmenu = menu Vhffs::Panel::Mail($data);
- $projecttemplate->param( MAIL_MENU => $mailmenu );
- }
+ print Vhffs::Panel::Main::generate_admin_ctxmenu($vhffs->get_config);
- # Mailing list
- if( $vhffs->get_config->use_mailing == 1 )
- {
- my $mailingmenu = menu Vhffs::Panel::Mailinglist($data);
- $projecttemplate->param( MAILINGLIST_MENU => $mailingmenu );
- }
+Generates and returns the contextual menu for platform administration.
- # Download repository
- if( $vhffs->get_config->use_repository == 1 )
- {
- $menu = menu Vhffs::Panel::Repository($data);
- $projecttemplate->param( REPOSITORY_MENU => $menu );
- }
+=cut
- $menutemplate->param( PROJECT_MENU => $projecttemplate->output );
- }
+sub generate_admin_ctxmenu($) {
+ my $config = shift;
+ my $context_tmpl = new HTML::Template( filename => $config->get_templatedir.'/menu/context.tmpl' );
- return $menutemplate;
+ my $items = [];
+ push @$items, {path => 'admin', label => gettext('General') };
+ push @$items, {path => 'admin/user', label => gettext('Users') };
+ push @$items, {path => 'admin/group', label => gettext('Groups') };
+ push @$items, {path => 'admin/web', label => gettext('Web') } if( $config->use_web );
+ push @$items, {path => 'admin/mysql', label => gettext('MySQL') } if( $config->use_mysql );
+ push @$items, {path => 'admin/pgsql', label => gettext('PgSQL') } if( $config->use_postgres );
+ push @$items, {path => 'admin/cvs', label => gettext('CVS') } if( $config->use_cvs );
+ push @$items, {path => 'admin/svn', label => gettext('SVN') } if( $config->use_svn );
+ push @$items, {path => 'admin/dns', label => gettext('Domain names') } if( $config->use_dns );
+ push @$items, {path => 'admin/repository', label => gettext('Dl repos') } if( $config->use_repository );
+ push @$items, {path => 'admin/mail', label => gettext('Mail') } if( $config->use_mail );
+ push @$items, {path => 'admin/mailing', label => gettext('ML') } if( $config->use_mailing );
+ $context_tmpl->param( MENU_ITEMS => $items );
+ return $context_tmpl->output();
+
}
1;
Modified: trunk/vhffs-api/src/Vhffs/Panel/Mysql.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Mysql.pm 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-api/src/Vhffs/Panel/Mysql.pm 2007-05-25 15:16:41 UTC (rev 629)
@@ -147,54 +147,4 @@
return $mysql;
}
-sub menu
-{
- my ( $class , $data ) = @_;
-
- my $vhffs = $data->{'vhffs'};
- my $session = $data->{'session'};
- my $user = $data->{'user'};
- my $group = $data->{'group'};
- my $cgi = $data->{'cgi'};
- my $templatesdir = $vhffs->get_config->get_templatedir;
- my $template = new HTML::Template( filename => "$templatesdir/mysql/menu.tmpl");
- $template->param( PHPMYADMIN_URL => $vhffs->get_config->get_panel_phpmyadminurl ) if( defined $vhffs->get_config->get_panel_phpmyadminurl );
- $template->param( TEXT_CREATE => gettext("Create") );
- $template->param( TEXT_MYSQL => gettext("MySQL Databases") );
- $template->param( TEXT_DBACCESS => gettext("Database Access") );
-
- my $output="";
-
- my $dbs = Vhffs::Services::Mysql::getall( $vhffs , undef, undef , $group );
- my $db;
- my $subtemplate;
-
- foreach $db ( @{$dbs} )
- {
- if( $db->get_status == Vhffs::Constants::ACTIVATED )
- {
- $subtemplate = new HTML::Template( filename => "$templatesdir/mysql/menu_sub.tmpl" );
- $subtemplate->param( NAME => $db->get_dbname );
- $subtemplate->param( HISTORY => gettext("History"));
- $subtemplate->param( OID => $db->get_oid );
- $output .= $subtemplate->output;
- }
- else
- {
- $subtemplate = new HTML::Template( filename => "$templatesdir/mysql/menu_sub_wait.tmpl" );
- $subtemplate->param( NAME => $db->get_dbname );
- $subtemplate->param( REASON => "( ".Vhffs::Functions::status_string_from_status_id( $db->get_status ) . " )" );
- $subtemplate->param( HISTORY => gettext("History"));
- $subtemplate->param( OID => $db->get_oid );
- $output .= $subtemplate->output;
- }
-
-
- }
-
- $template->param( SUB_MYSQL => $output );
-
- return $template->output;
-}
-
1;
Modified: trunk/vhffs-api/src/Vhffs/Panel/Pgsql.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Pgsql.pm 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-api/src/Vhffs/Panel/Pgsql.pm 2007-05-25 15:16:41 UTC (rev 629)
@@ -114,54 +114,6 @@
return $pgsql;
}
-sub menu
-{
- my ( $class , $data ) = @_;
-
- my $vhffs = $data->{'vhffs'};
- my $session = $data->{'session'};
- my $user = $data->{'user'};
- my $group = $data->{'group'};
- my $cgi = $data->{'cgi'};
- my $templatesdir = $vhffs->get_config->get_templatedir;
- my $template = new HTML::Template( filename => "$templatesdir/pgsql/menu.tmpl" );
- $template->param( TEXT_CREATE => gettext("Create") );
- $template->param( TEXT_PGSQL => gettext("PostgreSQL Databases") );
- $template->param( TEXT_DBACCESS => gettext("Database Access") );
- $template->param( PHPPGADMIN_URL => $vhffs->get_config->get_panel_phppgadminurl ) if( defined $vhffs->get_config->get_panel_phppgadminurl );
-
- my $output="";
- my $subtemplate;
- my $dbs = Vhffs::Services::Postgres::getall( $vhffs , undef , undef , $group );
- my $db;
-
- foreach $db ( @{$dbs} )
- {
-
- if( $db->get_status == Vhffs::Constants::ACTIVATED )
- {
- $subtemplate = new HTML::Template( filename => "$templatesdir/pgsql/menu_sub.tmpl" );
- $subtemplate->param( NAME => $db->get_dbname );
- $subtemplate->param( HISTORY => gettext("History"));
- $subtemplate->param( OID => $db->get_oid );
- $output .= $subtemplate->output;
- }
- else
- {
- $subtemplate = new HTML::Template( filename => "$templatesdir/pgsql/menu_sub_wait.tmpl" );
- $subtemplate->param( NAME => $db->get_dbname );
- $subtemplate->param( REASON => "( ".Vhffs::Functions::status_string_from_status_id( $db->get_status ) . " )" );
- $subtemplate->param( HISTORY => gettext("History"));
- $subtemplate->param( OID => $db->get_oid );
- $output .= $subtemplate->output;
- }
- }
- $template->param( SUB_PGSQL => $output );
-
- return $template->output;
-}
-
-
sub create_pgsql
{
my( $main , $dbname , $user , $group , $dbuser , $dbpass, $description ) = @_;
Modified: trunk/vhffs-api/src/Vhffs/Panel/Repository.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Repository.pm 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-api/src/Vhffs/Panel/Repository.pm 2007-05-25 15:16:41 UTC (rev 629)
@@ -131,51 +131,4 @@
return $repo;
}
-sub menu
-{
- my ( $class , $data ) = @_;
-
- my $vhffs = $data->{'vhffs'};
- my $session = $data->{'session'};
- my $user = $data->{'user'};
- my $group = $data->{'group'};
- my $cgi = $data->{'cgi'};
- my $templatesdir = $vhffs->get_config->get_templatedir;
- my $repo;
- my $template = new HTML::Template( filename => "$templatesdir/repository/menu.tmpl" );
- $template->param( TEXT_CREATE => gettext("Create") );
- $template->param( TEXT_REPOSITORY => gettext("Download repository") );
-
- my $repos = Vhffs::Services::Repository::getall_per_group( $vhffs , $group );
- my $output = "";
- my $subtemplate;
-
-
- foreach $repo ( @{$repos} )
- {
- if( $repo->get_status == Vhffs::Constants::ACTIVATED )
- {
- $subtemplate = new HTML::Template( filename => "$templatesdir/repository/menu_sub.tmpl" );
- $subtemplate->param( NAME => $repo->get_name );
- $subtemplate->param( HISTORY => gettext("History"));
- $subtemplate->param( OID => $repo->get_oid );
- $subtemplate->param( URL_NAME => gettext("URL") );
- $subtemplate->param( URL_VALUE => $vhffs->get_config->get_repositoryurl . "/" . $repo->get_name );
- $output .= $subtemplate->output;
- }
- else
- {
- $subtemplate = new HTML::Template( filename => "$templatesdir/repository/menu_sub_wait.tmpl" );
- $subtemplate->param( NAME => $repo->get_name );
- $subtemplate->param( REASON => gettext( Vhffs::Functions::status_string_from_status_id( $repo->get_status ) ) );
- $subtemplate->param( HISTORY => gettext("History"));
- $subtemplate->param( OID => $repo->get_oid );
- $output .= $subtemplate->output;
- }
- }
-
- $template->param( SUB_REPOSITORY => $output );
- return $template->output;
-}
-
1;
Modified: trunk/vhffs-api/src/Vhffs/Panel/Svn.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Svn.pm 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-api/src/Vhffs/Panel/Svn.pm 2007-05-25 15:16:41 UTC (rev 629)
@@ -136,58 +136,4 @@
return $svn;
}
-sub menu
-{
- my ( $class , $data ) = @_;
-
- my $vhffs = $data->{'vhffs'};
- my $session = $data->{'session'};
- my $user = $data->{'user'};
- my $group = $data->{'group'};
- my $cgi = $data->{'cgi'};
-
- my $templatesdir = $vhffs->get_config->get_templatedir;
-
- my $template = new HTML::Template( filename => "$templatesdir/svn/menu.tmpl" );
- $template->param( TEXT_CREATE => gettext("Create") );
- $template->param( TEXT_SVN => gettext("Subversion repository") );
- $template->param( TEXT_SVNDOC => gettext("Documentation") );
- $template->param( HELP_URL => $vhffs->get_config->get_svn_helpurl( ) );
-
- my $repos = Vhffs::Services::Svn::getall( $vhffs , undef , undef , $group );
- my $repo;
- my $output = "";
- my $subtemplate;
-
-
- foreach $repo ( @{$repos} )
- {
- if( $repo->get_status == Vhffs::Constants::ACTIVATED )
- {
- $subtemplate = new HTML::Template( filename => "$templatesdir/svn/menu_sub.tmpl" );
- $subtemplate->param( NAME => $repo->get_reponame );
- $subtemplate->param( HISTORY => gettext("History"));
- $subtemplate->param( GROUPNAME => $repo->get_group->get_groupname );
- $subtemplate->param( SVNWEB_TEXT => gettext( "SVNweb") );
- $subtemplate->param( SVNWEBURL => $vhffs->get_config->get_svnweburl );
- $subtemplate->param( OID => $repo->get_oid );
- $output .= $subtemplate->output;
- }
- else
- {
- $subtemplate = new HTML::Template( filename => "$templatesdir/svn/menu_sub_wait.tmpl" );
- $subtemplate->param( NAME => $repo->get_reponame );
- $subtemplate->param( REASON => Vhffs::Functions::status_string_from_status_id( $repo->get_status ) );
- $subtemplate->param( HISTORY => gettext("History"));
- $subtemplate->param( OID => $repo->get_oid );
- $output .= $subtemplate->output;
- }
-
- }
-
- $template->param( SUB_SVN => $output );
- return $template->output;
-}
-
-
1;
Modified: trunk/vhffs-api/src/Vhffs/Panel/Web.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Web.pm 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-api/src/Vhffs/Panel/Web.pm 2007-05-25 15:16:41 UTC (rev 629)
@@ -140,55 +140,4 @@
return $web;
}
-
-
-sub menu
-{
- my ( $class , $data ) = @_;
-
- my $vhffs = $data->{'vhffs'};
- my $session = $data->{'session'};
- my $user = $data->{'user'};
- my $group = $data->{'group'};
- my $cgi = $data->{'cgi'};
- my $templatesdir = $vhffs->get_config->get_templatedir;
-
-
- my $template = new HTML::Template( filename => $templatesdir."/web/menu.tmpl" );
- $template->param( TEXT_CREATE => gettext("Create") );
- $template->param( TEXT_WEB => gettext("Web Areas") );
-
- my $sites = Vhffs::Services::Httpd::getall( $vhffs , undef , undef , $group );
- my $site;
- my $output = "";
- my $subtemplate;
- my $statsurl;
-
- foreach $site ( @{$sites} )
- {
- if( $site->get_status == Vhffs::Constants::ACTIVATED )
- {
- $subtemplate = new HTML::Template( filename => "$templatesdir/web/menu_sub.tmpl" );
- $subtemplate->param( NAME => $site->get_servername);
- $subtemplate->param( STATSURL => $vhffs->get_config->get_panel_statsurl) if( defined $vhffs->get_config->get_panel_statsurl );
- $subtemplate->param( HISTORY => gettext("History"));
- $subtemplate->param( OID => $site->get_oid );
- $output .= $subtemplate->output;
- }
- else
- {
- $subtemplate = new HTML::Template( filename => "$templatesdir/web/menu_sub_wait.tmpl" );
- $subtemplate->param( NAME => $site->get_servername );
- $subtemplate->param( REASON => Vhffs::Functions::status_string_from_status_id( $site->get_status) );
- $subtemplate->param( HISTORY => gettext("History"));
- $subtemplate->param( OID => $site->get_oid );
- $output .= $subtemplate->output;
- }
- }
-
- $template->param( SUB_WEB => $output );
-
- return $template->output;
-}
-
1;
Modified: trunk/vhffs-panel/Makefile.am
===================================================================
--- trunk/vhffs-panel/Makefile.am 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/Makefile.am 2007-05-25 15:16:41 UTC (rev 629)
@@ -306,8 +306,6 @@
themes/vhffs-ng/images/webcreate.png \
themes/vhffs-ng/images/webentry.png \
themes/vhffs-ng/images/web.png \
- themes/vhffs-ng/js/browserdetect.js \
- themes/vhffs-ng/js/menu.js \
themes/vhffs-ng/main.css
# Define the substitution we need to point perl script at correct location
Modified: trunk/vhffs-panel/templates/Makefile.am
===================================================================
--- trunk/vhffs-panel/templates/Makefile.am 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/Makefile.am 2007-05-25 15:16:41 UTC (rev 629)
@@ -4,17 +4,14 @@
acl/view.tmpl \
admin/index.tmpl \
admin/cvs/edit.tmpl \
- admin/cvs/menu.tmpl \
admin/cvs/part-modo.tmpl \
admin/cvs/part.tmpl \
admin/cvs/search.tmpl \
admin/cvs/show.tmpl \
- admin/dns/menu.tmpl \
admin/dns/part-modo.tmpl \
admin/dns/part.tmpl \
admin/dns/search.tmpl \
admin/group/edit.tmpl \
- admin/group/menu.tmpl \
admin/group/part-modo.tmpl \
admin/group/part.tmpl \
admin/group/search.tmpl \
@@ -24,10 +21,8 @@
admin/mail/admin_forward-modo.tmpl \
admin/mail/admin_forward.tmpl \
admin/mail/edit.tmpl \
- admin/mailing/menu.tmpl \
admin/mailing/part.tmpl \
admin/mailing/search.tmpl \
- admin/mail/menu.tmpl \
admin/mail/part-modo.tmpl \
admin/mail/part.tmpl \
admin/mail/search.tmpl \
@@ -48,7 +43,6 @@
admin/misc/stats.tmpl \
admin/misc/su.tmpl \
admin/mysql/edit.tmpl \
- admin/mysql/menu.tmpl \
admin/mysql/part-modo.tmpl \
admin/mysql/part.tmpl \
admin/mysql/search.tmpl \
@@ -57,39 +51,31 @@
admin/object/part.tmpl \
admin/object/search.tmpl \
admin/pgsql/edit.tmpl \
- admin/pgsql/menu.tmpl \
admin/pgsql/part-modo.tmpl \
admin/pgsql/part.tmpl \
admin/pgsql/search.tmpl \
admin/pgsql/show.tmpl \
admin/repository/edit.tmpl \
- admin/repository/menu.tmpl \
admin/repository/part-modo.tmpl \
admin/repository/part.tmpl \
admin/repository/search.tmpl \
admin/repository/show.tmpl \
- admin/svn/menu.tmpl \
admin/svn/part-modo.tmpl \
admin/svn/part.tmpl \
admin/svn/search.tmpl \
admin/user/edit-note.tmpl \
admin/user/edit.tmpl \
admin/user/group-part.tmpl \
- admin/user/menu.tmpl \
admin/user/part-modo.tmpl \
admin/user/part.tmpl \
admin/user/search.tmpl \
admin/user/show.tmpl \
admin/web/edit.tmpl \
- admin/web/menu.tmpl \
admin/web/part-modo.tmpl \
admin/web/part.tmpl \
admin/web/search.tmpl \
admin/web/show.tmpl \
cvs/create.tmpl \
- cvs/menu_sub.tmpl \
- cvs/menu_sub_wait.tmpl \
- cvs/menu.tmpl \
cvs/prefs.tmpl \
dns/create.tmpl \
dns/list_a_sub.tmpl \
@@ -99,35 +85,22 @@
dns/list_ns_sub.tmpl \
dns/list_srv_sub.tmpl \
dns/list_txt_sub.tmpl \
- dns/menu_sub.tmpl \
- dns/menu_sub_wait.tmpl \
- dns/menu.tmpl \
dns/prefs.tmpl \
group/add_user.tmpl \
group/create.tmpl \
group/each_user.tmpl \
group/info.tmpl \
group/list_user.tmpl \
- group/menu_sub.tmpl \
- group/menu_sub_wait.tmpl \
- group/menu.tmpl \
group/prefs.tmpl \
mail/create.tmpl \
mailinglist/create.tmpl \
mailinglist/list_part.tmpl \
- mailinglist/menu_sub.tmpl \
- mailinglist/menu_sub_wait.tmpl \
- mailinglist/menu.tmpl \
mailinglist/prefs.tmpl \
- mail/menu_sub.tmpl \
- mail/menu_sub_wait.tmpl \
- mail/menu.tmpl \
mail/prefs_box.tmpl \
mail/prefs_forward.tmpl \
mail/prefs_spam.tmpl \
mail/prefs.tmpl \
mail/prefs_virus.tmpl \
- main/auth.html \
main/auth.tmpl \
main/close.tmpl \
menu/context.tmpl \
@@ -151,14 +124,8 @@
misc/simplemsg.tmpl \
misc/welcome.tmpl \
mysql/create.tmpl \
- mysql/menu_sub.tmpl \
- mysql/menu_sub_wait.tmpl \
- mysql/menu.tmpl \
mysql/prefs.tmpl \
pgsql/create.tmpl \
- pgsql/menu_sub.tmpl \
- pgsql/menu_sub_wait.tmpl \
- pgsql/menu.tmpl \
pgsql/prefs.tmpl \
public/allwebsites.tmpl \
public/banner.tmpl \
@@ -179,14 +146,8 @@
public/user_part.tmpl \
public/user.tmpl \
repository/create.tmpl \
- repository/menu_sub.tmpl \
- repository/menu_sub_wait.tmpl \
- repository/menu.tmpl \
repository/prefs.tmpl \
svn/create.tmpl \
- svn/menu_sub.tmpl \
- svn/menu_sub_wait.tmpl \
- svn/menu.tmpl \
svn/prefs.tmpl \
svn/user_part.tmpl \
user/create_complete.tmpl \
@@ -199,7 +160,4 @@
user/projects.tmpl \
web/create.tmpl \
web/mailuser.tmpl \
- web/menu_sub.tmpl \
- web/menu_sub_wait.tmpl \
- web/menu.tmpl \
web/prefs.tmpl
Deleted: trunk/vhffs-panel/templates/admin/cvs/menu.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/cvs/menu.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/admin/cvs/menu.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,18 +0,0 @@
-
-
- <li id="adminCVS">
- <a href="#"><tmpl_var name="TEXT_ADMIN_CVS"></a>
- <ul id="adminCVSMenu">
- <li id="adminCVSList">
- <a href="/admin/cvs/list.pl">
- <tmpl_var name="TEXT_LIST_CVS">
- </a>
- </li>
- <li id="adminCVSSearch">
- <a href="/admin/cvs/search.pl">
- <tmpl_var name="TEXT_SEARCH_CVS">
- </a>
- </li>
- </ul>
- </li>
-
Deleted: trunk/vhffs-panel/templates/admin/dns/menu.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/dns/menu.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/admin/dns/menu.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,16 +0,0 @@
- <li id="adminDNS">
- <a href="#"><tmpl_var name="TEXT_ADMIN_DNS"></a>
- <ul id="adminDNSMenu">
- <li id="adminDNSList">
- <a href="/admin/dns/list.pl">
- <tmpl_var name="TEXT_LIST_DNS">
- </a>
- </li>
- <li id="adminDNSSearch">
- <a href="/admin/dns/search.pl">
- <tmpl_var name="TEXT_SEARCH_DNS">
- </a>
- </li>
- </ul>
- </li>
-
Deleted: trunk/vhffs-panel/templates/admin/group/menu.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/group/menu.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/admin/group/menu.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,17 +0,0 @@
-
- <li id="adminGroup">
- <a href="#"><tmpl_var name="TEXT_ADMIN_GROUP"></a>
- <ul id="adminGroupMenu">
- <li id="adminGroupList">
- <a href="/admin/group/list.pl">
- <tmpl_var name="TEXT_LIST_GROUP">
- </a>
- </li>
- <li id="adminGroupSearch">
- <a href="/admin/group/search.pl">
- <tmpl_var name="TEXT_SEARCH_GROUP">
- </a>
- </li>
- </ul>
- </li>
-
Deleted: trunk/vhffs-panel/templates/admin/mail/menu.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/mail/menu.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/admin/mail/menu.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,18 +0,0 @@
-
-
- <li id="adminMail">
- <a href="#"><tmpl_var name="TEXT_ADMIN_MAIL"></a>
- <ul id="adminMailMenu">
- <li id="adminMailList">
- <a href="/admin/mail/list.pl">
- <tmpl_var name="TEXT_LIST_MAIL">
- </a>
- </li>
- <li id="adminMailSearch">
- <a href="/admin/mail/search.pl">
- <tmpl_var name="TEXT_SEARCH_MAIL">
- </a>
- </li>
- </ul>
- </li>
-
Deleted: trunk/vhffs-panel/templates/admin/mailing/menu.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/mailing/menu.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/admin/mailing/menu.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,18 +0,0 @@
-
-
- <li id="adminMailing">
- <a href="#"><tmpl_var name="TEXT_ADMIN_MAILLING"></a>
- <ul id="adminMailingMenu">
- <li id="adminMailingList">
- <a href="/admin/mailing/list.pl">
- <tmpl_var name="TEXT_LIST_MAILLING">
- </a>
- </li>
- <li id="adminMailingSearch">
- <a href="/admin/mailing/search.pl">
- <tmpl_var name="TEXT_SEARCH_MAILLING">
- </a>
- </li>
- </ul>
- </li>
-
Deleted: trunk/vhffs-panel/templates/admin/mysql/menu.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/mysql/menu.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/admin/mysql/menu.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,20 +0,0 @@
-
-
-
-
- <li id="adminMySQL">
- <a href="#"><tmpl_var name="TEXT_ADMIN_MYSQL"></a>
- <ul id="adminMySQLMenu">
- <li id="adminMySQLList">
- <a href="/admin/mysql/list.pl">
- <tmpl_var name="TEXT_LIST_MYSQL">
- </a>
- </li>
- <li id="adminMySQLSearch">
- <a href="/admin/mysql/search.pl">
- <tmpl_var name="TEXT_SEARCH_MYSQL">
- </a>
- </li>
- </ul>
- </li>
-
Deleted: trunk/vhffs-panel/templates/admin/pgsql/menu.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/pgsql/menu.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/admin/pgsql/menu.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,20 +0,0 @@
-
-
-
- <li id="adminPostGres">
-
- <a href="#"><tmpl_var name="TEXT_ADMIN_POSTGRES"></a>
- <ul id="adminPostGresMenu">
- <li id="adminPostGresList">
- <a href="/admin/pgsql/list.pl">
- <tmpl_var name="TEXT_LIST_POSTGRES">
- </a>
- </li>
- <li id="adminPostGresSearch">
- <a href="/admin/pgsql/search.pl">
- <tmpl_var name="TEXT_SEARCH_POSTGRES">
- </a>
- </li>
- </ul>
- </li>
-
Deleted: trunk/vhffs-panel/templates/admin/repository/menu.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/repository/menu.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/admin/repository/menu.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,18 +0,0 @@
-
-
- <li id="adminRepositoryDownload">
- <a href="#"><tmpl_var name="TEXT_ADMIN_REPOSITORY"></a>
- <ul id="adminRepositoryDownloadMenu">
- <li id="adminRepositoryDownloadList">
- <a href="/admin/repository/list.pl">
- <tmpl_var name="TEXT_LIST_REPOSITORY">
- </a>
- </li>
- <li id="adminRepositoryDownloadSearch">
- <a href="/admin/repository/search.pl">
- <tmpl_var name="TEXT_SEARCH_REPOSITORY">
- </a>
- </li>
- </ul>
- </li>
-
Deleted: trunk/vhffs-panel/templates/admin/svn/menu.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/svn/menu.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/admin/svn/menu.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,16 +0,0 @@
- <li id="adminSVN">
- <a href="#"><tmpl_var name="TEXT_ADMIN_SVN"></a>
- <ul id="adminSVNMenu">
- <li id="adminSVNList">
- <a href="/admin/svn/list.pl">
- <tmpl_var name="TEXT_LIST_SVN">
- </a>
- </li>
- <li id="adminSVNSearch">
- <a href="/admin/svn/search.pl">
- <tmpl_var name="TEXT_SEARCH_SVN">
- </a>
- </li>
- </ul>
- </li>
-
Deleted: trunk/vhffs-panel/templates/admin/user/menu.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/user/menu.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/admin/user/menu.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,17 +0,0 @@
-
- <li id="adminUser">
- <a href="#"><tmpl_var name="TEXT_ADMIN_USER"></a>
- <ul id="adminUserMenu">
- <li id="adminUserList">
- <a href="/admin/user/list.pl">
- <tmpl_var name="TEXT_LIST_USER">
- </a>
- </li>
- <li id="adminUserSearch">
- <a href="/admin/user/search.pl">
- <tmpl_var name="TEXT_SEARCH_USER">
- </a>
- </li>
- </ul>
- </li>
-
Deleted: trunk/vhffs-panel/templates/admin/web/menu.tmpl
===================================================================
--- trunk/vhffs-panel/templates/admin/web/menu.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/admin/web/menu.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,17 +0,0 @@
-
- <li id="adminWeb">
- <a href="#"><tmpl_var name="TEXT_ADMIN_WEB"></a>
- <ul id="adminWebMenu">
- <li id="adminWebList">
- <a href="/admin/web/list.pl">
- <tmpl_var name="TEXT_LIST_WEB">
- </a>
- </li>
- <li id="adminWebSearch">
- <a href="/admin/web/search.pl">
- <tmpl_var name="TEXT_SEARCH_WEB">
- </a>
- </li>
- </ul>
- </li>
-
Deleted: trunk/vhffs-panel/templates/cvs/menu.tmpl
===================================================================
--- trunk/vhffs-panel/templates/cvs/menu.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/cvs/menu.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,18 +0,0 @@
- <li id="repositoryCVS">
- <a href="#"><tmpl_var name="TEXT_CVS"></a>
- <ul id="repositoryCVSMenu">
- <li id="repositoryCVSDocumentation">
- <a href="<tmpl_var name="URL_CVSDOC">" title="<tmpl_var name="TEXT_CVSDOC">">
- <tmpl_var name="TEXT_CVSDOC">
- </a>
- </li>
-
- <tmpl_var name="SUB_CVS">
-
- <li id="repositoryCVSCreate">
- <a href="/cvs/create.pl" title="<tmpl_var name="TEXT_CREATE">">
- <tmpl_var name="TEXT_CREATE">
- </a>
- </li>
- </ul>
- </li>
Deleted: trunk/vhffs-panel/templates/cvs/menu_sub.tmpl
===================================================================
--- trunk/vhffs-panel/templates/cvs/menu_sub.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/cvs/menu_sub.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,9 +0,0 @@
-<li class="repositoryCVSEntry">
- <a href="/cvs/prefs.pl?name=<tmpl_var name="NAME">" title="<tmpl_var name="NAME">">
- <tmpl_var name="NAME"></a>
- <ul>
- <li><a href="/history.pl?OID=<tmpl_var name="OID">"><tmpl_var name="HISTORY"></a></li>
- <li><a href="<tmpl_var name="CVSWEBURL">/cvs_<tmpl_var name="GROUPNAME">_<tmpl_var name="NAME">/"><tmpl_var name="CVSWEB"></a></li>
- </ul>
-</li>
-
Deleted: trunk/vhffs-panel/templates/cvs/menu_sub_wait.tmpl
===================================================================
--- trunk/vhffs-panel/templates/cvs/menu_sub_wait.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/cvs/menu_sub_wait.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,11 +0,0 @@
- <li class="repositoryCVSEntryWait">
- <a href="#"><tmpl_var name="NAME"> <tmpl_var name="REASON"></a>
- <ul>
- <li>
- <a href="/history.pl?OID=<tmpl_var name="OID">"><tmpl_var name="HISTORY"></a>
- </li>
- </ul>
- </li>
-
-
-
Deleted: trunk/vhffs-panel/templates/dns/menu.tmpl
===================================================================
--- trunk/vhffs-panel/templates/dns/menu.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/dns/menu.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,13 +0,0 @@
- <li id="DNS">
- <a href="#"><tmpl_var name="TEXT_DNS"></a>
- <ul id="DNSMenu">
-
- <tmpl_var name="SUB_DNS">
-
- <li id="DNSCreate">
- <a href="/dns/create.pl" title="<tmpl_var name="TEXT_CREATE">">
- <tmpl_var name="TEXT_CREATE">
- </a>
- </li>
- </ul>
- </li>
Deleted: trunk/vhffs-panel/templates/dns/menu_sub.tmpl
===================================================================
--- trunk/vhffs-panel/templates/dns/menu_sub.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/dns/menu_sub.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,8 +0,0 @@
- <li class="DNSEntry">
- <a href="/dns/prefs.pl?domain=<tmpl_var name="DOMAIN">" title="<tmpl_var name="DOMAIN">">
- <tmpl_var name="DOMAIN">
- </a>
- <ul>
- <li><a href="/history.pl?OID=<tmpl_var name="OID">"><tmpl_var name="HISTORY"></a></li>
- </ul>
- </li>
Deleted: trunk/vhffs-panel/templates/dns/menu_sub_wait.tmpl
===================================================================
--- trunk/vhffs-panel/templates/dns/menu_sub_wait.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/dns/menu_sub_wait.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,9 +0,0 @@
- <li class="DNSEntryWait">
- <a href="#"><tmpl_var name="DOMAIN"> <tmpl_var name="REASON"></a>
- <ul>
- <li>
- <a href="/history.pl?OID=<tmpl_var name="OID">"><tmpl_var name="HISTORY"></a>
- </li>
- </ul>
- </li>
-
Deleted: trunk/vhffs-panel/templates/group/menu.tmpl
===================================================================
--- trunk/vhffs-panel/templates/group/menu.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/group/menu.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,11 +0,0 @@
- <li id="project">
- <a href="#" id="projectMenuTitle"><tmpl_var name="TEXT_MYPROJECTS"></a>
- <ul id="projectMenu">
- <tmpl_var name="SUB_GROUP">
- <li id="projectCreate">
- <a href="/group/create.pl" title="<tmpl_var name="TEXT_CREATE">">
- <tmpl_var name="TEXT_CREATE">
- </a>
- </li>
- </ul>
- </li>
Deleted: trunk/vhffs-panel/templates/group/menu_sub.tmpl
===================================================================
--- trunk/vhffs-panel/templates/group/menu_sub.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/group/menu_sub.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,10 +0,0 @@
- <li class="projectEntry">
- <a href="/panel.pl?project=<tmpl_var name="PROJECTNAME">" title="<tmpl_var name="PROJECTNAME">">
- <tmpl_var name="PROJECTNAME">
- </a>
- <ul>
- <li><a href="/history.pl?OID=<tmpl_var name="OID">" title="<tmpl_var name="HISTORY_TEXT">">
- <tmpl_var name="HISTORY_TEXT">
- </a></li>
- </ul>
- </li>
Deleted: trunk/vhffs-panel/templates/group/menu_sub_wait.tmpl
===================================================================
--- trunk/vhffs-panel/templates/group/menu_sub_wait.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/group/menu_sub_wait.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,6 +0,0 @@
- <li class="projectEntryWait">
- <a href="#"><tmpl_var name="PROJECTNAME"> <tmpl_var name="REASON"></a>
- </li>
-
-
-
Deleted: trunk/vhffs-panel/templates/mail/menu.tmpl
===================================================================
--- trunk/vhffs-panel/templates/mail/menu.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/mail/menu.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,14 +0,0 @@
-
- <li id="mail">
- <a href="#"><tmpl_var name="TEXT_MAIL"></a>
- <ul id="mailMenu">
-
- <tmpl_var name="SUB_MAIL">
-
- <li id="mailCreate">
- <a href="/mail/create.pl" title="<tmpl_var name="TEXT_CREATE">">
- <tmpl_var name="TEXT_CREATE">
- </a>
- </li>
- </ul>
- </li>
Deleted: trunk/vhffs-panel/templates/mail/menu_sub.tmpl
===================================================================
--- trunk/vhffs-panel/templates/mail/menu_sub.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/mail/menu_sub.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,8 +0,0 @@
- <li class="mailEntry">
- <a href="/mail/prefs.pl?name=<tmpl_var name="DOMAIN">" title="<tmpl_var name="DOMAIN">">
- <tmpl_var name="DOMAIN">
- </a>
- <ul>
- <li><a href="/history.pl?OID=<tmpl_var name="OID">"><tmpl_var name="HISTORY"></a></li>
- </ul>
- </li>
Deleted: trunk/vhffs-panel/templates/mail/menu_sub_wait.tmpl
===================================================================
--- trunk/vhffs-panel/templates/mail/menu_sub_wait.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/mail/menu_sub_wait.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,10 +0,0 @@
-
- <li class="mailEntryWait">
- <a href="#"><tmpl_var name="DOMAIN"> <tmpl_var name="REASON"></a>
- <ul>
- <li><a href="/history.pl?OID=<tmpl_var name="OID">"><tmpl_var name="HISTORY"></a></li>
- </ul>
- </li>
-
-
-
Deleted: trunk/vhffs-panel/templates/mailinglist/menu.tmpl
===================================================================
--- trunk/vhffs-panel/templates/mailinglist/menu.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/mailinglist/menu.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,14 +0,0 @@
-
- <li id="mailingList">
- <a href="#"><tmpl_var name="TEXT_MAILINGLIST"></a>
- <ul id="mailingListMenu">
-
- <tmpl_var name="SUB_MAILINGLIST">
-
- <li id="mailingListCreate">
- <a href="/mailinglist/create.pl" title="<tmpl_var name="TEXT_CREATE">">
- <tmpl_var name="TEXT_CREATE">
- </a>
- </li>
- </ul>
- </li>
Deleted: trunk/vhffs-panel/templates/mailinglist/menu_sub.tmpl
===================================================================
--- trunk/vhffs-panel/templates/mailinglist/menu_sub.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/mailinglist/menu_sub.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,8 +0,0 @@
- <li class="mailingListEntry">
- <a href="/mailinglist/prefs.pl?local=<tmpl_var name="LOCAL">&domain=<tmpl_var name="DOMAIN">" title="<tmpl_var name="NAME">">
- <tmpl_var name="NAME">
- </a>
- <ul>
- <li><a href="/history.pl?OID=<tmpl_var name="OID">"><tmpl_var name="HISTORY"></a></li>
- </ul>
- </li>
Deleted: trunk/vhffs-panel/templates/mailinglist/menu_sub_wait.tmpl
===================================================================
--- trunk/vhffs-panel/templates/mailinglist/menu_sub_wait.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/mailinglist/menu_sub_wait.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,8 +0,0 @@
- <li class="mailingListEntryWait">
- <a href="#"><tmpl_var name="NAME"> <tmpl_var name="REASON"></a>
- <ul>
- <li><a href="/history.pl?OID=<tmpl_var name="OID">"><tmpl_var name="HISTORY"></a></li>
- </ul>
- </li>
-
-
Deleted: trunk/vhffs-panel/templates/main/auth.html
===================================================================
--- trunk/vhffs-panel/templates/main/auth.html 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/main/auth.html 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,51 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd";>
-<html xmlns="http://www.w3.org/1999/xhtml";>
- <head>
-
- <title><tmpl_var name="TITLE"></title>
-
- <link rel="stylesheet" type="text/css" href="main.css" />
- <meta http-equiv="Pragma" content="no-cache" />
- <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
-
- </head>
- <body>
-
- <div class="logo">
- </div>
-
- <div class="misc">
-
- <h1><tmpl_var name="TEXT_WELCOME"></h1>
-
- <h2><tmpl_var name="TEXT_PLEASEIDENTIFY"></h2>
-
- <form action="/login.pl" method="post">
- <p>
- <label for="username">
- User name :
- </label>
- <input type="text" name="username" id="username" maxlength="32" />
- </p>
- <p>
- <label for="password">
- Password :
- </label>
- <input type="password" name="password" id="password" maxlength="32" />
- </p>
- <p class="button">
- <input type="submit" value="Login">
- </p>
- </form>
- <p>
- <a class="loginLinks" href="/subscribe.pl">
- Text suscribe
- </a>
- <a class="loginLinks" href="/lost.pl">
- I lost my password
- </a>
- </p>
- </div>
-
- </body>
-</html>
Modified: trunk/vhffs-panel/templates/main/panel.tmpl
===================================================================
--- trunk/vhffs-panel/templates/main/panel.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/main/panel.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -28,6 +28,7 @@
<div id="help">
<h1><img src="/themes/<tmpl_var name="THEME">/images/help.png" alt="aide"/><tmpl_var name="TEXT_HELP"></h1>
<div id="help_content">
+ <p><tmpl_var name="TEXT_HELP_CONTENT"></p>
</div>
</div>
</body>
Modified: trunk/vhffs-panel/templates/misc/service_index.tmpl
===================================================================
--- trunk/vhffs-panel/templates/misc/service_index.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/misc/service_index.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -5,10 +5,11 @@
<tmpl_loop name="SERVICES">
<li><tmpl_var name="DISPLAYNAME">
<tmpl_if name="active">
- — <a href="/<tmpl_var name="SERVICE">/prefs.pl?name=<tmpl_var name="DISPLAYNAME">"><tmpl_var name="ADMIN_TEXT"></a> - <a href="/history.pl?OID=<tmpl_var name="OID">"><tmpl_var name="HISTORY_TEXT"></a>
+ — <a href="/<tmpl_var name="SERVICE">/prefs.pl?name=<tmpl_var name="DISPLAYNAME">"><tmpl_var name="ADMIN_TEXT"></a> -
<tmpl_else>
- (<tmpl_var name="state">)
+ (<tmpl_var name="state">) —
</tmpl_if>
+<a href="/history.pl?OID=<tmpl_var name="OID">"><tmpl_var name="HISTORY_TEXT"></a>
</li>
</tmpl_loop>
<tmpl_else>
Deleted: trunk/vhffs-panel/templates/mysql/menu.tmpl
===================================================================
--- trunk/vhffs-panel/templates/mysql/menu.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/mysql/menu.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,18 +0,0 @@
- <li id="mySqlDatabase">
- <a href="#"><tmpl_var name="TEXT_MYSQL"></a>
- <ul id="mySqlDatabaseMenu">
- <li id="mySqlDatabaseAccess">
- <a href="<tmpl_var name="PHPMYADMIN_URL">" target="_blank" title="<tmpl_var name="TEXT_DBACCESS">">
- <tmpl_var name="TEXT_DBACCESS">
- </a>
- </li>
-
- <tmpl_var name="SUB_MYSQL">
-
- <li id="mySqlDatabaseCreate">
- <a href="/mysql/create.pl" title="<tmpl_var name="TEXT_CREATE">">
- <tmpl_var name="TEXT_CREATE">
- </a>
- </li>
- </ul>
- </li>
Deleted: trunk/vhffs-panel/templates/mysql/menu_sub.tmpl
===================================================================
--- trunk/vhffs-panel/templates/mysql/menu_sub.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/mysql/menu_sub.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,8 +0,0 @@
- <li class="mySqlDatabaseEntry">
- <a href="/mysql/prefs.pl?name=<tmpl_var name="NAME">" title="<tmpl_var name="NAME">">
- <tmpl_var name="NAME">
- </a>
- <ul>
- <li><a href="/history.pl?OID=<tmpl_var name="OID">"><tmpl_var name="HISTORY"></a></li>
- </ul>
- </li>
Deleted: trunk/vhffs-panel/templates/mysql/menu_sub_wait.tmpl
===================================================================
--- trunk/vhffs-panel/templates/mysql/menu_sub_wait.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/mysql/menu_sub_wait.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,11 +0,0 @@
- <li class="mySqlDatabaseEntryWait">
- <a href="#"><tmpl_var name="NAME"> <tmpl_var name="REASON"></a>
- <ul>
- <li><a href="/history.pl?OID=<tmpl_var name="OID">"><tmpl_var name="HISTORY"></a></li>
- </ul>
- </li>
-
-
-
-
-
Deleted: trunk/vhffs-panel/templates/pgsql/menu.tmpl
===================================================================
--- trunk/vhffs-panel/templates/pgsql/menu.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/pgsql/menu.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,18 +0,0 @@
- <li id="posgrSqlDatabase">
- <a href="#"><tmpl_var name="TEXT_PGSQL"></a>
- <ul id="posgrSqlDatabaseMenu">
- <li id="posgrSqlDatabaseAccess">
- <a href="<tmpl_var name="PHPPGADMIN_URL">" title="<tmpl_var name="TEXT_DBACCESS">">
- <tmpl_var name="TEXT_DBACCESS">
- </a>
- </li>
-
- <tmpl_var name="SUB_PGSQL">
-
- <li id="posgrSqlDatabaseCreate">
- <a href="/pgsql/create.pl" title="<tmpl_var name="TEXT_CREATE">">
- <tmpl_var name="TEXT_CREATE">
- </a>
- </li>
- </ul>
- </li>
Deleted: trunk/vhffs-panel/templates/pgsql/menu_sub.tmpl
===================================================================
--- trunk/vhffs-panel/templates/pgsql/menu_sub.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/pgsql/menu_sub.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,8 +0,0 @@
- <li class="posgrSqlDatabaseEntry">
- <a href="/pgsql/prefs.pl?name=<tmpl_var name="NAME">">
- <tmpl_var name="NAME">
- </a>
- <ul>
- <li><a href="/history.pl?OID=<tmpl_var name="OID">"><tmpl_var name="HISTORY"></a></li>
- </ul>
- </li>
Deleted: trunk/vhffs-panel/templates/pgsql/menu_sub_wait.tmpl
===================================================================
--- trunk/vhffs-panel/templates/pgsql/menu_sub_wait.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/pgsql/menu_sub_wait.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,10 +0,0 @@
- <li class="posgrSqlDatabaseEntryWait">
- <a href="#"><tmpl_var name="NAME"> <tmpl_var name="REASON"></a>
- <ul>
- <li><a href="/history.pl?OID=<tmpl_var name="OID">"><tmpl_var name="HISTORY"></a></li>
- </ul>
- </li>
-
-
-
-
Deleted: trunk/vhffs-panel/templates/repository/menu.tmpl
===================================================================
--- trunk/vhffs-panel/templates/repository/menu.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/repository/menu.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,13 +0,0 @@
- <li id="repositoryDownload">
- <a href="#"><tmpl_var name="TEXT_REPOSITORY"></a>
- <ul id="repositoryDownloadMenu">
-
- <tmpl_var name="SUB_REPOSITORY">
-
- <li id="repositoryDownloadCreate">
- <a href="/repository/create.pl" title="<tmpl_var name="TEXT_CREATE">">
- <tmpl_var name="TEXT_CREATE">
- </a>
- </li>
- </ul>
- </li>
Deleted: trunk/vhffs-panel/templates/repository/menu_sub.tmpl
===================================================================
--- trunk/vhffs-panel/templates/repository/menu_sub.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/repository/menu_sub.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,8 +0,0 @@
-<li class="repositoryDownloadEntry">
- <a href="/repository/prefs.pl?name=<tmpl_var name="NAME">" title="<tmpl_var name="NAME">">
- <tmpl_var name="NAME"></a>
- <ul>
- <li><a href="/history.pl?OID=<tmpl_var name="OID">"><tmpl_var name="HISTORY"></a></li>
- <li><a href="<tmpl_var name="URL_VALUE">"><tmpl_var name="URL_NAME"></a></li>
- </ul>
-</li>
Deleted: trunk/vhffs-panel/templates/repository/menu_sub_wait.tmpl
===================================================================
--- trunk/vhffs-panel/templates/repository/menu_sub_wait.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/repository/menu_sub_wait.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,6 +0,0 @@
- <li class="repositoryDownloadEntryWait">
- <a href="#"><tmpl_var name="NAME"> <tmpl_var name="REASON"></a>
- <ul>
- <li><a href="/history.pl?OID=<tmpl_var name="OID">"><tmpl_var name="HISTORY"></a></li>
- </ul>
- </li>
Deleted: trunk/vhffs-panel/templates/svn/menu.tmpl
===================================================================
--- trunk/vhffs-panel/templates/svn/menu.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/svn/menu.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,26 +0,0 @@
- <li id="repositorySVN">
- <a href="#"><tmpl_var name="TEXT_SVN"></a>
- <ul id="repositorySVNMenu">
- <li id="repositorySVNDocumentation">
- <a href="<tmpl_var name="HELP_URL">" title="<tmpl_var name="TEXT_SVNDOC">">
- <tmpl_var name="TEXT_SVNDOC">
- </a>
- </li>
-
- <tmpl_var name="SUB_SVN">
-
- <li id="repositorySVNCreate">
-
- <a href="/svn/create.pl" title="<tmpl_var name="TEXT_CREATE">">
- <tmpl_var name="TEXT_CREATE">
- </a>
- </li>
- </ul>
- </li>
-
-
-
-
-
-
-
Deleted: trunk/vhffs-panel/templates/svn/menu_sub.tmpl
===================================================================
--- trunk/vhffs-panel/templates/svn/menu_sub.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/svn/menu_sub.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,10 +0,0 @@
- <li class="repositorySVNEntry">
- <a href="/svn/prefs.pl?name=<tmpl_var name="NAME">" title="<tmpl_var name="NAME">">
- <tmpl_var name="NAME">
- </a>
- <ul>
- <li><a href="/history.pl?OID=<tmpl_var name="OID">"><tmpl_var name="HISTORY"></a></li>
- <li><a href="<tmpl_var name="SVNWEBURL">/svn_<tmpl_var name="GROUPNAME">_<tmpl_var name="NAME">/">
- <tmpl_var name="SVNWEB_TEXT"></a></li>
- </ul>
- </li>
Deleted: trunk/vhffs-panel/templates/svn/menu_sub_wait.tmpl
===================================================================
--- trunk/vhffs-panel/templates/svn/menu_sub_wait.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/svn/menu_sub_wait.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,6 +0,0 @@
- <li class="repositorySVNEntryWait">
- <a href="#"><tmpl_var name="NAME"> <tmpl_var name="REASON"></a>
- <ul>
- <li><a href="/history.pl?OID=<tmpl_var name="OID">"><tmpl_var name="HISTORY"></a></li>
- </ul>
- </li>
Deleted: trunk/vhffs-panel/templates/web/menu.tmpl
===================================================================
--- trunk/vhffs-panel/templates/web/menu.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/web/menu.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,13 +0,0 @@
- <li id="webAreas">
- <a href="#"><tmpl_var name="TEXT_WEB"></a>
- <ul id="webAreasMenu">
-
- <tmpl_var name="SUB_WEB">
-
- <li id="webAreasCreate">
- <a href="/web/create.pl" title="<tmpl_var name="TEXT_CREATE">">
- <tmpl_var name="TEXT_CREATE">
- </a>
- </li>
- </ul>
- </li>
Deleted: trunk/vhffs-panel/templates/web/menu_sub.tmpl
===================================================================
--- trunk/vhffs-panel/templates/web/menu_sub.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/web/menu_sub.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,8 +0,0 @@
- <li class="webAreasEntry">
- <a href="/web/prefs.pl?name=<tmpl_var name="NAME">" title="<tmpl_var name="NAME">">
- <tmpl_var name="NAME"></a>
- <ul>
- <li><a href="<tmpl_var name="STATSURL">/<tmpl_var name="NAME">/" title="Stats">Stats</a></li>
- <li><a href="/history.pl?OID=<tmpl_var name="OID">"><tmpl_var name="HISTORY"></a></li>
- </ul>
- </li>
Deleted: trunk/vhffs-panel/templates/web/menu_sub_wait.tmpl
===================================================================
--- trunk/vhffs-panel/templates/web/menu_sub_wait.tmpl 2007-05-24 07:11:06 UTC (rev 628)
+++ trunk/vhffs-panel/templates/web/menu_sub_wait.tmpl 2007-05-25 15:16:41 UTC (rev 629)
@@ -1,9 +0,0 @@
- <li class="webAreasEntryWait">
- <a href="#"><tmpl_var name="NAME"> <tmpl_var name="REASON"></a>
- <ul>
- <li><a href="/history.pl?OID=<tmpl_var name="OID">"><tmpl_var name="HISTORY"></a></li>
- </ul>
- </li>
-
-
-