| [vhffs-dev] [731] moved the public part of the panel in vhffs-public |
[ Thread Index |
Date Index
| More vhffs.org/vhffs-dev Archives
]
Revision: 731
Author: gradator
Date: 2007-07-17 14:39:47 +0000 (Tue, 17 Jul 2007)
Log Message:
-----------
moved the public part of the panel in vhffs-public
Modified Paths:
--------------
trunk/Makefile.am
trunk/configure.ac
trunk/vhffs-api/src/Vhffs/Conf.pm
trunk/vhffs-api/src/Vhffs/Panel/Commons.pm
trunk/vhffs-api/src/Vhffs/Panel/Main.pm
trunk/vhffs-api/src/Vhffs/Panel/Menu.pm
trunk/vhffs-backend/conf/vhffs.conf.dist.in
trunk/vhffs-panel/Makefile.am
trunk/vhffs-panel/acl/view.pl
trunk/vhffs-panel/admin/broadcast.pl
trunk/vhffs-panel/admin/broadcast_delete.pl
trunk/vhffs-panel/admin/broadcast_list.pl
trunk/vhffs-panel/admin/broadcast_submit.pl
trunk/vhffs-panel/admin/broadcast_view.pl
trunk/vhffs-panel/admin/cvs/edit.pl
trunk/vhffs-panel/admin/cvs/edit_submit.pl
trunk/vhffs-panel/admin/cvs/index.pl
trunk/vhffs-panel/admin/cvs/list.pl
trunk/vhffs-panel/admin/cvs/search.pl
trunk/vhffs-panel/admin/cvs/show.pl
trunk/vhffs-panel/admin/dns/index.pl
trunk/vhffs-panel/admin/dns/list.pl
trunk/vhffs-panel/admin/dns/search.pl
trunk/vhffs-panel/admin/group/edit.pl
trunk/vhffs-panel/admin/group/edit_submit.pl
trunk/vhffs-panel/admin/group/index.pl
trunk/vhffs-panel/admin/group/list.pl
trunk/vhffs-panel/admin/group/search.pl
trunk/vhffs-panel/admin/group/show.pl
trunk/vhffs-panel/admin/index.pl
trunk/vhffs-panel/admin/mail/change_forward.pl
trunk/vhffs-panel/admin/mail/delete_box.pl
trunk/vhffs-panel/admin/mail/delete_forward.pl
trunk/vhffs-panel/admin/mail/edit.pl
trunk/vhffs-panel/admin/mail/index.pl
trunk/vhffs-panel/admin/mail/list.pl
trunk/vhffs-panel/admin/mail/password_box.pl
trunk/vhffs-panel/admin/mail/search.pl
trunk/vhffs-panel/admin/mail/show.pl
trunk/vhffs-panel/admin/mailing/index.pl
trunk/vhffs-panel/admin/mailing/list.pl
trunk/vhffs-panel/admin/mailing/mailing_submit.pl
trunk/vhffs-panel/admin/mailing/search.pl
trunk/vhffs-panel/admin/moderation.pl
trunk/vhffs-panel/admin/moderation_submit.pl
trunk/vhffs-panel/admin/mysql/edit.pl
trunk/vhffs-panel/admin/mysql/edit_submit.pl
trunk/vhffs-panel/admin/mysql/index.pl
trunk/vhffs-panel/admin/mysql/list.pl
trunk/vhffs-panel/admin/mysql/search.pl
trunk/vhffs-panel/admin/mysql/show.pl
trunk/vhffs-panel/admin/object/delete_avatar.pl
trunk/vhffs-panel/admin/object/edit.pl
trunk/vhffs-panel/admin/object/edit_submit.pl
trunk/vhffs-panel/admin/object/list.pl
trunk/vhffs-panel/admin/object/search.pl
trunk/vhffs-panel/admin/pgsql/edit.pl
trunk/vhffs-panel/admin/pgsql/edit_submit.pl
trunk/vhffs-panel/admin/pgsql/index.pl
trunk/vhffs-panel/admin/pgsql/list.pl
trunk/vhffs-panel/admin/pgsql/search.pl
trunk/vhffs-panel/admin/pgsql/show.pl
trunk/vhffs-panel/admin/repository/edit.pl
trunk/vhffs-panel/admin/repository/edit_submit.pl
trunk/vhffs-panel/admin/repository/index.pl
trunk/vhffs-panel/admin/repository/list.pl
trunk/vhffs-panel/admin/repository/search.pl
trunk/vhffs-panel/admin/repository/show.pl
trunk/vhffs-panel/admin/stats.pl
trunk/vhffs-panel/admin/su.pl
trunk/vhffs-panel/admin/svn/index.pl
trunk/vhffs-panel/admin/svn/list.pl
trunk/vhffs-panel/admin/svn/search.pl
trunk/vhffs-panel/admin/user/edit.pl
trunk/vhffs-panel/admin/user/edit_note.pl
trunk/vhffs-panel/admin/user/edit_submit.pl
trunk/vhffs-panel/admin/user/index.pl
trunk/vhffs-panel/admin/user/list.pl
trunk/vhffs-panel/admin/user/search.pl
trunk/vhffs-panel/admin/user/show.pl
trunk/vhffs-panel/admin/web/edit.pl
trunk/vhffs-panel/admin/web/edit_submit.pl
trunk/vhffs-panel/admin/web/index.pl
trunk/vhffs-panel/admin/web/list.pl
trunk/vhffs-panel/admin/web/search.pl
trunk/vhffs-panel/admin/web/show.pl
trunk/vhffs-panel/alert.pl
trunk/vhffs-panel/alert_submit.pl
trunk/vhffs-panel/cvs/create.pl
trunk/vhffs-panel/cvs/delete.pl
trunk/vhffs-panel/cvs/prefs.pl
trunk/vhffs-panel/cvs/prefs_save.pl
trunk/vhffs-panel/dns/create.pl
trunk/vhffs-panel/dns/delete.pl
trunk/vhffs-panel/dns/prefs.pl
trunk/vhffs-panel/group/create.pl
trunk/vhffs-panel/group/delete.pl
trunk/vhffs-panel/group/prefs.pl
trunk/vhffs-panel/history.pl
trunk/vhffs-panel/logout.pl
trunk/vhffs-panel/lost.pl
trunk/vhffs-panel/lost_ack.pl
trunk/vhffs-panel/mail/add_account.pl
trunk/vhffs-panel/mail/add_forward.pl
trunk/vhffs-panel/mail/change_forward.pl
trunk/vhffs-panel/mail/create.pl
trunk/vhffs-panel/mail/delete.pl
trunk/vhffs-panel/mail/delete_box.pl
trunk/vhffs-panel/mail/delete_forward.pl
trunk/vhffs-panel/mail/password_box.pl
trunk/vhffs-panel/mail/prefs.pl
trunk/vhffs-panel/mail/save_catchall.pl
trunk/vhffs-panel/mail/spambox.pl
trunk/vhffs-panel/mail/spamvirus.pl
trunk/vhffs-panel/mailinglist/add_sub.pl
trunk/vhffs-panel/mailinglist/change_right.pl
trunk/vhffs-panel/mailinglist/create.pl
trunk/vhffs-panel/mailinglist/del_member.pl
trunk/vhffs-panel/mailinglist/delete.pl
trunk/vhffs-panel/mailinglist/prefs.pl
trunk/vhffs-panel/mailinglist/save_options.pl
trunk/vhffs-panel/mailinglist/save_sig.pl
trunk/vhffs-panel/mysql/create.pl
trunk/vhffs-panel/mysql/delete.pl
trunk/vhffs-panel/mysql/prefs.pl
trunk/vhffs-panel/mysql/prefs_save.pl
trunk/vhffs-panel/object/upavatar.pl
trunk/vhffs-panel/panel.pl
trunk/vhffs-panel/pgsql/create.pl
trunk/vhffs-panel/pgsql/delete.pl
trunk/vhffs-panel/pgsql/prefs.pl
trunk/vhffs-panel/pgsql/prefs_save.pl
trunk/vhffs-panel/repository/create.pl
trunk/vhffs-panel/repository/delete.pl
trunk/vhffs-panel/repository/prefs.pl
trunk/vhffs-panel/repository/prefs_save.pl
trunk/vhffs-panel/subscribe.pl
trunk/vhffs-panel/svn/create.pl
trunk/vhffs-panel/svn/delete.pl
trunk/vhffs-panel/svn/prefs.pl
trunk/vhffs-panel/svn/prefs_save.pl
trunk/vhffs-panel/templates/Makefile.am
trunk/vhffs-panel/templates/main/auth.tmpl
trunk/vhffs-panel/user/delete.pl
trunk/vhffs-panel/user/prefs.pl
trunk/vhffs-panel/user/projects.pl
trunk/vhffs-panel/web/create.pl
trunk/vhffs-panel/web/delete.pl
trunk/vhffs-panel/web/prefs.pl
trunk/vhffs-panel/web/prefs_save.pl
trunk/vhffs-public/allgroups.pl
trunk/vhffs-public/allwebsites.pl
trunk/vhffs-public/group.pl
trunk/vhffs-public/index.pl
trunk/vhffs-public/lastgroups.pl
trunk/vhffs-public/lastusers.pl
trunk/vhffs-public/rss/lastgroups.pl
trunk/vhffs-public/rss/lastusers.pl
trunk/vhffs-public/user.pl
Added Paths:
-----------
trunk/vhffs-public/
trunk/vhffs-public/Makefile.am
trunk/vhffs-public/themes/
trunk/vhffs-public/themes/vhffs/
trunk/vhffs-public/themes/vhffs/main.css
Removed Paths:
-------------
trunk/vhffs-panel/public/
trunk/vhffs-panel/templates/public/
trunk/vhffs-panel/themes/vhffs/images/largefile.png
trunk/vhffs-panel/themes/vhffs/images/largefilecreate.png
trunk/vhffs-panel/themes/vhffs/images/largefileentry.png
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/Makefile.am 2007-07-17 14:39:47 UTC (rev 731)
@@ -7,7 +7,7 @@
endif
SUBDIRS = vhffs-api vhffs-backend vhffs-doc vhffs-compat vhffs-intl vhffs-jabber vhffs-listengine \
- vhffs-panel vhffs-robots vhffs-shells vhffs-tests vhffs-tools $(SUB_VHFFS_FS)
+ vhffs-panel vhffs-public vhffs-robots vhffs-shells vhffs-tests vhffs-tools $(SUB_VHFFS_FS)
EXTRA_DIST = vhffs-forum vhffs-irc vhffs-packages \
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/configure.ac 2007-07-17 14:39:47 UTC (rev 731)
@@ -66,19 +66,28 @@
AC_SUBST(APIDIR)
AC_SUBST(VHFFS_LIBDIR)
-dnl web panel
-AC_ARG_WITH(web-path,
- AC_HELP_STRING([--with-web-path=path],
- [Complete path for web interface (panel) (/usr/share/vhffs/panel)]),
+dnl panel path
+AC_ARG_WITH(panel-path,
+ AC_HELP_STRING([--with-panel-path=path],
+ [Complete path for panel interface (/usr/share/vhffs/panel)]),
PANELDIR=$withval,
PANELDIR=/usr/share/vhffs/panel
)
AC_SUBST(PANELDIR)
+dnl public path
+AC_ARG_WITH(public-path,
+ AC_HELP_STRING([--with-public-path=path],
+ [Complete path for public interface (/usr/share/vhffs/public)]),
+ PUBLICDIR=$withval,
+ PUBLICDIR=/usr/share/vhffs/public
+)
+AC_SUBST(PUBLICDIR)
+
dnl templates
AC_ARG_WITH(template-path,
AC_HELP_STRING([--with-template-path=path],
- [Complete path for web templates (panel) (/usr/share/vhffs/templates)]),
+ [Complete path for web templates (/usr/share/vhffs/templates)]),
TEMPLATESDIR=$withval,
TEMPLATESDIR=/usr/share/vhffs/templates
)
@@ -86,7 +95,7 @@
AC_ARG_WITH(backend-path,
AC_HELP_STRING([--with-backend-path=path],
- [Complete path for web backend (/usr/share/vhffs/backend)]),
+ [Complete path for backend (/usr/share/vhffs/backend)]),
BACKENDDIR=$withval,
BACKENDDIR=/usr/share/vhffs/backend
)
@@ -119,15 +128,6 @@
)
AC_SUBST(LEDIR)
-dnl Listengine web files
-AC_ARG_WITH(listengine-web-path,
- AC_HELP_STRING([--with-listengine-web-path=path],
- [Complete path for listengine web file (/usr/share/vhffs/listengine)]),
- LEWEB=$withval,
- LEWEB=/usr/lib/vhffs/listengine
-)
-AC_SUBST(LEWEB)
-
dnl Mail
AC_ARG_WITH(mail-path,
AC_HELP_STRING([--with-mail-path=path],
@@ -207,6 +207,14 @@
AM_CONDITIONAL(INSTALL_PANEL, test "$enable_panel" = yes)
+dnl Install public or not ?
+AC_ARG_ENABLE(public,
+ AC_HELP_STRING([--enable-public],
+ [Enable public and templates installation [default=yes]]),
+ enable_public=$enableval,enable_public=yes)
+
+AM_CONDITIONAL(INSTALL_PUBLIC, test "$enable_public" = yes)
+
dnl Install listengine or not ?
AC_ARG_ENABLE(listengine,
AC_HELP_STRING([--enable-listengine],
@@ -314,6 +322,8 @@
vhffs-listengine/src/Makefile
vhffs-panel/Makefile
vhffs-panel/templates/Makefile
+ vhffs-public/Makefile
+ vhffs-public/templates/Makefile
vhffs-robots/Makefile
vhffs-shells/Makefile
vhffs-tests/Makefile
Modified: trunk/vhffs-api/src/Vhffs/Conf.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Conf.pm 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-api/src/Vhffs/Conf.pm 2007-07-17 14:39:47 UTC (rev 731)
@@ -541,6 +541,11 @@
return 0;
}
+sub get_panel_public_url
+{
+ return $Config{"global"}{"panel"}{url_public};
+}
+
sub get_panel_open
{
if( $Config{"global"}{"panel"}{"open"} )
Modified: trunk/vhffs-api/src/Vhffs/Panel/Commons.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Commons.pm 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-api/src/Vhffs/Panel/Commons.pm 2007-07-17 14:39:47 UTC (rev 731)
@@ -53,7 +53,7 @@
}
my $templatedir = $panel->{templatedir};
- my $template = new HTML::Template( filename => $templatedir."/main/auth.tmpl" );
+ my $template = new HTML::Template( filename => $templatedir."/panel/main/auth.tmpl" );
$template->param( TITLE => gettext("VHFFS Login") );
$template->param( TEXT_WELCOME => sprintf( gettext("Welcome on %s") , $hosturl ) );
@@ -80,6 +80,7 @@
if( $vhffs->get_config->get_panel_public == 1 ) {
$template->param( TEXT_PUBLIC => gettext( "Go to public area" ) );
+ $template->param( URL_PUBLIC => $vhffs->get_config->get_panel_public_url );
}
$panel->display_light( $template );
Modified: trunk/vhffs-api/src/Vhffs/Panel/Main.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Main.pm 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-api/src/Vhffs/Panel/Main.pm 2007-07-17 14:39:47 UTC (rev 731)
@@ -55,7 +55,7 @@
if( $vhffs->is_valid() == 0 )
{
- $template = new HTML::Template( filename => $templatedir."/main/close.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/main/close.tmpl" );
$template->param( TITLE => gettext("Platform temporary closed") );
$template->param( TEXT_CLOSE => gettext("Platform temporary closed<br/>database error") );
$template->param( TEXT_EXPLAIN => gettext("This platform is temporary closed. Administrators are performing some maintenances tasks or system has database errors. Please come back in a few minutes to log in.") );
@@ -66,7 +66,7 @@
if( $vhffs->get_config->get_panel_open != 1 )
{
- $template = new HTML::Template( filename => $templatedir."/main/close.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/main/close.tmpl" );
$template->param( TITLE => gettext("Platform temporary closed") );
$template->param( TEXT_CLOSE => gettext("Platform temporary closed.") );
$template->param( TEXT_EXPLAIN => gettext("This platform is temporary closed. Administrators are performing some maintenances tasks. Please come back in a few minutes to log in.") );
@@ -93,7 +93,7 @@
my $vhffs = $self->{vhffs};
my $templatedir = $vhffs->get_config->get_templatedir;
if( $vhffs->get_config->get_panel_public != 1 ) {
- my $template = new HTML::Template( filename => $templatedir.'/main/close.tmpl' );
+ my $template = new HTML::Template( filename => $templatedir.'/panel/main/close.tmpl' );
$template->param( TITLE => gettext('Public area not available') );
$template->param( TEXT_CLOSE => gettext('Public area not available') );
$template->param( TEXT_EXPLAIN => gettext('Public area is not available on this platform.') );
@@ -363,7 +363,7 @@
}
- my $maintemplate = new HTML::Template( filename => $templatedir."/main/panel.tmpl" );
+ my $maintemplate = new HTML::Template( filename => $templatedir."/panel/main/panel.tmpl" );
$this->{session} = $session;
$this->{template} = $maintemplate;
@@ -392,7 +392,7 @@
my $groupname = $self->{groupname};
my $vhffs = $self->{vhffs};
- my $menutemplate = new HTML::Template( filename => $templatedir.'/menu/main.tmpl' );
+ my $menutemplate = new HTML::Template( filename => $templatedir.'/panel/menu/main.tmpl' );
$menutemplate->param( THEME => $theme );
$menutemplate->param( USERNAME => $user->get_username() );
@@ -469,7 +469,7 @@
my ( $class , $vhffs , $session , $user ) = @_;
my $templatedir = $vhffs->get_config->get_templatedir;
- my $template = new HTML::Template( filename => $templatedir."/misc/welcome.tmpl" );
+ my $template = new HTML::Template( filename => $templatedir."/panel/misc/welcome.tmpl" );
$template->param( TEXT_WELCOME => gettext("Welcome") );
$template->param( USERNAME => $user->get_username() );
@@ -494,10 +494,10 @@
$templatedir = $vhffs->get_config->get_templatedir;
if( ! defined( $group ) ) {
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$template->param( MESSAGE => gettext("Group error" ) );
} else {
- $template = new HTML::Template( filename => $templatedir."/group/info.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/group/info.tmpl" );
$self->set_title( sprintf( gettext("Group %s") , $group->get_groupname ) );
$template->param( THEME => $self->{theme} );
@@ -767,7 +767,7 @@
my $templatedir = $self->{templatedir};
my $svclabel = $service_labels{$service};
- my $template = new HTML::Template( filename => $templatedir.'/misc/service_index.tmpl', global_vars => 1 );
+ my $template = new HTML::Template( filename => $templatedir.'/panel/misc/service_index.tmpl', global_vars => 1 );
my $format = sprintf( '%s for %%s', $svclabel );
$template->param( TEXT_TITLE => sprintf(gettext($format), $group->get_groupname) );
Modified: trunk/vhffs-api/src/Vhffs/Panel/Menu.pm
===================================================================
--- trunk/vhffs-api/src/Vhffs/Panel/Menu.pm 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-api/src/Vhffs/Panel/Menu.pm 2007-07-17 14:39:47 UTC (rev 731)
@@ -57,7 +57,7 @@
sub generate_project_ctxmenu($) {
my $config = shift;
- my $context_tmpl = new HTML::Template( filename => $config->get_templatedir.'/menu/context.tmpl' );
+ my $context_tmpl = new HTML::Template( filename => $config->get_templatedir.'/panel/menu/context.tmpl' );
my $items = [];
push @$items, {path => 'web', label => gettext('Web') } if( $config->use_web );
@@ -83,7 +83,7 @@
sub generate_moderator_ctxmenu {
my $config = shift;
- my $context_tmpl = new HTML::Template( filename => $config->get_templatedir.'/menu/context-modo.tmpl' );
+ my $context_tmpl = new HTML::Template( filename => $config->get_templatedir.'/panel/menu/context-modo.tmpl' );
my $items = [];
push @$items, {path => 'admin/stats.pl', label => gettext('Get Statistics') };
@@ -102,7 +102,7 @@
sub generate_admin_ctxmenu($) {
my $config = shift;
- my $context_tmpl = new HTML::Template( filename => $config->get_templatedir.'/menu/context.tmpl' );
+ my $context_tmpl = new HTML::Template( filename => $config->get_templatedir.'/panel/menu/context.tmpl' );
my $items = [];
push @$items, {path => 'admin', label => gettext('General') };
Modified: trunk/vhffs-backend/conf/vhffs.conf.dist.in
===================================================================
--- trunk/vhffs-backend/conf/vhffs.conf.dist.in 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-backend/conf/vhffs.conf.dist.in 2007-07-17 14:39:47 UTC (rev 731)
@@ -26,10 +26,11 @@
#Directory which contains internationalisation stuff
intldir = @INTLDIR@/
- # Directory used to store captcha files
- # Should be readable for webserver user but not accessible
- # to end users.
- captchadir = /tmp
+ # Directory used to store captcha files
+ # Should be readable for webserver user but not accessible
+ # to end users.
+ captchadir = /tmp
+
#The default language
default_language = en_US
@@ -94,6 +95,8 @@
#Use the public section of VHFFS
use_public = yes
+ #The URL to the public part
+ url_public = http://projects.vhffs.org/
#Use avatar or not ? If yes, you must create a /data/avatar and change owner/permissions
#so that the webserver can write into this directory
Modified: trunk/vhffs-panel/Makefile.am
===================================================================
--- trunk/vhffs-panel/Makefile.am 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/Makefile.am 2007-07-17 14:39:47 UTC (rev 731)
@@ -144,16 +144,6 @@
pgsql/index.pl \
pgsql/prefs_save.pl \
pgsql/prefs.pl \
- public/allgroups.pl \
- public/allwebsites.pl \
- public/group.pl \
- public/index.pl \
- public/lastgroups.pl \
- public/lastusers.pl \
- public/user.pl \
- public/websearch.pl \
- public/rss/lastgroups.pl \
- public/rss/lastusers.pl \
repository/create.pl \
repository/delete.pl \
repository/index.pl \
@@ -204,9 +194,6 @@
themes/vhffs/images/homeentry.png \
themes/vhffs/images/inputbg.png \
themes/vhffs/images/it_IT.png \
- themes/vhffs/images/largefilecreate.png \
- themes/vhffs/images/largefileentry.png \
- themes/vhffs/images/largefile.png \
themes/vhffs/images/loading_little.gif \
themes/vhffs/images/logo_2.png \
themes/vhffs/images/logo_old.png \
Modified: trunk/vhffs-panel/acl/view.pl
===================================================================
--- trunk/vhffs-panel/acl/view.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/acl/view.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -67,12 +67,12 @@
# Object does not exists
if( ! defined $object ) {
- $template = new HTML::Template( filename => $templatedir.'/misc/simplemsg.tmpl' );
+ $template = new HTML::Template( filename => $templatedir.'/panel/misc/simplemsg.tmpl' );
$template->param( MESSAGE => sprintf( gettext('Cannot get informations on object #%d'), $oid) );
} else {
# Object exists, we need to know if access is granted to the user
if( ( $access_level < Vhffs::Constants::ACL_VIEW ) && ( $user->is_admin != 1 ) ) {
- $template = new HTML::Template( filename => $templatedir.'/misc/simplemsg.tmpl' );
+ $template = new HTML::Template( filename => $templatedir.'/panel/misc/simplemsg.tmpl' );
$template->param( MESSAGE => gettext('You\'re not allowed to view this object\'s ACL') );
} else {
# access OK, let's see if some action was requested
@@ -122,7 +122,7 @@
$panel->add_info( gettext('ACL updated') );
}
}
- $template = new HTML::Template( filename => $templatedir.'/acl/view.tmpl' );
+ $template = new HTML::Template( filename => $templatedir.'/panel/acl/view.tmpl' );
$panel->set_title( gettext('ACL Administration') );
@@ -151,7 +151,7 @@
my $user_rights = Vhffs::Acl::getall_acl_for_user_per_object( $object , $vhffs );
my $group_rights = Vhffs::Acl::getall_acl_for_group_per_object( $object , $vhffs );
- my $subtemplate = new HTML::Template::Expr( filename => $templatedir.'/acl/view_each.tmpl', global_vars => 1 );
+ my $subtemplate = new HTML::Template::Expr( filename => $templatedir.'/panel/acl/view_each.tmpl', global_vars => 1 );
$subtemplate->param( VALUE_ACL_DENIED => Vhffs::Constants::ACL_DENIED );
$subtemplate->param( VALUE_ACL_VIEW => Vhffs::Constants::ACL_VIEW );
$subtemplate->param( VALUE_ACL_MODIFY => Vhffs::Constants::ACL_MODIFY );
Modified: trunk/vhffs-panel/admin/broadcast.pl
===================================================================
--- trunk/vhffs-panel/admin/broadcast.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/broadcast.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -65,13 +65,13 @@
if( $user->is_admin != 1 )
{
- $template = new HTML::Template( filename => "$templatesdir/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatesdir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => "$templatesdir/admin/misc/broadcast.tmpl" );
+ $template = new HTML::Template( filename => $templatesdir."/panel/admin/misc/broadcast.tmpl" );
$template->param( TITLE => gettext("Send an email to all hosted people") );
Modified: trunk/vhffs-panel/admin/broadcast_delete.pl
===================================================================
--- trunk/vhffs-panel/admin/broadcast_delete.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/broadcast_delete.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -69,7 +69,7 @@
my $templatedir = $vhffs->get_config->get_templatedir;
-$template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+$template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message;
#Use is not allowed to see this page, only MODERATOR and ADMIN
Modified: trunk/vhffs-panel/admin/broadcast_list.pl
===================================================================
--- trunk/vhffs-panel/admin/broadcast_list.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/broadcast_list.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -66,13 +66,13 @@
if( $user->is_admin != 1 )
{
- $template = new HTML::Template( filename => "$templatesdir/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatesdir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => "$templatesdir/admin/misc/broadcast_list.tmpl" );
+ $template = new HTML::Template( filename => $templatesdir."/panel/admin/misc/broadcast_list.tmpl" );
$template->param( TITLE => gettext("All mailings sent to hosted"));
my $mailings = Vhffs::Misc::Mailings::getall( $vhffs );
my $result;
@@ -80,7 +80,7 @@
$result = "";
foreach ( reverse sort keys %{$mailings} )
{
- $subtemplate = new HTML::Template( filename => "$templatesdir/admin/misc/broadcast_part.tmpl" );
+ $subtemplate = new HTML::Template( filename => $templatesdir."/panel/admin/misc/broadcast_part.tmpl" );
$body = $mailings->{$_}{'message'};
( $body ) = ( $body =~ /^(.{0,200}).*/ );
$subtemplate->param( ID => $_ );
Modified: trunk/vhffs-panel/admin/broadcast_submit.pl
===================================================================
--- trunk/vhffs-panel/admin/broadcast_submit.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/broadcast_submit.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -70,7 +70,7 @@
my $templatedir = $vhffs->get_config->get_templatedir;
-$template = new HTML::Template( filename => $templatedir."/admin/misc/moderation_applied.tmpl" );
+$template = new HTML::Template( filename => $templatedir."/panel/admin/misc/moderation_applied.tmpl" );
my $message;
#Use is not allowed to see this page, only MODERATOR and ADMIN
if( $user->is_admin != 1 )
Modified: trunk/vhffs-panel/admin/broadcast_view.pl
===================================================================
--- trunk/vhffs-panel/admin/broadcast_view.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/broadcast_view.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -68,19 +68,19 @@
if( $user->is_admin != 1 )
{
- $template = new HTML::Template( filename => "$templatesdir/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatesdir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
elsif( ( ! defined $mid ) || ( ! defined $mailing ) )
{
- $template = new HTML::Template( filename => "$templatesdir/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatesdir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "CGI Error !");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => "$templatesdir/admin/misc/broadcast_view.tmpl" );
+ $template = new HTML::Template( filename => $templatesdir."/panel/admin/misc/broadcast_view.tmpl" );
$template->param( TITLE => gettext("View mailing"));
$template->param( DATE_TEXT => gettext("Date"));
$template->param( SUBJECT_TEXT => gettext("Subject"));
Modified: trunk/vhffs-panel/admin/cvs/edit.pl
===================================================================
--- trunk/vhffs-panel/admin/cvs/edit.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/cvs/edit.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -69,25 +69,25 @@
if( $user->is_admin != 1 )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
elsif( ! defined $name )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "CGI ERROR !");
$template->param( MESSAGE => $message );
}
elsif( ! defined ( $object = Vhffs::Services::Cvs::get_by_cvsroot( $vhffs , $name ) ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "Cannot fetch object");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/admin/cvs/edit.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/admin/cvs/edit.tmpl" );
$template->param( TITLE => gettext("Edit CVS") );
Modified: trunk/vhffs-panel/admin/cvs/edit_submit.pl
===================================================================
--- trunk/vhffs-panel/admin/cvs/edit_submit.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/cvs/edit_submit.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -71,26 +71,26 @@
if( $user->is_admin != 1 )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
elsif( ! defined $name )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "CGI ERROR !");
$template->param( MESSAGE => $message );
}
elsif( ! defined ( $object = Vhffs::Services::Cvs::get_by_cvsroot( $vhffs , $name ) ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = sprintf( gettext("Cannot fetch object %s"), $name );
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$object->set_status( $cgi->param( "STATUS" ) );
Modified: trunk/vhffs-panel/admin/cvs/index.pl
===================================================================
--- trunk/vhffs-panel/admin/cvs/index.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/cvs/index.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -50,7 +50,7 @@
my $templatedir = $panel->{templatedir};
-my $template = new HTML::Template(filename => $templatedir.'/admin/index.tmpl');
+my $template = new HTML::Template(filename => $templatedir.'/panel/admin/index.tmpl');
$panel->set_title(gettext('CVS repositories\' administration'));
Modified: trunk/vhffs-panel/admin/cvs/list.pl
===================================================================
--- trunk/vhffs-panel/admin/cvs/list.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/cvs/list.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -69,13 +69,13 @@
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => "$templatesdir/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatesdir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => "$templatesdir/admin/misc/list.tmpl" );
+ $template = new HTML::Template( filename => $templatesdir."/panel/admin/misc/list.tmpl" );
if( defined( $name ) )
{
@@ -93,12 +93,12 @@
my $cvs = Vhffs::Panel::Cvs::search( $vhffs, $name );
my $subtemplate;
if( $user->is_admin == 1 ) {
- $subtemplate = new HTML::Template( filename => "$templatesdir/admin/cvs/part.tmpl", global_vars => 1);
+ $subtemplate = new HTML::Template( filename => $templatesdir."/panel/admin/cvs/part.tmpl", global_vars => 1);
$subtemplate->param( SEND => gettext("Modify this CVS repository") );
} else {
# die_on_bad_param => 0 is required since the values provided by Vhffs::Panel::Cvs::search
# contains fields that are not used in moderator's template.
- $subtemplate = new HTML::Template( filename => "$templatesdir/admin/cvs/part-modo.tmpl", global_vars => 1);
+ $subtemplate = new HTML::Template( filename => $templatesdir."/panel/admin/cvs/part-modo.tmpl", global_vars => 1);
$subtemplate->param( SEND => gettext("Show this CVS repository") );
}
Modified: trunk/vhffs-panel/admin/cvs/search.pl
===================================================================
--- trunk/vhffs-panel/admin/cvs/search.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/cvs/search.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -66,13 +66,13 @@
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => "$templatesdir/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatesdir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => "$templatesdir/admin/web/search.tmpl" );
+ $template = new HTML::Template( filename => $templatesdir."/panel/admin/web/search.tmpl" );
$template->param( TITLE => gettext("Search for a CVS repository") );
Modified: trunk/vhffs-panel/admin/cvs/show.pl
===================================================================
--- trunk/vhffs-panel/admin/cvs/show.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/cvs/show.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -69,25 +69,25 @@
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
elsif( ! defined $name )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "CGI ERROR !");
$template->param( MESSAGE => $message );
}
elsif( ! defined ( $object = Vhffs::Services::Cvs::get_by_cvsroot( $vhffs , $name ) ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "Cannot fetch object");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/admin/cvs/show.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/admin/cvs/show.tmpl" );
$template->param( TITLE => gettext("Show CVS") );
Modified: trunk/vhffs-panel/admin/dns/index.pl
===================================================================
--- trunk/vhffs-panel/admin/dns/index.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/dns/index.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -50,7 +50,7 @@
my $templatedir = $panel->{templatedir};
-my $template = new HTML::Template(filename => $templatedir.'/admin/index.tmpl');
+my $template = new HTML::Template(filename => $templatedir.'/panel/admin/index.tmpl');
$panel->set_title(gettext('DNS\' administration'));
Modified: trunk/vhffs-panel/admin/dns/list.pl
===================================================================
--- trunk/vhffs-panel/admin/dns/list.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/dns/list.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -67,13 +67,13 @@
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/admin/misc/list.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/admin/misc/list.tmpl" );
if( defined( $name ) )
{
@@ -96,10 +96,10 @@
{
my $subtemplate;
if( $user->is_admin == 1 ) {
- $subtemplate = new HTML::Template( filename => $templatedir."/admin/dns/part.tmpl", global_vars => 1 );
+ $subtemplate = new HTML::Template( filename => $templatedir."/panel/admin/dns/part.tmpl", global_vars => 1 );
$subtemplate->param(SEND => gettext('Modify this domain') );
} else {
- $subtemplate = new HTML::Template( filename => $templatedir."/admin/dns/part-modo.tmpl", die_on_bad_params => 0 )
+ $subtemplate = new HTML::Template( filename => $templatedir."/panel/admin/dns/part-modo.tmpl", die_on_bad_params => 0 )
}
$subtemplate->param(DNSES => $domains);
Modified: trunk/vhffs-panel/admin/dns/search.pl
===================================================================
--- trunk/vhffs-panel/admin/dns/search.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/dns/search.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -67,13 +67,13 @@
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/admin/web/search.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/admin/web/search.tmpl" );
$template->param( TITLE => gettext("Search for a domain name") );
Modified: trunk/vhffs-panel/admin/group/edit.pl
===================================================================
--- trunk/vhffs-panel/admin/group/edit.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/group/edit.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -67,25 +67,25 @@
if( $user->is_admin != 1 )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
elsif( ! defined $groupname )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "CGI ERROR !");
$template->param( MESSAGE => $message );
}
elsif( ! defined ( $group = Vhffs::Group::get_by_groupname($vhffs, $groupname) ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "Cannot fetch object");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/admin/group/edit.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/admin/group/edit.tmpl" );
$panel->set_title( gettext('Edit Group') );
Modified: trunk/vhffs-panel/admin/group/edit_submit.pl
===================================================================
--- trunk/vhffs-panel/admin/group/edit_submit.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/group/edit_submit.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -73,32 +73,32 @@
if( $user->is_admin != 1 )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
elsif( ! defined $groupname )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "CGI ERROR !");
$template->param( MESSAGE => $message );
}
elsif( ! defined ( $group = Vhffs::Group::get_by_groupname($vhffs, $groupname) ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "Cannot fetch object");
$template->param( MESSAGE => $message );
}
elsif( ( ! defined $status ) || ( ! defined $quota ) || ( ! defined $quota ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "CGI Error !");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$group->set_status( $status );
$group->set_quota( $quota );
Modified: trunk/vhffs-panel/admin/group/index.pl
===================================================================
--- trunk/vhffs-panel/admin/group/index.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/group/index.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -50,7 +50,7 @@
my $templatedir = $panel->{templatedir};
-my $template = new HTML::Template(filename => $templatedir.'/admin/index.tmpl');
+my $template = new HTML::Template(filename => $templatedir.'/panel/admin/index.tmpl');
$panel->set_title(gettext('Groups\' administration'));
Modified: trunk/vhffs-panel/admin/group/list.pl
===================================================================
--- trunk/vhffs-panel/admin/group/list.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/group/list.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -68,13 +68,13 @@
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/admin/misc/list.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/admin/misc/list.tmpl" );
if( ! defined $name)
{
@@ -97,10 +97,10 @@
{
my $subtemplate;
if( $user->is_admin == 1 ) {
- $subtemplate = new HTML::Template( filename => $templatedir."/admin/group/part.tmpl", global_vars => 1 );
+ $subtemplate = new HTML::Template( filename => $templatedir."/panel/admin/group/part.tmpl", global_vars => 1 );
$subtemplate->param(SEND => gettext('Modify this group'));
} else {
- $subtemplate = new HTML::Template( filename => $templatedir."/admin/group/part-modo.tmpl", global_vars => 1 );
+ $subtemplate = new HTML::Template( filename => $templatedir."/panel/admin/group/part-modo.tmpl", global_vars => 1 );
$subtemplate->param(SEND => gettext('Show this group'));
}
Modified: trunk/vhffs-panel/admin/group/search.pl
===================================================================
--- trunk/vhffs-panel/admin/group/search.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/group/search.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -67,13 +67,13 @@
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/admin/group/search.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/admin/group/search.tmpl" );
$template->param( TITLE => gettext("Search for a group") );
Modified: trunk/vhffs-panel/admin/group/show.pl
===================================================================
--- trunk/vhffs-panel/admin/group/show.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/group/show.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -68,25 +68,25 @@
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
elsif( ! defined $groupname )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = sprintf( gettext("CGI ERROR ! %s"), $groupname );
$template->param( MESSAGE => $message );
}
elsif( ! defined ( $group = Vhffs::Group::get_by_groupname( $vhffs , $groupname ) ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "Cannot fetch object");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/admin/group/show.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/admin/group/show.tmpl" );
$template->param( TITLE => gettext("Show Group") );
Modified: trunk/vhffs-panel/admin/index.pl
===================================================================
--- trunk/vhffs-panel/admin/index.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/index.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -48,7 +48,7 @@
my $templatedir = $panel->{templatedir};
my $user = $panel->{user};
-my $template = new HTML::Template(filename => $templatedir.'/admin/index.tmpl');
+my $template = new HTML::Template(filename => $templatedir.'/panel/admin/index.tmpl');
$panel->set_title(gettext('Administration'));
Modified: trunk/vhffs-panel/admin/mail/change_forward.pl
===================================================================
--- trunk/vhffs-panel/admin/mail/change_forward.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/mail/change_forward.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -73,32 +73,32 @@
if( ! defined $mail )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = sprintf( gettext("Unable to get information on mail domain %s"), $domain );
$template->param( MESSAGE => $message );
}
elsif( ( ! defined $boxname ) || ( ! defined $forward ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "CGI ERROR");
$template->param( MESSAGE => $message );
}
elsif( $mail->get_status != Vhffs::Constants::ACTIVATED )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "This object is not functionnal yet. Please wait creation or moderation.");
$template->param( MESSAGE => $message );
}
elsif( ( Vhffs::Acl::what_perm_for_user( $user , $mail , $vhffs ) < Vhffs::Constants::ACL_VIEW ) || ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext("You're not allowed to do this (ACL rights)");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
if( ( $retour = $mail->change_forward( $boxname , $forward ) ) < 0 )
{
Modified: trunk/vhffs-panel/admin/mail/delete_box.pl
===================================================================
--- trunk/vhffs-panel/admin/mail/delete_box.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/mail/delete_box.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -72,32 +72,32 @@
if( ! defined $mail )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = sprintf( gettext("Unable to get information on mail domain %s"), $domain );
$template->param( MESSAGE => $message );
}
elsif( ! defined $boxname )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "CGI ERROR");
$template->param( MESSAGE => $message );
}
elsif( $mail->get_status != Vhffs::Constants::ACTIVATED )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "This object is not functionnal yet. Please wait creation or moderation.");
$template->param( MESSAGE => $message );
}
elsif( ( Vhffs::Acl::what_perm_for_user( $user , $mail , $vhffs ) < Vhffs::Constants::ACL_VIEW ) || ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext("You're not allowed to do this (ACL rights)");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
if( ( $retour = $mail->delbox( $boxname ) ) < 0 )
{
Modified: trunk/vhffs-panel/admin/mail/delete_forward.pl
===================================================================
--- trunk/vhffs-panel/admin/mail/delete_forward.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/mail/delete_forward.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -73,32 +73,32 @@
if( ! defined $mail )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = sprintf( gettext("Unable to get information on mail domain %s"), $domain );
$template->param( MESSAGE => $message );
}
elsif( ! defined $boxname )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "CGI ERROR");
$template->param( MESSAGE => $message );
}
elsif( $mail->get_status != Vhffs::Constants::ACTIVATED )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "This object is not functionnal yet. Please wait creation or moderation.");
$template->param( MESSAGE => $message );
}
elsif( ( Vhffs::Acl::what_perm_for_user( $user , $mail , $vhffs ) < Vhffs::Constants::ACL_VIEW ) || ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext("You're not allowed to do this (ACL rights) " . $domain . "l" );
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
if( ( $retour = $mail->delforward( $boxname ) ) < 0 )
{
Modified: trunk/vhffs-panel/admin/mail/edit.pl
===================================================================
--- trunk/vhffs-panel/admin/mail/edit.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/mail/edit.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -71,25 +71,25 @@
if( $user->is_admin != 1 )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
elsif( ! defined $domain_name )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "CGI ERROR !");
$template->param( MESSAGE => $message );
}
elsif( ! defined ( $object = Vhffs::Services::Mail::get_by_mxdomain( $vhffs , $domain_name ) ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "Cannot fetch object");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/admin/mail/edit.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/admin/mail/edit.tmpl" );
$template->param( TITLE => gettext("Edit Mail Domain") .": " . $object->get_domain);
@@ -120,7 +120,7 @@
my $forwards = $object->get_forwards;
foreach( keys %{$forwards} )
{
- $subtemplate = new HTML::Template( filename => $templatedir."/admin/mail/admin_forward.tmpl" );
+ $subtemplate = new HTML::Template( filename => $templatedir."/panel/admin/mail/admin_forward.tmpl" );
$subtemplate->param( LOCAL_PART => $_ . "\@" . $object->get_domain );
$subtemplate->param( DOMAIN => $object->get_domain );
$subtemplate->param( FORWARD_MAIL => $forwards->{$_}{'remote_name'} );
@@ -137,7 +137,7 @@
my $boxes = $object->get_boxes;
foreach( keys %{$boxes} )
{
- $subtemplate = new HTML::Template( filename => $templatedir."/admin/mail/admin_box.tmpl" );
+ $subtemplate = new HTML::Template( filename => $templatedir."/panel/admin/mail/admin_box.tmpl" );
$subtemplate->param( ACCOUNT => $_ . "\@" . $object->get_domain );
$subtemplate->param( TEXT_CHANGE_PASSWORD => gettext( "Change Password" ) );
$subtemplate->param( LOCALPART => $_ );
Modified: trunk/vhffs-panel/admin/mail/index.pl
===================================================================
--- trunk/vhffs-panel/admin/mail/index.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/mail/index.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -50,7 +50,7 @@
my $templatedir = $panel->{templatedir};
-my $template = new HTML::Template(filename => $templatedir.'/admin/index.tmpl');
+my $template = new HTML::Template(filename => $templatedir.'/panel/admin/index.tmpl');
$panel->set_title(gettext('Mail domains\' administration'));
Modified: trunk/vhffs-panel/admin/mail/list.pl
===================================================================
--- trunk/vhffs-panel/admin/mail/list.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/mail/list.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -67,13 +67,13 @@
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/admin/misc/list.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/admin/misc/list.tmpl" );
if( defined( $name ) )
{
@@ -99,10 +99,10 @@
my $mailhash;
my $send;
if( $user->is_admin == 1 ) {
- $subtemplate = new HTML::Template( filename => $templatedir."/admin/mail/part.tmpl", global_vars => 1 );
+ $subtemplate = new HTML::Template( filename => $templatedir."/panel/admin/mail/part.tmpl", global_vars => 1 );
$subtemplate->param( SEND => gettext('Modify this mail domain') );
} else {
- $subtemplate = new HTML::Template( filename => $templatedir."/admin/mail/part-modo.tmpl", global_vars => 1 );
+ $subtemplate = new HTML::Template( filename => $templatedir."/panel/admin/mail/part-modo.tmpl", global_vars => 1 );
$subtemplate->param( SEND => gettext('Show this mail domain'));
}
Modified: trunk/vhffs-panel/admin/mail/password_box.pl
===================================================================
--- trunk/vhffs-panel/admin/mail/password_box.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/mail/password_box.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -73,32 +73,32 @@
if( ! defined $mail )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = sprintf( gettext("Unable to get information on mail domain %s"), $domain );
$template->param( MESSAGE => $message );
}
elsif( ( ! defined $password ) || ( ! defined $boxname ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "CGI ERROR");
$template->param( MESSAGE => $message );
}
elsif( $mail->get_status != Vhffs::Constants::ACTIVATED )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "This object is not functionnal yet. Please wait creation or moderation.");
$template->param( MESSAGE => $message );
}
elsif( ( Vhffs::Acl::what_perm_for_user( $user , $mail , $vhffs ) < Vhffs::Constants::ACL_VIEW ) || ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext("You're not allowed to do this (ACL rights)");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
if( ( $retour = $mail->change_box_password( $boxname , $password ) ) < 0 )
{
Modified: trunk/vhffs-panel/admin/mail/search.pl
===================================================================
--- trunk/vhffs-panel/admin/mail/search.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/mail/search.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -67,13 +67,13 @@
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/admin/mail/search.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/admin/mail/search.tmpl" );
$template->param( TITLE => gettext("Search for a mail domain") );
Modified: trunk/vhffs-panel/admin/mail/show.pl
===================================================================
--- trunk/vhffs-panel/admin/mail/show.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/mail/show.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -71,25 +71,25 @@
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
elsif( ! defined $domain_name )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "CGI ERROR !");
$template->param( MESSAGE => $message );
}
elsif( ! defined ( $object = Vhffs::Services::Mail::get_by_mxdomain( $vhffs , $domain_name ) ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "Cannot fetch object");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/admin/mail/show.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/admin/mail/show.tmpl" );
$template->param( TITLE => gettext("Show Mail Domain") .": " . $object->get_domain);
@@ -120,7 +120,7 @@
my $forwards = $object->get_forwards;
foreach( keys %{$forwards} )
{
- $subtemplate = new HTML::Template( filename => $templatedir."/admin/mail/admin_forward-modo.tmpl" );
+ $subtemplate = new HTML::Template( filename => $templatedir."/panel/admin/mail/admin_forward-modo.tmpl" );
$subtemplate->param( LOCAL_PART => $_ . "\@" . $object->get_domain );
$subtemplate->param( FORWARD_MAIL => $forwards->{$_}{'remote_name'} );
$output .= $subtemplate->output;
@@ -132,7 +132,7 @@
my $boxes = $object->get_boxes;
foreach( keys %{$boxes} )
{
- $subtemplate = new HTML::Template( filename => $templatedir."/admin/mail/admin_box-modo.tmpl" );
+ $subtemplate = new HTML::Template( filename => $templatedir."/panel/admin/mail/admin_box-modo.tmpl" );
$subtemplate->param( ACCOUNT => $_ . "\@" . $object->get_domain );
$output .= $subtemplate->output;
}
Modified: trunk/vhffs-panel/admin/mailing/index.pl
===================================================================
--- trunk/vhffs-panel/admin/mailing/index.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/mailing/index.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -50,7 +50,7 @@
my $templatedir = $panel->{templatedir};
-my $template = new HTML::Template(filename => $templatedir.'/admin/index.tmpl');
+my $template = new HTML::Template(filename => $templatedir.'/panel/admin/index.tmpl');
$panel->set_title(gettext('Mailing lists\' administration'));
Modified: trunk/vhffs-panel/admin/mailing/list.pl
===================================================================
--- trunk/vhffs-panel/admin/mailing/list.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/mailing/list.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -66,13 +66,13 @@
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/admin/misc/list.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/admin/misc/list.tmpl" );
if( defined( $name ) )
{
@@ -92,7 +92,7 @@
if( defined $lists )
{
- my $subtemplate = new HTML::Template( filename => $templatedir."/admin/mailing/part.tmpl", global_vars => 1 );
+ my $subtemplate = new HTML::Template( filename => $templatedir."/panel/admin/mailing/part.tmpl", global_vars => 1 );
if( $user->is_admin == 1 ) {
$subtemplate->param( SEND => gettext('Modify this list') );
} else {
Modified: trunk/vhffs-panel/admin/mailing/mailing_submit.pl
===================================================================
--- trunk/vhffs-panel/admin/mailing/mailing_submit.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/mailing/mailing_submit.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -67,7 +67,7 @@
my $message;
-$template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+$template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
if( $user->is_admin != 1 )
{
Modified: trunk/vhffs-panel/admin/mailing/search.pl
===================================================================
--- trunk/vhffs-panel/admin/mailing/search.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/mailing/search.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -66,13 +66,13 @@
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/admin/mailing/search.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/admin/mailing/search.tmpl" );
$template->param( TITLE => gettext("Search for a list") );
Modified: trunk/vhffs-panel/admin/moderation.pl
===================================================================
--- trunk/vhffs-panel/admin/moderation.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/moderation.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -72,14 +72,14 @@
#Use is not allowed to see this page, only MODERATOR and ADMIN
if( ($user->is_moderator != 1 ) && ( $user->is_admin ) != 1 )
{
- $template = new HTML::Template( filename => "$templatesdir/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatesdir."/panel/misc/simplemsg.tmpl" );
my $message = gettext("You're not allowed to do this (ACL rights)");
$template->param( MESSAGE => $message );
}
else
{
my $output = "";
- $template = new HTML::Template( filename => "$templatesdir/admin/misc/moderation.tmpl" );
+ $template = new HTML::Template( filename => $templatesdir."/panel/admin/misc/moderation.tmpl" );
$template->param( TITLE => gettext("Moderation") );
@@ -94,7 +94,7 @@
{
foreach $temp ( @{$groups} )
{
- my $subtemplate = new HTML::Template( filename => "$templatesdir/admin/misc/moderation_part.tmpl" );
+ my $subtemplate = new HTML::Template( filename => $templatesdir."/panel/admin/misc/moderation_part.tmpl" );
$subtemplate->param( NAME => $temp->get_groupname );
if( $vhffs->get_config->use_notation == 1 )
@@ -137,7 +137,7 @@
{
foreach $temp ( @{$webs} )
{
- my $subtemplate = new HTML::Template( filename => "$templatesdir/admin/misc/moderation_part.tmpl" );
+ my $subtemplate = new HTML::Template( filename => $templatesdir."/panel/admin/misc/moderation_part.tmpl" );
$subtemplate->param( NAME => $temp->get_servername );
if( $vhffs->get_config->use_notation == 1 )
@@ -180,7 +180,7 @@
{
foreach $temp ( @{$nss} )
{
- my $subtemplate = new HTML::Template( filename => "$templatesdir/admin/misc/moderation_part.tmpl" );
+ my $subtemplate = new HTML::Template( filename => $templatesdir."/panel/admin/misc/moderation_part.tmpl" );
if( $vhffs->get_config->use_notation == 1 )
{
$subtemplate->param( OWNER => $temp->get_user->get_username);
@@ -223,7 +223,7 @@
foreach $temp ( @{$repos} )
{
- my $subtemplate = new HTML::Template( filename => "$templatesdir/admin/misc/moderation_part.tmpl" );
+ my $subtemplate = new HTML::Template( filename => $templatesdir."/panel/admin/misc/moderation_part.tmpl" );
if( $vhffs->get_config->use_notation == 1 )
{
@@ -266,7 +266,7 @@
{
foreach $temp ( @{$mls} )
{
- my $subtemplate = new HTML::Template( filename => "$templatesdir/admin/misc/moderation_part.tmpl" );
+ my $subtemplate = new HTML::Template( filename => $templatesdir."/panel/admin/misc/moderation_part.tmpl" );
$subtemplate->param( NAME => $temp->get_localpart ."\@". $temp->get_domain );
if( $vhffs->get_config->use_notation == 1 )
@@ -310,7 +310,7 @@
{
foreach $svn ( @{$repos} )
{
- my $subtemplate = new HTML::Template( filename => "$templatesdir/admin/misc/moderation_part.tmpl" );
+ my $subtemplate = new HTML::Template( filename => $templatesdir."/panel/admin/misc/moderation_part.tmpl" );
$subtemplate->param( NAME => $svn->get_reponame);
if( $vhffs->get_config->use_notation == 1 )
@@ -355,7 +355,7 @@
{
foreach $temp ( @{$mails} )
{
- my $subtemplate = new HTML::Template( filename => "$templatesdir/admin/misc/moderation_part.tmpl" );
+ my $subtemplate = new HTML::Template( filename => $templatesdir."/panel/admin/misc/moderation_part.tmpl" );
$subtemplate->param( NAME => $temp->get_domain );
if( $vhffs->get_config->use_notation == 1 )
@@ -398,7 +398,7 @@
{
foreach $temp ( @{$dbs} )
{
- my $subtemplate = new HTML::Template( filename => "$templatesdir/admin/misc/moderation_part.tmpl" );
+ my $subtemplate = new HTML::Template( filename => $templatesdir."/panel/admin/misc/moderation_part.tmpl" );
if( $vhffs->get_config->use_notation == 1 )
{
@@ -440,7 +440,7 @@
{
foreach $temp ( @{$dbs} )
{
- my $subtemplate = new HTML::Template( filename => "$templatesdir/admin/misc/moderation_part.tmpl" );
+ my $subtemplate = new HTML::Template( filename => $templatesdir."/panel/admin/misc/moderation_part.tmpl" );
if( $vhffs->get_config->use_notation == 1 )
{
@@ -482,7 +482,7 @@
{
foreach $temp ( @{$repos} )
{
- my $subtemplate = new HTML::Template( filename => "$templatesdir/admin/misc/moderation_part.tmpl" );
+ my $subtemplate = new HTML::Template( filename => $templatesdir."/panel/admin/misc/moderation_part.tmpl" );
if( $vhffs->get_config->use_notation == 1 )
{
Modified: trunk/vhffs-panel/admin/moderation_submit.pl
===================================================================
--- trunk/vhffs-panel/admin/moderation_submit.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/moderation_submit.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -71,7 +71,7 @@
my $templatedir = $vhffs->get_config->get_templatedir;
-$template = new HTML::Template( filename => $templatedir."/admin/misc/moderation_applied.tmpl" );
+$template = new HTML::Template( filename => $templatedir."/panel/admin/misc/moderation_applied.tmpl" );
#Use is not allowed to see this page, only MODERATOR and ADMIN
if( ($user->is_moderator != 1 ) && ( $user->is_admin ) != 1 )
Modified: trunk/vhffs-panel/admin/mysql/edit.pl
===================================================================
--- trunk/vhffs-panel/admin/mysql/edit.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/mysql/edit.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -69,25 +69,25 @@
if( $user->is_admin != 1 )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
elsif( ! defined $name )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "CGI ERROR !");
$template->param( MESSAGE => $message );
}
elsif( ! defined ( $object = Vhffs::Services::Mysql::get_by_dbname( $vhffs , $name ) ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "Cannot fetch object");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/admin/mysql/edit.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/admin/mysql/edit.tmpl" );
$template->param( TITLE => gettext("Edit MySQL database") );
Modified: trunk/vhffs-panel/admin/mysql/edit_submit.pl
===================================================================
--- trunk/vhffs-panel/admin/mysql/edit_submit.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/mysql/edit_submit.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -68,26 +68,26 @@
if( $user->is_admin != 1 )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
elsif( ! defined $name )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "CGI ERROR !");
$template->param( MESSAGE => $message );
}
elsif( ! defined ( $object = Vhffs::Services::Mysql::get_by_dbname( $vhffs , $name ) ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = sprintf( gettext("Cannot fetch object %s"), $name );
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $pass = $cgi->param( "DBPASS" );
if( $pass ne '' && $pass ne 'blanked' ) {
$object->set_dbpassword($pass);
Modified: trunk/vhffs-panel/admin/mysql/index.pl
===================================================================
--- trunk/vhffs-panel/admin/mysql/index.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/mysql/index.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -50,7 +50,7 @@
my $templatedir = $panel->{templatedir};
-my $template = new HTML::Template(filename => $templatedir.'/admin/index.tmpl');
+my $template = new HTML::Template(filename => $templatedir.'/panel/admin/index.tmpl');
$panel->set_title(gettext('MySQL databases\' administration'));
Modified: trunk/vhffs-panel/admin/mysql/list.pl
===================================================================
--- trunk/vhffs-panel/admin/mysql/list.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/mysql/list.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -68,13 +68,13 @@
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/admin/misc/list.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/admin/misc/list.tmpl" );
if( defined( $name ) )
{
@@ -96,10 +96,10 @@
my $subtemplate;
if( $user->is_admin == 1 ) {
- $subtemplate = new HTML::Template( filename => $templatedir.'/admin/mysql/part.tmpl', global_vars => 1 );
+ $subtemplate = new HTML::Template( filename => $templatedir.'/panel/admin/mysql/part.tmpl', global_vars => 1 );
$subtemplate->param( SEND => gettext('Modify this MySQL area'));
} else {
- $subtemplate = new HTML::Template( filename => $templatedir.'/admin/mysql/part-modo.tmpl', global_vars => 1 );
+ $subtemplate = new HTML::Template( filename => $templatedir.'/panel/admin/mysql/part-modo.tmpl', global_vars => 1 );
$subtemplate->param( SEND => gettext('Show this MySQL area'));
}
Modified: trunk/vhffs-panel/admin/mysql/search.pl
===================================================================
--- trunk/vhffs-panel/admin/mysql/search.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/mysql/search.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -67,13 +67,13 @@
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/admin/web/search.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/admin/web/search.tmpl" );
$template->param( TITLE => gettext("Search for a database") );
Modified: trunk/vhffs-panel/admin/mysql/show.pl
===================================================================
--- trunk/vhffs-panel/admin/mysql/show.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/mysql/show.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -68,25 +68,25 @@
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
elsif( ! defined $name )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "CGI ERROR !");
$template->param( MESSAGE => $message );
}
elsif( ! defined ( $object = Vhffs::Services::Mysql::get_by_dbname( $vhffs , $name ) ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "Cannot fetch object");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/admin/mysql/show.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/admin/mysql/show.tmpl" );
$template->param( TITLE => gettext("Show MySQL database") );
Modified: trunk/vhffs-panel/admin/object/delete_avatar.pl
===================================================================
--- trunk/vhffs-panel/admin/object/delete_avatar.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/object/delete_avatar.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -67,7 +67,7 @@
my $object;
my $templatesdir = $vhffs->get_config->get_templatedir;
-my $template = new HTML::Template( filename => "$templatesdir/misc/simplemsg.tmpl" );
+my $template = new HTML::Template( filename => $templatesdir."/panel/misc/simplemsg.tmpl" );
if( $vhffs->get_config->get_panel_avatar == 0 )
{
$message = gettext( "This platform does not support avatar");
Modified: trunk/vhffs-panel/admin/object/edit.pl
===================================================================
--- trunk/vhffs-panel/admin/object/edit.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/object/edit.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -69,23 +69,23 @@
if( $user->is_admin != 1 )
{
- $template = new HTML::Template( filename => "$templatesdir/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatesdir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
elsif( ! defined $oid )
{
- $template = new HTML::Template( filename => "$templatesdir/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatesdir."/panel/misc/simplemsg.tmpl" );
$template->param( MESSAGE => gettext( "CGI ERROR !") );
}
elsif( ! defined ( $object = Vhffs::Object::get_by_oid( $vhffs , $oid ) ) )
{
- $template = new HTML::Template( filename => "$templatesdir/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatesdir."/panel/misc/simplemsg.tmpl" );
$template->param( MESSAGE => gettext( "Cannot fetch object") );
}
else
{
- $template = new HTML::Template( filename => "$templatesdir/admin/object/edit.tmpl" );
+ $template = new HTML::Template( filename => $templatesdir."/panel/admin/object/edit.tmpl" );
$template->param( TITLE => gettext("Edit Object") );
@@ -206,7 +206,7 @@
{
foreach( keys %{$history} )
{
- my $subtemplate = new HTML::Template( filename => "$templatesdir/misc/history_part.tmpl" );
+ my $subtemplate = new HTML::Template( filename => $templatesdir."/panel/misc/history_part.tmpl" );
my $date = Vhffs::Functions::parse_date( $history->{$_}{date} );
if( defined $date )
{
Modified: trunk/vhffs-panel/admin/object/edit_submit.pl
===================================================================
--- trunk/vhffs-panel/admin/object/edit_submit.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/object/edit_submit.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -66,7 +66,7 @@
my $object;
my $templatesdir = $vhffs->get_config->get_templatedir;
-my $template = new HTML::Template( filename => "$templatesdir/misc/simplemsg.tmpl" );
+my $template = new HTML::Template( filename => $templatesdir."/panel/misc/simplemsg.tmpl" );
if( $user->is_admin != 1 )
{
Modified: trunk/vhffs-panel/admin/object/list.pl
===================================================================
--- trunk/vhffs-panel/admin/object/list.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/object/list.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -67,13 +67,13 @@
if( $user->is_admin != 1 )
{
- $template = new HTML::Template( filename => "$templatesdir/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatesdir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => "$templatesdir/admin/misc/list.tmpl" );
+ $template = new HTML::Template( filename => $templatesdir."/panel/admin/misc/list.tmpl" );
if( defined( $name ) )
{
@@ -92,7 +92,7 @@
my $objs = Vhffs::Panel::Object::search( $vhffs , $name );
if( defined $objs ) {
- my $subtemplate = new HTML::Template( filename => "$templatesdir/admin/object/part.tmpl", global_vars => 1 );
+ my $subtemplate = new HTML::Template( filename => $templatesdir."/panel/admin/object/part.tmpl", global_vars => 1 );
$subtemplate->param( SEND => gettext('Edit this object'));
$subtemplate->param( HISTORY => gettext('History'));
$subtemplate->param(OBJECTS => $objs);
Modified: trunk/vhffs-panel/admin/object/search.pl
===================================================================
--- trunk/vhffs-panel/admin/object/search.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/object/search.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -66,13 +66,13 @@
if( $user->is_admin != 1 )
{
- $template = new HTML::Template( filename => "$templatesdir/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatesdir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => "$templatesdir/admin/object/search.tmpl" );
+ $template = new HTML::Template( filename => $templatesdir."/panel/admin/object/search.tmpl" );
$template->param( TITLE => gettext("Search an object (give object_id)") );
}
Modified: trunk/vhffs-panel/admin/pgsql/edit.pl
===================================================================
--- trunk/vhffs-panel/admin/pgsql/edit.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/pgsql/edit.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -69,25 +69,25 @@
if( $user->is_admin != 1 )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
elsif( ! defined $name )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "CGI ERROR !");
$template->param( MESSAGE => $message );
}
elsif( ! defined ( $object = Vhffs::Services::Postgres::get_by_dbname( $vhffs , $name ) ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "Cannot fetch object");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/admin/pgsql/edit.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/admin/pgsql/edit.tmpl" );
$template->param( TITLE => gettext("Edit PostgreSQL database") );
Modified: trunk/vhffs-panel/admin/pgsql/edit_submit.pl
===================================================================
--- trunk/vhffs-panel/admin/pgsql/edit_submit.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/pgsql/edit_submit.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -69,26 +69,26 @@
if( $user->is_admin != 1 )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
elsif( ! defined $name )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "CGI ERROR !");
$template->param( MESSAGE => $message );
}
elsif( ! defined ( $object = Vhffs::Services::Postgres::get_by_dbname( $vhffs , $name ) ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = sprintf( gettext("Cannot fetch object %s"), $name );
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$object->set_status( $cgi->param( "STATUS" ) );
Modified: trunk/vhffs-panel/admin/pgsql/index.pl
===================================================================
--- trunk/vhffs-panel/admin/pgsql/index.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/pgsql/index.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -50,7 +50,7 @@
my $templatedir = $panel->{templatedir};
-my $template = new HTML::Template(filename => $templatedir.'/admin/index.tmpl');
+my $template = new HTML::Template(filename => $templatedir.'/panel/admin/index.tmpl');
$panel->set_title(gettext('PostgreSQL databases\' administration'));
Modified: trunk/vhffs-panel/admin/pgsql/list.pl
===================================================================
--- trunk/vhffs-panel/admin/pgsql/list.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/pgsql/list.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -67,13 +67,13 @@
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/admin/misc/list.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/admin/misc/list.tmpl" );
if( defined( $name ) )
{
@@ -97,10 +97,10 @@
my $send;
my $tmpldbs;
if( $user->is_admin == 1 ) {
- $subtemplate = new HTML::Template( filename => $templatedir.'/admin/pgsql/part.tmpl', global_vars => 1 );
+ $subtemplate = new HTML::Template( filename => $templatedir.'/panel/admin/pgsql/part.tmpl', global_vars => 1 );
$subtemplate->param(SEND => gettext('Modify this PostgreSQL database'));
} else {
- $subtemplate = new HTML::Template( filename => $templatedir.'/admin/pgsql/part-modo.tmpl', global_vars => 1 );
+ $subtemplate = new HTML::Template( filename => $templatedir.'/panel/admin/pgsql/part-modo.tmpl', global_vars => 1 );
$subtemplate->param(SEND => gettext("Show this PostgreSQL database"));
}
Modified: trunk/vhffs-panel/admin/pgsql/search.pl
===================================================================
--- trunk/vhffs-panel/admin/pgsql/search.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/pgsql/search.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -67,13 +67,13 @@
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/admin/web/search.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/admin/web/search.tmpl" );
$template->param( TITLE => gettext("Search for a database") );
Modified: trunk/vhffs-panel/admin/pgsql/show.pl
===================================================================
--- trunk/vhffs-panel/admin/pgsql/show.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/pgsql/show.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -69,25 +69,25 @@
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
elsif( ! defined $name )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "CGI ERROR !");
$template->param( MESSAGE => $message );
}
elsif( ! defined ( $object = Vhffs::Services::Postgres::get_by_dbname( $vhffs , $name ) ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "Cannot fetch object");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/admin/pgsql/show.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/admin/pgsql/show.tmpl" );
$template->param( TITLE => gettext("Show PostgreSQL database") );
Modified: trunk/vhffs-panel/admin/repository/edit.pl
===================================================================
--- trunk/vhffs-panel/admin/repository/edit.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/repository/edit.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -69,25 +69,25 @@
if( $user->is_admin != 1 )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
elsif( ! defined $name )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "CGI ERROR !");
$template->param( MESSAGE => $message );
}
elsif( ! defined ( $object = Vhffs::Services::Repository::get_by_reponame( $vhffs , $name ) ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "Cannot fetch object");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/admin/repository/edit.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/admin/repository/edit.tmpl" );
$template->param( TITLE => gettext("Edit Download repository") );
Modified: trunk/vhffs-panel/admin/repository/edit_submit.pl
===================================================================
--- trunk/vhffs-panel/admin/repository/edit_submit.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/repository/edit_submit.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -71,26 +71,26 @@
if( $user->is_admin != 1 )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
elsif( ! defined $name )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "CGI ERROR !");
$template->param( MESSAGE => $message );
}
elsif( ! defined ( $object = Vhffs::Services::Repository::get_by_reponame( $vhffs , $name ) ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = sprintf( gettext("Cannot fetch object %s"), $name );
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$object->set_status( $cgi->param( "STATUS" ) );
$object->set_quota( $cgi->param( "QUOTA" ) );
Modified: trunk/vhffs-panel/admin/repository/index.pl
===================================================================
--- trunk/vhffs-panel/admin/repository/index.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/repository/index.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -50,7 +50,7 @@
my $templatedir = $panel->{templatedir};
-my $template = new HTML::Template(filename => $templatedir.'/admin/index.tmpl');
+my $template = new HTML::Template(filename => $templatedir.'/panel/admin/index.tmpl');
$panel->set_title(gettext('Download repositories\' administration'));
Modified: trunk/vhffs-panel/admin/repository/list.pl
===================================================================
--- trunk/vhffs-panel/admin/repository/list.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/repository/list.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -68,13 +68,13 @@
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => "$templatesdir/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatesdir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => "$templatesdir/admin/misc/list.tmpl" );
+ $template = new HTML::Template( filename => $templatesdir."/panel/admin/misc/list.tmpl" );
if( defined( $name ) )
{
@@ -97,10 +97,10 @@
my $send;
my $tmplrepos;
if( $user->is_admin == 1 ) {
- $subtemplate = new HTML::Template( filename => "$templatesdir/admin/repository/part.tmpl", global_vars => 1 );
+ $subtemplate = new HTML::Template( filename => $templatesdir."/panel/admin/repository/part.tmpl", global_vars => 1 );
$subtemplate->param(SEND => gettext('Modify this Download repository'));
} else {
- $subtemplate = new HTML::Template( filename => "$templatesdir/admin/repository/part-modo.tmpl", global_vars => 1 );
+ $subtemplate = new HTML::Template( filename => $templatesdir."/panel/admin/repository/part-modo.tmpl", global_vars => 1 );
$subtemplate->param(SEND => gettext('Show this Download repository'));
}
Modified: trunk/vhffs-panel/admin/repository/search.pl
===================================================================
--- trunk/vhffs-panel/admin/repository/search.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/repository/search.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -66,13 +66,13 @@
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => "$templatesdir/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatesdir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => "$templatesdir/admin/repository/search.tmpl" );
+ $template = new HTML::Template( filename => $templatesdir."/panel/admin/repository/search.tmpl" );
$template->param( TITLE => gettext("Search for a Download repository") );
Modified: trunk/vhffs-panel/admin/repository/show.pl
===================================================================
--- trunk/vhffs-panel/admin/repository/show.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/repository/show.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -69,25 +69,25 @@
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
elsif( ! defined $name )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "CGI ERROR !");
$template->param( MESSAGE => $message );
}
elsif( ! defined ( $object = Vhffs::Services::Repository::get_by_reponame( $vhffs , $name ) ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "Cannot fetch object");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/admin/repository/show.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/admin/repository/show.tmpl" );
$template->param( TITLE => gettext("Show Download repository") );
Modified: trunk/vhffs-panel/admin/stats.pl
===================================================================
--- trunk/vhffs-panel/admin/stats.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/stats.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -69,7 +69,7 @@
if( ! defined $stats )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "Cannot get statistics");
$template->param( MESSAGE => $message );
@@ -77,13 +77,13 @@
elsif( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/admin/misc/stats.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/admin/misc/stats.tmpl" );
$template->param( TITLE => gettext("Vhffs Statistics") );
Modified: trunk/vhffs-panel/admin/su.pl
===================================================================
--- trunk/vhffs-panel/admin/su.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/su.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -65,13 +65,13 @@
if( $user->is_admin != 1 )
{
- $template = new HTML::Template( filename => "$templatesdir/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatesdir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => "$templatesdir/admin/misc/su.tmpl" );
+ $template = new HTML::Template( filename => $templatesdir."/panel/admin/misc/su.tmpl" );
$template->param( TITLE => gettext("Change user-id") );
Modified: trunk/vhffs-panel/admin/svn/index.pl
===================================================================
--- trunk/vhffs-panel/admin/svn/index.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/svn/index.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -50,7 +50,7 @@
my $templatedir = $panel->{templatedir};
-my $template = new HTML::Template(filename => $templatedir.'/admin/index.tmpl');
+my $template = new HTML::Template(filename => $templatedir.'/panel/admin/index.tmpl');
$panel->set_title(gettext('SVN repositories\' administration'));
Modified: trunk/vhffs-panel/admin/svn/list.pl
===================================================================
--- trunk/vhffs-panel/admin/svn/list.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/svn/list.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -57,12 +57,12 @@
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => "$templatesdir/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatesdir."/panel/misc/simplemsg.tmpl" );
$template->param( MESSAGE => gettext( "You are not allowed to see it") );
}
else
{
- $template = new HTML::Template( filename => "$templatesdir/admin/misc/list.tmpl" );
+ $template = new HTML::Template( filename => $templatesdir."/panel/admin/misc/list.tmpl" );
if( defined( $name ) )
{
@@ -83,10 +83,10 @@
{
my $subtemplate;
if( $user->is_admin == 1 ) {
- $subtemplate = new HTML::Template( filename => "$templatesdir/admin/svn/part.tmpl", global_vars => 1 );
+ $subtemplate = new HTML::Template( filename => $templatesdir."/panel/admin/svn/part.tmpl", global_vars => 1 );
$subtemplate->param(SEND => gettext('Modify this Subversion repository'));
} else {
- $subtemplate = new HTML::Template( filename => "$templatesdir/admin/svn/part-modo.tmpl", global_vars => 1, die_on_bad_params => 0);
+ $subtemplate = new HTML::Template( filename => $templatesdir."/panel/admin/svn/part-modo.tmpl", global_vars => 1, die_on_bad_params => 0);
}
$subtemplate->param( SVNREPOS => $repos);
$template->param( LIST => $subtemplate->output );
Modified: trunk/vhffs-panel/admin/svn/search.pl
===================================================================
--- trunk/vhffs-panel/admin/svn/search.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/svn/search.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -68,13 +68,13 @@
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => "$templatesdir/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatesdir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => "$templatesdir/admin/svn/search.tmpl" );
+ $template = new HTML::Template( filename => $templatesdir."/panel/admin/svn/search.tmpl" );
$template->param( TITLE => gettext("Search for a SVN repository") );
Modified: trunk/vhffs-panel/admin/user/edit.pl
===================================================================
--- trunk/vhffs-panel/admin/user/edit.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/user/edit.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -69,25 +69,25 @@
if( $user->is_admin != 1 )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
elsif( ! defined $username )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "CGI ERROR !");
$template->param( MESSAGE => $message );
}
elsif( ! defined ( $object = Vhffs::User::get_by_username( $vhffs , $username ) ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "Cannot fetch object");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/admin/user/edit.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/admin/user/edit.tmpl" );
$template->param( TITLE => gettext("Edit User") );
@@ -221,7 +221,7 @@
my $tmp = "";
foreach $g ( @{$groups} )
{
- $subtemplate = new HTML::Template( filename => $templatedir."/admin/user/group-part.tmpl" );
+ $subtemplate = new HTML::Template( filename => $templatedir."/panel/admin/user/group-part.tmpl" );
$subtemplate->param( GROUPNAME => $g->get_groupname );
$subtemplate->param( OWNER_TEXT => gettext("Owner of this group") );
$subtemplate->param( OWNER => $g->get_owner_username );
@@ -253,7 +253,7 @@
if( $vhffs->get_config->use_notation == 1 )
{
use Vhffs::Note;
- my $subtemplate = new HTML::Template( filename => $templatedir."/admin/user/edit-note.tmpl" );
+ my $subtemplate = new HTML::Template( filename => $templatedir."/panel/admin/user/edit-note.tmpl" );
$subtemplate->param( TEXT_NOTE => "Note" );
$subtemplate->param( VALUE_NOTE => Vhffs::Note::get_note( $vhffs , $object ) );
$subtemplate->param( VALUE_USERNAME => $object->get_username );
Modified: trunk/vhffs-panel/admin/user/edit_note.pl
===================================================================
--- trunk/vhffs-panel/admin/user/edit_note.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/user/edit_note.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -68,7 +68,7 @@
my $message;
my $templatedir = $vhffs->get_config->get_templatedir;
-$template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+$template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
if( $user->is_admin != 1 )
{
Modified: trunk/vhffs-panel/admin/user/edit_submit.pl
===================================================================
--- trunk/vhffs-panel/admin/user/edit_submit.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/user/edit_submit.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -78,7 +78,7 @@
my $country;
my $address;
my $templatedir = $vhffs->get_config->get_templatedir;
-$template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+$template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
if( $user->is_admin != 1 )
{
Modified: trunk/vhffs-panel/admin/user/index.pl
===================================================================
--- trunk/vhffs-panel/admin/user/index.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/user/index.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -50,7 +50,7 @@
my $templatedir = $panel->{templatedir};
-my $template = new HTML::Template(filename => $templatedir.'/admin/index.tmpl');
+my $template = new HTML::Template(filename => $templatedir.'/panel/admin/index.tmpl');
$panel->set_title(gettext('Users\' administration'));
Modified: trunk/vhffs-panel/admin/user/list.pl
===================================================================
--- trunk/vhffs-panel/admin/user/list.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/user/list.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -59,13 +59,13 @@
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/admin/misc/list.tmpl", die_on_bad_params => 0 );
+ $template = new HTML::Template( filename => $templatedir."/panel/admin/misc/list.tmpl", die_on_bad_params => 0 );
if( defined( $name ) )
{
@@ -87,11 +87,11 @@
my $subtemplate;
if( $user->is_admin == 1 ) {
- $subtemplate = new HTML::Template( filename => $templatedir.'/admin/user/part.tmpl',
+ $subtemplate = new HTML::Template( filename => $templatedir.'/panel/admin/user/part.tmpl',
global_vars => 1, die_on_bad_params => 0 );
$subtemplate->param( SEND => gettext('Modify this user') );
} else {
- $subtemplate = new HTML::Template( filename => $templatedir.'/admin/user/part-modo.tmpl', global_vars => 1 );
+ $subtemplate = new HTML::Template( filename => $templatedir.'/panel/admin/user/part-modo.tmpl', global_vars => 1 );
$subtemplate->param( SEND => gettext('Show this user'), die_on_bad_params => 0);
}
Modified: trunk/vhffs-panel/admin/user/search.pl
===================================================================
--- trunk/vhffs-panel/admin/user/search.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/user/search.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -67,13 +67,13 @@
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/admin/user/search.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/admin/user/search.tmpl" );
$template->param( TITLE => gettext("Search for an user") );
Modified: trunk/vhffs-panel/admin/user/show.pl
===================================================================
--- trunk/vhffs-panel/admin/user/show.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/user/show.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -71,25 +71,25 @@
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
elsif( ! defined $username )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "CGI ERROR !");
$template->param( MESSAGE => $message );
}
elsif( ! defined ( $object = Vhffs::User::get_by_username( $vhffs , $username ) ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "Cannot fetch object");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/admin/user/show.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/admin/user/show.tmpl" );
$template->param( TITLE => gettext("Show User") );
Modified: trunk/vhffs-panel/admin/web/edit.pl
===================================================================
--- trunk/vhffs-panel/admin/web/edit.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/web/edit.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -69,25 +69,25 @@
if( $user->is_admin != 1 )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
elsif( ! defined $webname )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "CGI ERROR !");
$template->param( MESSAGE => $message );
}
elsif( ! defined ( $object = Vhffs::Services::Httpd::get_by_servername( $vhffs , $webname ) ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "Cannot fetch object");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/admin/web/edit.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/admin/web/edit.tmpl" );
$template->param( TITLE => gettext("Edit Web Area") );
Modified: trunk/vhffs-panel/admin/web/edit_submit.pl
===================================================================
--- trunk/vhffs-panel/admin/web/edit_submit.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/web/edit_submit.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -69,26 +69,26 @@
if( $user->is_admin != 1 )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
elsif( ! defined $servername )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "CGI ERROR !");
$template->param( MESSAGE => $message );
}
elsif( ! defined ( $object = Vhffs::Services::Httpd::get_by_servername( $vhffs , $servername ) ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "Cannot fetch object");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$object->set_status( $cgi->param( "STATUS" ) );
Modified: trunk/vhffs-panel/admin/web/index.pl
===================================================================
--- trunk/vhffs-panel/admin/web/index.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/web/index.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -50,7 +50,7 @@
my $templatedir = $panel->{templatedir};
-my $template = new HTML::Template(filename => $templatedir.'/admin/index.tmpl');
+my $template = new HTML::Template(filename => $templatedir.'/panel/admin/index.tmpl');
$panel->set_title(gettext('Webareas\' administration'));
Modified: trunk/vhffs-panel/admin/web/list.pl
===================================================================
--- trunk/vhffs-panel/admin/web/list.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/web/list.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -58,13 +58,13 @@
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/admin/misc/list.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/admin/misc/list.tmpl" );
if( defined( $name ) )
{
@@ -87,10 +87,10 @@
my $subtemplate;
if( $user->is_admin == 1 ) {
- $subtemplate = new HTML::Template( filename => $templatedir."/admin/web/part.tmpl", global_vars => 1 );
+ $subtemplate = new HTML::Template( filename => $templatedir."/panel/admin/web/part.tmpl", global_vars => 1 );
$subtemplate->param( SEND => gettext('Change this Website') );
} else {
- $subtemplate = new HTML::Template( filename => $templatedir."/admin/web/part-modo.tmpl", global_vars => 1 );
+ $subtemplate = new HTML::Template( filename => $templatedir."/panel/admin/web/part-modo.tmpl", global_vars => 1 );
$subtemplate->param( SEND => gettext('Show this Website'));
}
Modified: trunk/vhffs-panel/admin/web/search.pl
===================================================================
--- trunk/vhffs-panel/admin/web/search.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/web/search.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -67,13 +67,13 @@
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/admin/web/search.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/admin/web/search.tmpl" );
$template->param( TITLE => gettext("Search for a web area") );
Modified: trunk/vhffs-panel/admin/web/show.pl
===================================================================
--- trunk/vhffs-panel/admin/web/show.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/admin/web/show.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -69,25 +69,25 @@
if( ($user->is_moderator != 1 ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "You are not allowed to see it");
$template->param( MESSAGE => $message );
}
elsif( ! defined $webname )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "CGI ERROR !");
$template->param( MESSAGE => $message );
}
elsif( ! defined ( $object = Vhffs::Services::Httpd::get_by_servername( $vhffs , $webname ) ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "Cannot fetch object");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/admin/web/show.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/admin/web/show.tmpl" );
$template->param( TITLE => gettext("Show Web Area") );
Modified: trunk/vhffs-panel/alert.pl
===================================================================
--- trunk/vhffs-panel/alert.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/alert.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -62,7 +62,7 @@
my $template;
my $templatedir = $vhffs->get_config->get_templatedir;
-$template = new HTML::Template( filename => $templatedir."/misc/alert.tmpl" );
+$template = new HTML::Template( filename => $templatedir."/panel/misc/alert.tmpl" );
$template->param( TITLE => gettext("Warn the admin team") );
$template->param( EXPLAIN => gettext("Here, you can report a bug to the admin team") );
Modified: trunk/vhffs-panel/alert_submit.pl
===================================================================
--- trunk/vhffs-panel/alert_submit.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/alert_submit.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -63,7 +63,7 @@
my $templatedir = $vhffs->get_config->get_templatedir;
-$template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+$template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
if( defined $cgi->param("MESSAGE") )
Modified: trunk/vhffs-panel/cvs/create.pl
===================================================================
--- trunk/vhffs-panel/cvs/create.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/cvs/create.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -90,7 +90,7 @@
}
if(!$submitted || $panel->has_errors()) {
- my $template = new HTML::Template( filename => $templatedir."/cvs/create.tmpl" );
+ my $template = new HTML::Template( filename => $templatedir."/panel/cvs/create.tmpl" );
$panel->set_title( gettext('Create a CVS Repository') );
Modified: trunk/vhffs-panel/cvs/delete.pl
===================================================================
--- trunk/vhffs-panel/cvs/delete.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/cvs/delete.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -104,7 +104,7 @@
}
}
-my $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+my $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$template->param( MESSAGE => $message );
display Vhffs::Panel::Main($panel, $template->output);
Modified: trunk/vhffs-panel/cvs/prefs.pl
===================================================================
--- trunk/vhffs-panel/cvs/prefs.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/cvs/prefs.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -68,23 +68,23 @@
my $templatedir = $vhffs->get_config->get_templatedir;
if( ! defined $repo_name ) {
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "CGI Error !");
$template->param( MESSAGE => $message );
} elsif( !defined($cvs = Vhffs::Services::Cvs::get_by_cvsroot($vhffs, $repo_name) ) ) {
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "Cannot get informations on this object");
$template->param( MESSAGE => $message );
} elsif( ( Vhffs::Acl::what_perm_for_user( $user , $cvs , $vhffs ) < Vhffs::Constants::ACL_VIEW ) && ( $user->is_admin != 1 ) ) {
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "You're not allowed to do this (ACL rights)");
$template->param( MESSAGE => $message );
} elsif( ( $cvs->get_status != Vhffs::Constants::ACTIVATED ) && ( $user->is_admin != 1 ) ) {
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "This object is not functionnal yet. Please wait creation, moderation or modification.");
$template->param( MESSAGE => $message );
} else {
- $template = new HTML::Template( filename => $templatedir."/cvs/prefs.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/cvs/prefs.tmpl" );
$panel->set_title( gettext('Admin CVS Repository') );
Modified: trunk/vhffs-panel/cvs/prefs_save.pl
===================================================================
--- trunk/vhffs-panel/cvs/prefs_save.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/cvs/prefs_save.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -117,7 +117,7 @@
}
}
-my $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+my $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$template->param( MESSAGE => $message );
set_refresh_url Vhffs::Panel::Main($panel, "/panel.pl?project=".$cvs->get_group->get_groupname, 0);
Modified: trunk/vhffs-panel/dns/create.pl
===================================================================
--- trunk/vhffs-panel/dns/create.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/dns/create.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -53,7 +53,7 @@
}
if(!$submitted || $panel->has_errors()) {
- my $template = new HTML::Template( filename => $templatedir.'/dns/create.tmpl' );
+ my $template = new HTML::Template( filename => $templatedir.'/panel/dns/create.tmpl' );
$panel->set_title( gettext('Create a DNS') );
Modified: trunk/vhffs-panel/dns/delete.pl
===================================================================
--- trunk/vhffs-panel/dns/delete.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/dns/delete.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -72,7 +72,7 @@
my $output = "";
my $message;
-$template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+$template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
if( ! defined $domain_name )
{
Modified: trunk/vhffs-panel/dns/prefs.pl
===================================================================
--- trunk/vhffs-panel/dns/prefs.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/dns/prefs.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -75,28 +75,28 @@
if( ! defined $domain_name )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "CGI Error!");
$template->param( MESSAGE => $message );
}
elsif( !defined $dns)
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "Cannot get informations on this object");
$template->param( MESSAGE => $message );
}
elsif( ( Vhffs::Acl::what_perm_for_user( $user , $dns , $vhffs ) < Vhffs::Constants::ACL_VIEW ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext("You're not allowed to do this (ACL rights)");
$template->param( MESSAGE => $message );
}
elsif( ( $dns->get_status != Vhffs::Constants::ACTIVATED ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "This object is not functionnal yet. Please wait creation or moderation.");
$template->param( MESSAGE => $message );
}
@@ -240,7 +240,7 @@
my $txt = $dns->get_txt_type;
$panel->set_title(sprintf(gettext("DNS Administration - %s"), $domain_name));
- $template = new HTML::Template( filename => $templatedir."/dns/prefs.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/dns/prefs.tmpl" );
$template->param( DOMAIN_NAME => $domain_name );
@@ -322,7 +322,7 @@
$template->param( TXT_NAME_TEXT => gettext('Name for record') );
if( scalar(keys %{$a_rr}) ) {
- my $thirdtemplate = new HTML::Template( filename => $templatedir.'/dns/list_a_sub.tmpl', global_vars => 1, die_on_bad_params => 0);
+ my $thirdtemplate = new HTML::Template( filename => $templatedir.'/panel/dns/list_a_sub.tmpl', global_vars => 1, die_on_bad_params => 0);
my @list_a = sort {$a->{name} cmp $b->{name}} values(%{$a_rr});
$thirdtemplate->param( LIST_HELP => sprintf(gettext( '@ represents the origin (%s)' ), $domain_name) );
$thirdtemplate->param( DEL => gettext( 'Delete' ) );
@@ -335,7 +335,7 @@
}
if( scalar(keys %{$aaaa}) ) {
- my $thirdtemplate = new HTML::Template( filename => $templatedir.'/dns/list_aaaa_sub.tmpl', global_vars => 1, die_on_bad_params => 0);
+ my $thirdtemplate = new HTML::Template( filename => $templatedir.'/panel/dns/list_aaaa_sub.tmpl', global_vars => 1, die_on_bad_params => 0);
my @list_aaaa = sort {$a->{name} cmp $b->{name}} values(%{$aaaa});
$thirdtemplate->param( DEL => gettext( 'Delete' ) );
$thirdtemplate->param( DOMAIN => $domain_name );
@@ -348,7 +348,7 @@
if( scalar(keys %{$mx} ) ) {
- $thirdtemplate = new HTML::Template( filename => $templatedir.'/dns/list_mx_sub.tmpl', global_vars => 1, die_on_bad_params => 0 );
+ $thirdtemplate = new HTML::Template( filename => $templatedir.'/panel/dns/list_mx_sub.tmpl', global_vars => 1, die_on_bad_params => 0 );
my @list_mx = sort {$a->{aux} <=> $b->{aux}} values(%{$mx});
$thirdtemplate->param( DEL => gettext( 'Delete' ) );
$thirdtemplate->param( DOMAIN => $domain_name );
@@ -361,7 +361,7 @@
}
if( scalar(keys %{$cnames} ) ) {
- $thirdtemplate = new HTML::Template( filename => $templatedir.'/dns/list_cname_sub.tmpl', global_vars => 1, die_on_bad_params => 0 );
+ $thirdtemplate = new HTML::Template( filename => $templatedir.'/panel/dns/list_cname_sub.tmpl', global_vars => 1, die_on_bad_params => 0 );
$thirdtemplate->param( DEL => gettext( 'Delete' ) );
$thirdtemplate->param( MODIFY => gettext( 'Modify' ) );
$thirdtemplate->param( DOMAIN => $domain_name );
@@ -377,7 +377,7 @@
if( scalar(keys %{$ns}) ) {
my @list_ns = sort {$a->{data} cmp $b->{data}} values(%{$ns});
- $thirdtemplate = new HTML::Template( filename => $templatedir.'/dns/list_ns_sub.tmpl', global_vars => 1, die_on_bad_params => 0 );
+ $thirdtemplate = new HTML::Template( filename => $templatedir.'/panel/dns/list_ns_sub.tmpl', global_vars => 1, die_on_bad_params => 0 );
$thirdtemplate->param( DEL => gettext( 'Delete' ) );
$thirdtemplate->param( DOMAIN => $domain_name );
$thirdtemplate->param( NS_RR => \@list_ns );
@@ -388,7 +388,7 @@
if( scalar(keys %{$srv}) ) {
my @list_srv = sort {$a->{name} cmp $b->{name}} values(%{$srv});
- $thirdtemplate = new HTML::Template( filename => $templatedir.'/dns/list_srv_sub.tmpl', global_vars => 1, die_on_bad_params => 0 );
+ $thirdtemplate = new HTML::Template( filename => $templatedir.'/panel/dns/list_srv_sub.tmpl', global_vars => 1, die_on_bad_params => 0 );
$thirdtemplate->param( DEL => gettext( 'Delete' ) );
$thirdtemplate->param( MODIFY => gettext( 'Modify' ) );
$thirdtemplate->param( DOMAIN => $domain_name );
@@ -404,7 +404,7 @@
if( scalar(keys %{$txt}) ) {
my @list_txt = sort {$a->{data} cmp $b->{data}} values(%{$txt});
- $thirdtemplate = new HTML::Template( filename => $templatedir.'/dns/list_txt_sub.tmpl', global_vars => 1, die_on_bad_params => 0 );
+ $thirdtemplate = new HTML::Template( filename => $templatedir.'/panel/dns/list_txt_sub.tmpl', global_vars => 1, die_on_bad_params => 0 );
$thirdtemplate->param( DEL => gettext( 'Delete' ) );
$thirdtemplate->param( MODIFY => gettext( 'Modify' ) );
$thirdtemplate->param( DOMAIN => $domain_name );
@@ -418,7 +418,7 @@
if( $user->is_admin == 1 )
{
- my $subtemplate = new HTML::Template( filename => $templatedir."/admin/misc/opart.tmpl" );
+ my $subtemplate = new HTML::Template( filename => $templatedir."/panel/admin/misc/opart.tmpl" );
$subtemplate->param( OID => $dns->get_oid );
$subtemplate->param( OPART_TEXT => gettext("Go to object-part admin") );
$subtemplate->param( OPART_TITLE => gettext("Object part") );
Modified: trunk/vhffs-panel/group/create.pl
===================================================================
--- trunk/vhffs-panel/group/create.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/group/create.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -75,7 +75,7 @@
}
if( ! $submitted || $panel->has_errors() ) {
- my $template = new HTML::Template( filename => $templatedir.'/group/create.tmpl' );
+ my $template = new HTML::Template( filename => $templatedir.'/panel/group/create.tmpl' );
$panel->set_title( gettext('Create a Project') );
$template->param( PROJECT_NAME => gettext('Project Name') );
Modified: trunk/vhffs-panel/group/delete.pl
===================================================================
--- trunk/vhffs-panel/group/delete.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/group/delete.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -91,7 +91,7 @@
$message = gettext("This group will be deleted");
}
}
-my $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+my $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$template->param( MESSAGE => $message );
set_refresh_url Vhffs::Panel::Main($panel, "/group/prefs.pl", 0);
Modified: trunk/vhffs-panel/group/prefs.pl
===================================================================
--- trunk/vhffs-panel/group/prefs.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/group/prefs.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -64,18 +64,18 @@
if( ! defined $group ) {
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$template->param( MESSAGE => gettext( "Error. This group doesn't exists") );
} elsif( $group->get_status != Vhffs::Constants::ACTIVATED ) {
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$template->param( MESSAGE => gettext( "This object is not functional yet. Please wait creation or moderation.") );
} elsif( $access_level < Vhffs::Constants::ACL_VIEW && ( $user->is_admin != 1 ) ) {
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$template->param( MESSAGE => gettext( 'You\'re not allowed to do this (ACL rights)' ) );
} else {
my $cgi = $panel->{cgi};
- $template = new HTML::Template( filename => $templatedir.'/group/prefs.tmpl', global_vars => 1 );
+ $template = new HTML::Template( filename => $templatedir.'/panel/group/prefs.tmpl', global_vars => 1 );
if( defined( $cgi->param( 'update_desc_submit' ) ) ) {
# Description modification
@@ -142,7 +142,7 @@
$template->param( ADD_USER_MSG => gettext('User not found') );
} else {
# Let's make a nice table
- my $subtemplate = new HTML::Template( filename => $templatedir.'/group/list_user.tmpl', global_vars => 1, die_on_bad_params => 0 );
+ my $subtemplate = new HTML::Template( filename => $templatedir.'/panel/group/list_user.tmpl', global_vars => 1, die_on_bad_params => 0 );
$subtemplate->param( USERS => $users );
$subtemplate->param( TEXT_ADD => gettext('Add') );
@@ -194,7 +194,7 @@
$template->param( TEXT_SEND => gettext('Add') );
if( $vhffs->get_config->get_panel_avatar ) {
- my $tavatar = new HTML::Template( filename => $templatedir.'/group/prefs_avatar.tmpl', global_vars => 1 );
+ my $tavatar = new HTML::Template( filename => $templatedir.'/panel/group/prefs_avatar.tmpl', global_vars => 1 );
$tavatar->param( SEND_AVATAR => gettext('Update') );
$tavatar->param( TEXT_AVATAR => gettext('Logo') );
$tavatar->param( EXPLAIN_AVATAR => gettext('The avatar is an image to describe the group') );
Modified: trunk/vhffs-panel/history.pl
===================================================================
--- trunk/vhffs-panel/history.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/history.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -80,27 +80,27 @@
if( ! defined $oid )
{
- $template = new HTML::Template( filename => "$templatesdir/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatesdir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "CGI Error !");
$template->param( MESSAGE => $message );
}
elsif( !defined $object )
{
- $template = new HTML::Template( filename => "$templatesdir/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatesdir."/panel/misc/simplemsg.tmpl" );
$message = gettext("Cannot get information on this object");
$template->param( MESSAGE => $message );
}
elsif( ( Vhffs::Acl::what_perm_for_user( $user , $object , $vhffs ) < Vhffs::Constants::ACL_VIEW ) && ( $user->is_admin != 1 ) && ( $user->is_moderator != 1 ) )
{
- $template = new HTML::Template( filename => "$templatesdir/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatesdir."/panel/misc/simplemsg.tmpl" );
$message = gettext("You're not allowed to view this object's ACL");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => "$templatesdir/misc/history.tmpl" );
+ $template = new HTML::Template( filename => $templatesdir."/panel/misc/history.tmpl" );
$template->param( TITLE => gettext("History") );
@@ -118,7 +118,7 @@
{
foreach( sort keys %{$history} )
{
- $subtemplate = new HTML::Template( filename => "$templatesdir/misc/history_part.tmpl" );
+ $subtemplate = new HTML::Template( filename => $templatesdir."/panel/misc/history_part.tmpl" );
$date = Vhffs::Functions::parse_date( $history->{$_}{date} );
if( defined $date )
{
Modified: trunk/vhffs-panel/logout.pl
===================================================================
--- trunk/vhffs-panel/logout.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/logout.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -53,7 +53,7 @@
}
-my $template = new HTML::Template( filename => $templatedir."/main/logout.tmpl" );
+my $template = new HTML::Template( filename => $templatedir."/panel/main/logout.tmpl" );
$template->param( TITLE => gettext("VHFFS Logout") );
$template->param( TEXT_LOGOUT => gettext("You left your VHFFS session!") );
Modified: trunk/vhffs-panel/lost.pl
===================================================================
--- trunk/vhffs-panel/lost.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/lost.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -46,7 +46,7 @@
my $templatedir = $panel->{'templatedir'};
my $cgi = $panel->{'cgi'};
-my $tmpl = new HTML::Template( filename => $templatedir."/main/lost.tmpl", associate => $cgi );
+my $tmpl = new HTML::Template( filename => $templatedir."/panel/main/lost.tmpl", associate => $cgi );
#$tmpl->param( TITLE => gettext("VHFFS Password Lost") );
$tmpl->param( TEXT_LOSTPASS => gettext("You lost your password? You're a bad guy!") );
Modified: trunk/vhffs-panel/lost_ack.pl
===================================================================
--- trunk/vhffs-panel/lost_ack.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/lost_ack.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -73,7 +73,7 @@
my $content = sprintf("Hello %s %s,\n\nYou asked for a new password, here are your new login information:\nUser: %s\nPassword: %s\n\nVHFFS Administrators\n", $user->get_firstname, $user->get_lastname, $user->get_username, $plainpassword );
$user->send_mail_user( $subject, $content );
- $template = new HTML::Template( filename => $templatedir."/main/lost_ok.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/main/lost_ok.tmpl" );
$template->param( TITLE => gettext("VHFFS Password Lost OK") );
$template->param( TEXT_WAITPASS => sprintf( gettext("Please wait %s, a new password will be sent to you in a few minutes..."), $username ) );
@@ -84,7 +84,7 @@
else
{
#if user is not know by VHFFS, we return an error
- $template = new HTML::Template( filename => $templatedir."/main/lost_failed.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/main/lost_failed.tmpl" );
$template->param( TITLE => gettext("VHFFS Password Lost failed") );
$template->param( TEXT_FAILED => gettext("Password recovery failed!") );
Modified: trunk/vhffs-panel/mail/add_account.pl
===================================================================
--- trunk/vhffs-panel/mail/add_account.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/mail/add_account.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -71,33 +71,33 @@
if( !defined $mail )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "Cannot get informations on this object");
$template->param( MESSAGE => $message );
}
elsif( ( ! defined $password ) || ( ! defined $boxname ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "CGI ERROR");
$template->param( MESSAGE => $message );
}
elsif( $mail->get_status != Vhffs::Constants::ACTIVATED )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "This object is not functionnal yet. Please wait creation or moderation.");
$template->param( MESSAGE => $message );
}
elsif( ( Vhffs::Acl::what_perm_for_user( $user , $mail , $vhffs ) < Vhffs::Constants::ACL_VIEW ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext("You're not allowed to do this (ACL rights)");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
if( $mail->addbox( $boxname , $password ) < 0 )
{
Modified: trunk/vhffs-panel/mail/add_forward.pl
===================================================================
--- trunk/vhffs-panel/mail/add_forward.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/mail/add_forward.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -67,7 +67,7 @@
my $mail = Vhffs::Services::Mail::get_by_mxdomain( $vhffs , $domain );
my $templatedir = $vhffs->get_config->get_templatedir;
-$template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+$template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
if( ! defined $mail ) {
$message = gettext( "Cannot get informations on this object");
Modified: trunk/vhffs-panel/mail/change_forward.pl
===================================================================
--- trunk/vhffs-panel/mail/change_forward.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/mail/change_forward.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -72,32 +72,32 @@
if( ! defined $mail )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = sprintf( gettext("Unable to get information on mail domain %s"), $domain );
$template->param( MESSAGE => $message );
}
elsif( ( ! defined $boxname ) || ( ! defined $forward ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "CGI ERROR");
$template->param( MESSAGE => $message );
}
elsif( $mail->get_status != Vhffs::Constants::ACTIVATED )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "This object is not functionnal yet. Please wait creation or moderation.");
$template->param( MESSAGE => $message );
}
elsif( ( Vhffs::Acl::what_perm_for_user( $user , $mail , $vhffs ) < Vhffs::Constants::ACL_VIEW ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext("You're not allowed to do this (ACL rights)");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
if( ( $retour = $mail->change_forward( $boxname , $forward ) ) < 0 )
{
Modified: trunk/vhffs-panel/mail/create.pl
===================================================================
--- trunk/vhffs-panel/mail/create.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/mail/create.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -75,7 +75,7 @@
if( !$submitted || $panel->has_errors() ) {
my $templatedir = $vhffs->get_config->get_templatedir;
- my $template = new HTML::Template( filename => $templatedir.'/mail/create.tmpl' );
+ my $template = new HTML::Template( filename => $templatedir.'/panel/mail/create.tmpl' );
$panel->set_title( gettext('Create a mail space') );
$template->param( DOMAIN_TEXT => gettext('Domain') );
Modified: trunk/vhffs-panel/mail/delete.pl
===================================================================
--- trunk/vhffs-panel/mail/delete.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/mail/delete.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -67,7 +67,7 @@
my $templatedir = $vhffs->get_config->get_templatedir;
-$template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+$template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
if( ! defined $domain )
{
Modified: trunk/vhffs-panel/mail/delete_box.pl
===================================================================
--- trunk/vhffs-panel/mail/delete_box.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/mail/delete_box.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -69,32 +69,32 @@
if( ! defined $mail )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = sprintf( gettext("Unable to get information on mail domain %s"), $domain );
$template->param( MESSAGE => $message );
}
elsif( ! defined $boxname )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "CGI ERROR");
$template->param( MESSAGE => $message );
}
elsif( $mail->get_status != Vhffs::Constants::ACTIVATED )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "This object is not functionnal yet. Please wait creation or moderation.");
$template->param( MESSAGE => $message );
}
elsif( ( Vhffs::Acl::what_perm_for_user( $user , $mail , $vhffs ) < Vhffs::Constants::ACL_VIEW ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext("You're not allowed to do this (ACL rights)");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
if( $mail->delbox( $boxname ) < 0 )
{
Modified: trunk/vhffs-panel/mail/delete_forward.pl
===================================================================
--- trunk/vhffs-panel/mail/delete_forward.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/mail/delete_forward.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -67,7 +67,7 @@
my $templatedir = $vhffs->get_config->get_templatedir;
-$template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+$template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
if( ! defined $mail )
{
Modified: trunk/vhffs-panel/mail/password_box.pl
===================================================================
--- trunk/vhffs-panel/mail/password_box.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/mail/password_box.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -72,32 +72,32 @@
if( ! defined $mail )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = sprintf( gettext("Unable to get information on mail domain %s"), $domain );
$template->param( MESSAGE => $message );
}
elsif( ( ! defined $password ) || ( ! defined $boxname ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "CGI ERROR");
$template->param( MESSAGE => $message );
}
elsif( $mail->get_status != Vhffs::Constants::ACTIVATED )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "This object is not functionnal yet. Please wait creation or moderation.");
$template->param( MESSAGE => $message );
}
elsif( ( Vhffs::Acl::what_perm_for_user( $user , $mail , $vhffs ) < Vhffs::Constants::ACL_VIEW ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext("You're not allowed to do this (ACL rights)");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
if( ( $retour = $mail->change_box_password( $boxname , $password ) ) < 0 )
{
Modified: trunk/vhffs-panel/mail/prefs.pl
===================================================================
--- trunk/vhffs-panel/mail/prefs.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/mail/prefs.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -73,7 +73,7 @@
if( !defined $mail )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = sprintf( gettext("Unable to get information on mail domain %s"), $domain );
$template->param( MESSAGE => $message );
@@ -81,19 +81,19 @@
elsif( ( $mail->get_status != Vhffs::Constants::ACTIVATED ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "This object is not functionnal yet. Please wait creation or moderation.");
$template->param( MESSAGE => $message );
}
elsif( ( Vhffs::Acl::what_perm_for_user( $user , $mail , $vhffs ) < Vhffs::Constants::ACL_VIEW ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext("You're not allowed to do this (ACL rights)");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/mail/prefs.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/mail/prefs.tmpl" );
$template->param( TEXT_TITLE => gettext("Mail Administration for domain ") );
$template->param( VALUE_DOMAIN => $mail->get_domain );
@@ -146,7 +146,7 @@
foreach( sort keys %{$boxes} )
{
$temp = "";
- $subtemplate = new HTML::Template( filename => $templatedir."/mail/prefs_box.tmpl" );
+ $subtemplate = new HTML::Template( filename => $templatedir."/panel/mail/prefs_box.tmpl" );
$subtemplate->param( ACCOUNT => $_ . "\@" . $mail->get_domain );
$subtemplate->param( LOCALPART => $_ );
$subtemplate->param( TEXT_CHANGE_PASSWORD => gettext( "Change Password" ) );
@@ -158,7 +158,7 @@
if( $vhffs->get_config->use_nospam == 1 )
{
- $subtemplate2 = new HTML::Template( filename => $templatedir."/mail/prefs_spam.tmpl" );
+ $subtemplate2 = new HTML::Template( filename => $templatedir."/panel/mail/prefs_spam.tmpl" );
$subtemplate2->param( LOCALPART => $_ );
$subtemplate2->param( DOMAIN => $mail->get_domain );
if( $mail->use_nospam( $_ ) == 1 )
@@ -177,7 +177,7 @@
if( $vhffs->get_config->use_novirus == 1 )
{
- $subtemplate2 = new HTML::Template( filename => $templatedir."/mail/prefs_virus.tmpl" );
+ $subtemplate2 = new HTML::Template( filename => $templatedir."/panel/mail/prefs_virus.tmpl" );
$subtemplate2->param( LOCALPART => $_ );
$subtemplate2->param( DOMAIN => $mail->get_domain );
if( $boxes->{$_}{'novirus'} == 1 )
@@ -204,7 +204,7 @@
my $forwards = $mail->get_forwards;
foreach( sort keys %{$forwards} )
{
- $subtemplate = new HTML::Template( filename => $templatedir."/mail/prefs_forward.tmpl" );
+ $subtemplate = new HTML::Template( filename => $templatedir."/panel/mail/prefs_forward.tmpl" );
$subtemplate->param( LOCAL_PART => $_ . "\@" . $mail->get_domain );
$subtemplate->param( FORWARD_MAIL => $forwards->{$_}{'remote_name'} );
$subtemplate->param( LOCALPART => $_ );
Modified: trunk/vhffs-panel/mail/save_catchall.pl
===================================================================
--- trunk/vhffs-panel/mail/save_catchall.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/mail/save_catchall.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -67,7 +67,7 @@
my $templatedir = $vhffs->get_config->get_templatedir;
my $message;
my $mail = Vhffs::Services::Mail::get_by_mxdomain( $vhffs , $domain );
-$template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+$template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
if( !defined $mail )
{
Modified: trunk/vhffs-panel/mail/spambox.pl
===================================================================
--- trunk/vhffs-panel/mail/spambox.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/mail/spambox.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -72,38 +72,38 @@
if( ! defined $mail )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = sprintf( gettext("Unable to get information on mail domain %s"), $domain );
$template->param( MESSAGE => $message );
}
elsif( ! defined $boxname )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "CGI ERROR");
$template->param( MESSAGE => $message );
}
elsif( $mail->get_status != Vhffs::Constants::ACTIVATED )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "This object is not functionnal yet. Please wait creation or moderation.");
$template->param( MESSAGE => $message );
}
elsif( ( Vhffs::Acl::what_perm_for_user( $user , $mail , $vhffs ) < Vhffs::Constants::ACL_VIEW ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext("You're not allowed to do this (ACL rights)");
$template->param( MESSAGE => $message );
}
elsif( $vhffs->get_config->use_nospam != 1 )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext("Spam protection is not allowed");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
if( ( $retour = $mail->change_spam_status( $boxname ) ) < 0 )
{
Modified: trunk/vhffs-panel/mail/spamvirus.pl
===================================================================
--- trunk/vhffs-panel/mail/spamvirus.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/mail/spamvirus.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -72,38 +72,38 @@
if( ! defined $mail )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = sprintf( gettext("Unable to get information on mail domain %s"), $domain );
$template->param( MESSAGE => $message );
}
elsif( ! defined $boxname )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "CGI ERROR");
$template->param( MESSAGE => $message );
}
elsif( $mail->get_status != Vhffs::Constants::ACTIVATED )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "This object is not functionnal yet. Please wait creation or moderation.");
$template->param( MESSAGE => $message );
}
elsif( ( Vhffs::Acl::what_perm_for_user( $user , $mail , $vhffs ) < Vhffs::Constants::ACL_VIEW ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext("You're not allowed to do this (ACL rights)");
$template->param( MESSAGE => $message );
}
elsif( $vhffs->get_config->use_novirus != 1 )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext("Virus protection is not allowed");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
if( ( $retour = $mail->change_virus_status( $boxname ) ) < 0 )
{
Modified: trunk/vhffs-panel/mailinglist/add_sub.pl
===================================================================
--- trunk/vhffs-panel/mailinglist/add_sub.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/mailinglist/add_sub.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -71,7 +71,7 @@
my $list = Vhffs::Services::Mailing::get_by_mladdress( $vhffs , $lpart , $domain , $user , $group );
-$template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+$template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
if( ( ! defined $lpart ) || ( ! defined $domain ) || ( ! defined $memberlist ) )
Modified: trunk/vhffs-panel/mailinglist/change_right.pl
===================================================================
--- trunk/vhffs-panel/mailinglist/change_right.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/mailinglist/change_right.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -74,7 +74,7 @@
my $list = Vhffs::Services::Mailing::get_by_mladdress( $vhffs, $lpart, $domain );
-$template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+$template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
if( ( ! defined $lpart ) ||( ! defined $domain ) )
{
Modified: trunk/vhffs-panel/mailinglist/create.pl
===================================================================
--- trunk/vhffs-panel/mailinglist/create.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/mailinglist/create.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -99,7 +99,7 @@
$panel->add_error( gettext('There is no default mail domain on this platform, you have to create a mail domain before creating a mailing list') );
display Vhffs::Panel::Main($panel, '');
} else {
- $template = new HTML::Template::Expr( filename => $templatedir."/mailinglist/create.tmpl", global_vars => 1 );
+ $template = new HTML::Template::Expr( filename => $templatedir."/panel/mailinglist/create.tmpl", global_vars => 1 );
$template->param( LIST_TEXT => gettext("Mail for the list") );
$template->param( GROUP_NAME => gettext("Group owning this mailing list") );
Modified: trunk/vhffs-panel/mailinglist/del_member.pl
===================================================================
--- trunk/vhffs-panel/mailinglist/del_member.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/mailinglist/del_member.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -72,7 +72,7 @@
my $list = Vhffs::Services::Mailing::get_by_mladdress( $vhffs, $lpart, $domain );
-$template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+$template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
if( ( ! defined $lpart ) ||( ! defined $domain ) )
{
Modified: trunk/vhffs-panel/mailinglist/delete.pl
===================================================================
--- trunk/vhffs-panel/mailinglist/delete.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/mailinglist/delete.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -71,7 +71,7 @@
my $list = Vhffs::Services::Mailing::get_by_mladdress( $vhffs , $lpart , $domain );
-$template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+$template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
if( ! defined $sure )
{
Modified: trunk/vhffs-panel/mailinglist/prefs.pl
===================================================================
--- trunk/vhffs-panel/mailinglist/prefs.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/mailinglist/prefs.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -80,7 +80,7 @@
if( ! defined $list )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "Cannot get informations on this object".$lpart."/".$domain);
$template->param( MESSAGE => $message );
@@ -88,19 +88,19 @@
elsif( ( $list->get_status != Vhffs::Constants::ACTIVATED ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "This object is not functionnal yet. Please wait creation or moderation.");
$template->param( MESSAGE => $message );
}
elsif( ( Vhffs::Acl::what_perm_for_user( $user , $list , $vhffs ) < Vhffs::Constants::ACL_VIEW ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext("You're not allowed to do this (ACL rights)");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/mailinglist/prefs.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/mailinglist/prefs.tmpl" );
$template->param( TEXT_TITLE => gettext("Administration for list ") );
$template->param( VALUE_LIST => $list->get_localpart . "\@" . $list->get_domain );
@@ -163,7 +163,7 @@
{
foreach( keys %{$subs} )
{
- $subtemplate = new HTML::Template( filename => $templatedir."/mailinglist/list_part.tmpl" );
+ $subtemplate = new HTML::Template( filename => $templatedir."/panel/mailinglist/list_part.tmpl" );
$subtemplate->param( BUTTON_DELETE_MEMBER => gettext("Delete from list") );
$subtemplate->param( BUTTON_CHANGE_RIGHT => gettext("Change rights\n") );
$subtemplate->param( MEMBER => $subs->{$_}{member} );
@@ -212,7 +212,7 @@
if( $user->is_admin == 1 )
{
- $subtemplate = new HTML::Template( filename => $templatedir."/admin/misc/opart.tmpl" );
+ $subtemplate = new HTML::Template( filename => $templatedir."/panel/admin/misc/opart.tmpl" );
$subtemplate->param( OID => $list->get_oid );
$subtemplate->param( OPART_TEXT => gettext("Go to object-part admin") );
$subtemplate->param( OPART_TITLE => gettext("Object part") );
Modified: trunk/vhffs-panel/mailinglist/save_options.pl
===================================================================
--- trunk/vhffs-panel/mailinglist/save_options.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/mailinglist/save_options.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -74,7 +74,7 @@
my $list = Vhffs::Services::Mailing::get_by_mladdress( $vhffs , $lpart , $domain );
-$template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+$template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
if( ( ! defined $lpart ) ||( ! defined $domain ) )
{
Modified: trunk/vhffs-panel/mailinglist/save_sig.pl
===================================================================
--- trunk/vhffs-panel/mailinglist/save_sig.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/mailinglist/save_sig.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -70,7 +70,7 @@
my $list = Vhffs::Services::Mailing::get_by_mladdress( $vhffs , $lpart , $domain );
-$template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+$template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
if( ( ! defined $lpart ) ||( ! defined $domain ) || (! defined $sig) )
{
Modified: trunk/vhffs-panel/mysql/create.pl
===================================================================
--- trunk/vhffs-panel/mysql/create.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/mysql/create.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -54,7 +54,7 @@
my $templatedir = $panel->{templatedir};
my $cgi = $panel->{cgi};
-my $template = new HTML::Template( filename => $templatedir.'/mysql/create.tmpl' );
+my $template = new HTML::Template( filename => $templatedir.'/panel/mysql/create.tmpl' );
my $submitted = defined($cgi->param('mysql_submit'));
my $dbprefix = $groupname.'_';
Modified: trunk/vhffs-panel/mysql/delete.pl
===================================================================
--- trunk/vhffs-panel/mysql/delete.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/mysql/delete.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -98,7 +98,7 @@
}
-my $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+my $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$template->param( MESSAGE => $message );
set_refresh_url Vhffs::Panel::Main($panel, "/mysql/prefs.pl?name=$dbname", 0);
Modified: trunk/vhffs-panel/mysql/prefs.pl
===================================================================
--- trunk/vhffs-panel/mysql/prefs.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/mysql/prefs.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -67,32 +67,32 @@
if( ! defined $dbname )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "CGI Error !");
$template->param( MESSAGE => $message );
}
elsif( ! defined($mysql) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "Cannot get informations on this object");
$template->param( MESSAGE => $message );
}
elsif( Vhffs::Acl::what_perm_for_user( $user , $mysql , $vhffs ) < Vhffs::Constants::ACL_VIEW )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "You're not allowed to do this (ACL rights)" );
$template->param( MESSAGE => $message );
}
elsif( $mysql->get_status != Vhffs::Constants::ACTIVATED )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "This object is not functionnal yet. Please wait creation or moderation.");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/mysql/prefs.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/mysql/prefs.tmpl" );
$template->param( TEXT_TITLE => gettext("MySQL Administration") );
$template->param( TEXT_AVERT => gettext("Be careful ! If you click on modify, VHFFS will stop the database and set a new password for this database.") );
Modified: trunk/vhffs-panel/mysql/prefs_save.pl
===================================================================
--- trunk/vhffs-panel/mysql/prefs_save.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/mysql/prefs_save.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -108,7 +108,7 @@
}
-my $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+my $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$template->param( MESSAGE => $message );
set_refresh_url Vhffs::Panel::Main($panel, "/mysql/prefs.pl?name=$dbname", 0);
Modified: trunk/vhffs-panel/object/upavatar.pl
===================================================================
--- trunk/vhffs-panel/object/upavatar.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/object/upavatar.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -85,7 +85,7 @@
my $templatedir = $vhffs->get_config->get_templatedir;
-my $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+my $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
# Commit all the changes for the current user
if( $vhffs->get_config->get_panel_avatar == 0 )
Modified: trunk/vhffs-panel/panel.pl
===================================================================
--- trunk/vhffs-panel/panel.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/panel.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -94,7 +94,7 @@
if( defined $su_user )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$template->param( MESSAGE => $message );
}
else
Modified: trunk/vhffs-panel/pgsql/create.pl
===================================================================
--- trunk/vhffs-panel/pgsql/create.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/pgsql/create.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -54,7 +54,7 @@
my $templatedir = $panel->{templatedir};
my $cgi = $panel->{cgi};
-my $template = new HTML::Template( filename => $templatedir.'/pgsql/create.tmpl' );
+my $template = new HTML::Template( filename => $templatedir.'/panel/pgsql/create.tmpl' );
my $submitted = defined($cgi->param('pgsql_submit'));
my $dbprefix = $groupname.'_';
Modified: trunk/vhffs-panel/pgsql/delete.pl
===================================================================
--- trunk/vhffs-panel/pgsql/delete.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/pgsql/delete.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -99,7 +99,7 @@
}
-my $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+my $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$template->param( MESSAGE => $message );
set_refresh_url Vhffs::Panel::Main($panel, "/pgsql/prefs.pl?name=$dbname", 0);
Modified: trunk/vhffs-panel/pgsql/prefs.pl
===================================================================
--- trunk/vhffs-panel/pgsql/prefs.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/pgsql/prefs.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -67,26 +67,26 @@
if( ! defined $pgsql)
{
- my $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ my $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "Cannot get informations on this object");
$template->param( MESSAGE => $message );
}
elsif( Vhffs::Acl::what_perm_for_user( $user , $pgsql , $vhffs ) < Vhffs::Constants::ACL_VIEW )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext("You're not allowed to do this (ACL rights)");
$template->param( MESSAGE => $message );
}
elsif( $pgsql->get_status != Vhffs::Constants::ACTIVATED )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext("Please wait modification, creation or deletion");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/pgsql/prefs.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/pgsql/prefs.tmpl" );
$template->param( TEXT_TITLE => gettext("PostgreSQL Administration") );
Modified: trunk/vhffs-panel/pgsql/prefs_save.pl
===================================================================
--- trunk/vhffs-panel/pgsql/prefs_save.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/pgsql/prefs_save.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -102,7 +102,7 @@
}
-my $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+my $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$template->param( MESSAGE => $message );
set_refresh_url Vhffs::Panel::Main($panel, "/pgsql/prefs.pl?name=$dbname", 0);
Modified: trunk/vhffs-panel/repository/create.pl
===================================================================
--- trunk/vhffs-panel/repository/create.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/repository/create.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -79,7 +79,7 @@
}
if(!$submitted || $panel->has_errors()) {
- my $template = new HTML::Template( filename => $templatedir."/repository/create.tmpl" );
+ my $template = new HTML::Template( filename => $templatedir."/panel/repository/create.tmpl" );
$panel->set_title( gettext('Create a Download Repository') );
$template->param( REPOSITORY_NAME => gettext("Repository Name") );
Modified: trunk/vhffs-panel/repository/delete.pl
===================================================================
--- trunk/vhffs-panel/repository/delete.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/repository/delete.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -104,7 +104,7 @@
}
}
-my $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+my $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$template->param( MESSAGE => $message );
display Vhffs::Panel::Main($panel, $template->output);
Modified: trunk/vhffs-panel/repository/prefs.pl
===================================================================
--- trunk/vhffs-panel/repository/prefs.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/repository/prefs.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -68,30 +68,30 @@
my $templatedir = $vhffs->get_config->get_templatedir;
if( ! defined $repo_name ) {
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "CGI Error !");
$template->param( MESSAGE => $message );
} elsif( ! defined $repo ) {
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "Cannot get informations on this object");
$template->param( MESSAGE => $message );
}
elsif( ( Vhffs::Acl::what_perm_for_user( $user , $repo , $vhffs ) < Vhffs::Constants::ACL_VIEW ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "You're not allowed to do this (ACL rights)");
$template->param( MESSAGE => $message );
}
elsif( ( $repo->get_status != Vhffs::Constants::ACTIVATED ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "This object is not functionnal yet. Please wait creation, moderation or modification.");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/repository/prefs.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/repository/prefs.tmpl" );
$panel->set_title( gettext('Admin Download repository') );
$template->param( TEXT_REPONAME => $repo->get_name );
Modified: trunk/vhffs-panel/repository/prefs_save.pl
===================================================================
--- trunk/vhffs-panel/repository/prefs_save.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/repository/prefs_save.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -101,7 +101,7 @@
}
}
-my $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+my $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$template->param( MESSAGE => $message );
set_refresh_url Vhffs::Panel::Main($panel, "/panel.pl?project=".$repo->get_group->get_groupname, 0);
Modified: trunk/vhffs-panel/subscribe.pl
===================================================================
--- trunk/vhffs-panel/subscribe.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/subscribe.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -81,7 +81,7 @@
if( $vhffs->get_config->get_allow_subscribe == 0 )
{
# Subscribe isn't allowed, inform user
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl");
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl");
$template->param( MESSAGE => gettext("You cannot subscribe to VHFFS") );
} elsif( defined $submitted ) {
# don't check if form hasn't been submitted
@@ -183,7 +183,7 @@
{
my $good_news = gettext("User Successfully created");
my $good_news2 = gettext("Please wait while we are creating the account, it will take some minutes");
- $template = new HTML::Template( filename => $templatedir."/user/create_complete.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/user/create_complete.tmpl" );
$template->param( TEXT_BACK => gettext("Back to Login") );
$template->param( GOOD_NEWS => $good_news );
$template->param( GOOD_NEWS2 => $good_news2 );
@@ -191,7 +191,7 @@
}
}
if ( ( scalar @errors ) > 0 ) {
- $template = new HTML::Template( filename => $templatedir."/user/create.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/user/create.tmpl" );
# There was an error, fill the template parameter
$template->param( ERRORS => \@errors );
$template->param( USERNAME_VALUE => $username );
@@ -205,7 +205,7 @@
}
} else {
- $template = new HTML::Template( filename => $templatedir."/user/create.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/user/create.tmpl" );
}
if( ( ! defined $submitted ) || (scalar @errors) != 0 ) {
Modified: trunk/vhffs-panel/svn/create.pl
===================================================================
--- trunk/vhffs-panel/svn/create.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/svn/create.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -83,7 +83,7 @@
}
if(!$submitted || $panel->has_errors) {
- my $template = new HTML::Template( filename => $templatedir.'/svn/create.tmpl' );
+ my $template = new HTML::Template( filename => $templatedir.'/panel/svn/create.tmpl' );
$panel->set_title( gettext("Create a Subversion Repository") );
$template->param( REPOSITORY_NAME => gettext("Repository Name") );
Modified: trunk/vhffs-panel/svn/delete.pl
===================================================================
--- trunk/vhffs-panel/svn/delete.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/svn/delete.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -103,7 +103,7 @@
}
}
-my $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+my $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$template->param( MESSAGE => $message );
display Vhffs::Panel::Main($panel, $template->output);
Modified: trunk/vhffs-panel/svn/prefs.pl
===================================================================
--- trunk/vhffs-panel/svn/prefs.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/svn/prefs.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -78,37 +78,37 @@
if( ! defined $repo_name )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "CGI Error" );
$template->param( MESSAGE => $message );
}
elsif( ! defined $group )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$template->param( MESSAGE => gettext("Grant an user access to this repository") );
}
elsif( !defined $svn )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "Cannot get informations on this object");
$template->param( MESSAGE => $message );
}
elsif( ( Vhffs::Acl::what_perm_for_user( $user , $svn , $vhffs ) < Vhffs::Constants::ACL_VIEW ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "You're not allowed to do this (ACL rights)");
$template->param( MESSAGE => $message );
}
elsif( ( $svn->get_status != Vhffs::Constants::ACTIVATED ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$message = gettext( "This object is not functionnal yet. Please wait creation, moderation or modification.");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/svn/prefs.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/svn/prefs.tmpl" );
$template->param( TEXT_TITLE => gettext("Admin Subversion Repository") );
@@ -155,7 +155,7 @@
if( $user->is_admin == 1 )
{
- $subtemplate = new HTML::Template( filename => $templatedir."/admin/misc/opart.tmpl" );
+ $subtemplate = new HTML::Template( filename => $templatedir."/panel/admin/misc/opart.tmpl" );
$subtemplate->param( OID => $svn->get_oid );
$subtemplate->param( OPART_TEXT => gettext("Go to object-part admin") );
$subtemplate->param( OPART_TITLE => gettext("Object part") );
Modified: trunk/vhffs-panel/svn/prefs_save.pl
===================================================================
--- trunk/vhffs-panel/svn/prefs_save.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/svn/prefs_save.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -126,7 +126,7 @@
}
}
-my $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+my $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$template->param( MESSAGE => $message );
set_refresh_url Vhffs::Panel::Main($panel, "/panel.pl?project=".$svn->get_group->get_groupname, 0);
Modified: trunk/vhffs-panel/templates/Makefile.am
===================================================================
--- trunk/vhffs-panel/templates/Makefile.am 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/templates/Makefile.am 2007-07-17 14:39:47 UTC (rev 731)
@@ -1,4 +1,4 @@
-paneltemplatesdir = @TEMPLATESDIR@
+paneltemplatesdir = @TEMPLATESDIR@/panel
nobase_paneltemplates_DATA = \
acl/view_each.tmpl \
acl/view.tmpl \
@@ -127,24 +127,6 @@
mysql/prefs.tmpl \
pgsql/create.tmpl \
pgsql/prefs.tmpl \
- public/allwebsites.tmpl \
- public/banner.tmpl \
- public/group_part.tmpl \
- public/group.tmpl \
- public/index.tmpl \
- public/largefile.tmpl \
- public/lastgroups.tmpl \
- public/lastusers.tmpl \
- public/misc/cvs-part.tmpl \
- public/misc/largefile-dl.tmpl \
- public/misc/lastgroups-part.tmpl \
- public/misc/lastusers-part.tmpl \
- public/misc/list-part.tmpl \
- public/misc/svn-part.tmpl \
- public/misc/web-part.tmpl \
- public/simplemsg.tmpl \
- public/user_part.tmpl \
- public/user.tmpl \
repository/create.tmpl \
repository/prefs.tmpl \
svn/create.tmpl \
Modified: trunk/vhffs-panel/templates/main/auth.tmpl
===================================================================
--- trunk/vhffs-panel/templates/main/auth.tmpl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/templates/main/auth.tmpl 2007-07-17 14:39:47 UTC (rev 731)
@@ -62,7 +62,7 @@
<tmpl_var name="TEXT_STATS">
</p>
<p>
- <a href="public/index.pl"><tmpl_var name="TEXT_PUBLIC"></a>
+ <a href="<tmpl_var name="URL_PUBLIC">"><tmpl_var name="TEXT_PUBLIC"></a>
</p>
</div>
Deleted: trunk/vhffs-panel/themes/vhffs/images/largefile.png
===================================================================
(Binary files differ)
Deleted: trunk/vhffs-panel/themes/vhffs/images/largefilecreate.png
===================================================================
(Binary files differ)
Deleted: trunk/vhffs-panel/themes/vhffs/images/largefileentry.png
===================================================================
(Binary files differ)
Modified: trunk/vhffs-panel/user/delete.pl
===================================================================
--- trunk/vhffs-panel/user/delete.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/user/delete.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -95,7 +95,7 @@
}
-my $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+my $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$template->param( MESSAGE => $message );
set_refresh_url Vhffs::Panel::Main($panel, "/panel.pl?project=$groupname", 0);
Modified: trunk/vhffs-panel/user/prefs.pl
===================================================================
--- trunk/vhffs-panel/user/prefs.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/user/prefs.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -256,7 +256,7 @@
$panel->set_title( gettext("User Preferences") );
my $templatedir = $vhffs->get_config->get_templatedir;
-my $template = new HTML::Template( filename => $templatedir."/user/prefs.tmpl" );
+my $template = new HTML::Template( filename => $templatedir."/panel/user/prefs.tmpl" );
$template->param( TEXT_USERNAME => gettext("Username") );
$template->param( TEXT_MAIL => gettext("mail") );
@@ -291,7 +291,7 @@
if( $vhffs->get_config->get_panel_avatar() ) {
- my $ta = new HTML::Template( filename => $templatedir."/user/prefs_avatar.tmpl" );
+ my $ta = new HTML::Template( filename => $templatedir."/panel/user/prefs_avatar.tmpl" );
$ta->param( SEND_AVATAR => gettext("Send my avatar") );
$ta->param( CURRENT_AVATAR => gettext("Current avatar") );
@@ -360,7 +360,7 @@
{
use Vhffs::Services::MailUser;
- my $subtemplate = new HTML::Template( filename => $templatedir."/user/mailuser.tmpl" );
+ my $subtemplate = new HTML::Template( filename => $templatedir."/panel/user/mailuser.tmpl" );
my $subtemplate2;
my $config = $vhffs->get_config->get_service( "mailuser" );
my $mu = init Vhffs::Services::MailUser( $vhffs , $user );
@@ -380,7 +380,7 @@
if( $vhffs->get_config->use_nospam == 1 )
{
- $subtemplate2 = new HTML::Template( filename => $templatedir."/user/mailuserspam.tmpl" );
+ $subtemplate2 = new HTML::Template( filename => $templatedir."/panel/user/mailuserspam.tmpl" );
$subtemplate2->param( TEXT_NOSPAM => gettext("Use anti-spam protection") );
$subtemplate2->param( ACTIV_CHECKED => "checked" ) if( $mu->use_nospam == 1 );
$tmp .= $subtemplate2->output;
@@ -388,7 +388,7 @@
if( $vhffs->get_config->use_novirus == 1 )
{
- $subtemplate2 = new HTML::Template( filename => $templatedir."/user/mailuservirus.tmpl" );
+ $subtemplate2 = new HTML::Template( filename => $templatedir."/panel/user/mailuservirus.tmpl" );
$subtemplate2->param( TEXT_VIRUS => gettext("Use anti-virus protection") );
$subtemplate2->param( ACTIV_CHECKED => "checked" ) if( $mu->use_novirus == 1 );
$tmp .= $subtemplate2->output;
Modified: trunk/vhffs-panel/user/projects.pl
===================================================================
--- trunk/vhffs-panel/user/projects.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/user/projects.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -47,7 +47,7 @@
my $templatedir = $vhffs->get_config->get_templatedir;
$panel->set_title( gettext('My Projects') );
-my $template = new HTML::Template( filename => $templatedir.'/user/projects.tmpl' );
+my $template = new HTML::Template( filename => $templatedir.'/panel/user/projects.tmpl' );
my $groups = Vhffs::Panel::User::get_groups($user, $Vhffs::Panel::User::RELATION_OWNER);
$template->param( OWNED_PROJECTS => $groups );
Modified: trunk/vhffs-panel/web/create.pl
===================================================================
--- trunk/vhffs-panel/web/create.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/web/create.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -86,7 +86,7 @@
}
if(!$submitted || $panel->has_errors()) {
- my $template = new HTML::Template( filename => $templatedir.'/web/create.tmpl' );
+ my $template = new HTML::Template( filename => $templatedir.'/panel/web/create.tmpl' );
$panel->set_title( gettext("Create a web space") );
$template->param( SERVERNAME_TEXT => gettext("Adress (ServerName directive)") );
$template->param( SERVERNAME_WARNING => gettext("Be careful, if you want create www.domain.tld, you should create a webspace with domain.tld as servername. VHFFS redirect all request from www.domain.tld to domain.tld") );
Modified: trunk/vhffs-panel/web/delete.pl
===================================================================
--- trunk/vhffs-panel/web/delete.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/web/delete.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -104,7 +104,7 @@
}
-my $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+my $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$template->param( MESSAGE => $message );
set_refresh_url Vhffs::Panel::Main($panel, "/panel.pl?project=$groupname", 0);
Modified: trunk/vhffs-panel/web/prefs.pl
===================================================================
--- trunk/vhffs-panel/web/prefs.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/web/prefs.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -68,7 +68,7 @@
if( ! defined($web) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "Cannot get informations on this object");
$template->param( MESSAGE => $message );
@@ -76,19 +76,19 @@
elsif( $web->get_status != Vhffs::Constants::ACTIVATED )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext( "This object is not functionnal yet. Please wait creation or moderation.");
$template->param( MESSAGE => $message );
}
elsif( ( Vhffs::Acl::what_perm_for_user( $user , $web , $vhffs ) < Vhffs::Constants::ACL_VIEW ) && ( $user->is_admin != 1 ) )
{
- $template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
my $message = gettext("You're not allowed to do this (ACL rights)");
$template->param( MESSAGE => $message );
}
else
{
- $template = new HTML::Template( filename => $templatedir."/web/prefs.tmpl" );
+ $template = new HTML::Template( filename => $templatedir."/panel/web/prefs.tmpl" );
$template->param( TEXT_TITLE => gettext("Web Area Administration") );
Modified: trunk/vhffs-panel/web/prefs_save.pl
===================================================================
--- trunk/vhffs-panel/web/prefs_save.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-panel/web/prefs_save.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -93,7 +93,7 @@
}
-$template = new HTML::Template( filename => $templatedir."/misc/simplemsg.tmpl" );
+$template = new HTML::Template( filename => $templatedir."/panel/misc/simplemsg.tmpl" );
$template->param( MESSAGE => $message );
set_refresh_url Vhffs::Panel::Main($panel, "/web/prefs.pl?name=$servername", 0);
Copied: trunk/vhffs-public (from rev 730, trunk/vhffs-panel/public)
Added: trunk/vhffs-public/Makefile.am
===================================================================
--- trunk/vhffs-panel/public/Makefile.am 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-public/Makefile.am 2007-07-17 14:39:47 UTC (rev 731)
@@ -0,0 +1,30 @@
+if INSTALL_PUBLIC
+SUBDIRS = templates
+
+publicdir = @PUBLICDIR@
+nobase_public_SCRIPTS = \
+ allgroups.pl \
+ allwebsites.pl \
+ group.pl \
+ index.pl \
+ lastgroups.pl \
+ lastusers.pl \
+ user.pl \
+ websearch.pl \
+ rss/lastgroups.pl \
+ rss/lastusers.pl \
+ themes/vhffs/main.css
+
+# Define the substitution we need to point perl script at correct location
+do_sed = $(SED) --in-place \
+ -e 's,%PERL%,$(PERL),g' \
+ -e 's,'%VHFFS_LIB_DIR%',$(VHFFS_LIBDIR),g'
+
+# Because automake, exec-hook is executed before install-scripts
+# so install-data is after. Here we use a data-hook
+install-data-hook :
+ for f in $(nobase_public_SCRIPTS) ; do \
+ $(do_sed) $(DESTDIR)$(publicdir)/$$f; \
+ done
+
+endif # Install public
Modified: trunk/vhffs-public/allgroups.pl
===================================================================
--- trunk/vhffs-panel/public/allgroups.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-public/allgroups.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -108,6 +108,7 @@
$output_final .= $template->output;
}
$subtemplate = new HTML::Template( filename => $templatedir."/public/banner.tmpl" );
+$subtemplate->param( URL_PANEL => $vhffs->get_config->get_panel_url );
$subtemplate->param( BACK_PUBLIC => gettext( "Homepage of public area") );
$subtemplate->param( BACK_LOGIN => gettext( "Go on login page" ) );
$subtemplate->param( WEBSITE_LIST => gettext( "List of all websites" ) );
Modified: trunk/vhffs-public/allwebsites.pl
===================================================================
--- trunk/vhffs-panel/public/allwebsites.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-public/allwebsites.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -96,6 +96,7 @@
$maintemplate->param( VALUES => $output );
$subtemplate = new HTML::Template( filename => $templatedir."/public/banner.tmpl" );
+$subtemplate->param( URL_PANEL => $vhffs->get_config->get_panel_url );
$subtemplate->param( BACK_PUBLIC => gettext( "Homepage of public area") );
$subtemplate->param( BACK_LOGIN => gettext( "Go on login page" ) );
$subtemplate->param( WEBSITE_LIST => gettext( "List of all websites" ) );
Modified: trunk/vhffs-public/group.pl
===================================================================
--- trunk/vhffs-panel/public/group.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-public/group.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -222,6 +222,7 @@
}
$subtemplate = new HTML::Template( filename => $templatedir."/public/banner.tmpl" );
+ $subtemplate->param( URL_PANEL => $vhffs->get_config->get_panel_url );
$subtemplate->param( BACK_PUBLIC => gettext( "Homepage of public area") );
$subtemplate->param( BACK_LOGIN => gettext( "Go on login page" ) );
$subtemplate->param( WEBSITE_LIST => gettext( "List of all websites" ) );
Modified: trunk/vhffs-public/index.pl
===================================================================
--- trunk/vhffs-panel/public/index.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-public/index.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -78,6 +78,7 @@
$subtemplate = new HTML::Template( filename => $templatedir."/public/banner.tmpl" );
+$subtemplate->param( URL_PANEL => $vhffs->get_config->get_panel_url );
$subtemplate->param( BACK_PUBLIC => gettext( "Homepage of public area") );
$subtemplate->param( BACK_LOGIN => gettext( "Go on login page" ) );
$subtemplate->param( WEBSITE_LIST => gettext( "List of all websites" ) );
Modified: trunk/vhffs-public/lastgroups.pl
===================================================================
--- trunk/vhffs-panel/public/lastgroups.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-public/lastgroups.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -100,6 +100,7 @@
$output_final .= $template->output;
}
$subtemplate = new HTML::Template( filename => $templatedir."/public/banner.tmpl" );
+$subtemplate->param( URL_PANEL => $vhffs->get_config->get_panel_url );
$subtemplate->param( BACK_PUBLIC => gettext( "Homepage of public area") );
$subtemplate->param( BACK_LOGIN => gettext( "Go on login page" ) );
$subtemplate->param( WEBSITE_LIST => gettext( "List of all websites" ) );
Modified: trunk/vhffs-public/lastusers.pl
===================================================================
--- trunk/vhffs-panel/public/lastusers.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-public/lastusers.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -109,6 +109,7 @@
}
$subtemplate = new HTML::Template( filename => $templatedir."/public/banner.tmpl" );
+$subtemplate->param( URL_PANEL => $vhffs->get_config->get_panel_url );
$subtemplate->param( BACK_PUBLIC => gettext( "Homepage of public area") );
$subtemplate->param( BACK_LOGIN => gettext( "Go on login page" ) );
$subtemplate->param( WEBSITE_LIST => gettext( "List of all websites" ) );
Modified: trunk/vhffs-public/rss/lastgroups.pl
===================================================================
--- trunk/vhffs-panel/public/rss/lastgroups.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-public/rss/lastgroups.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -42,7 +42,7 @@
my $vhffs = init Vhffs::Main;
my $url;
-$url = "" if( ! defined ( $url = $vhffs->get_config->get_panel_url ) );
+$url = "" if( ! defined ( $url = $vhffs->get_config->get_panel_public_url ) );
if( $vhffs->get_config->get_panel_rss_groups == 1 && $vhffs->get_config->get_panel_public == 1)
@@ -63,7 +63,7 @@
$rss->channel(
title => $title,
- link => "$url/public/lastgroups.pl",
+ link => "$url/lastgroups.pl",
description => "Best hosting platform",
dc => {
date => '2000-08-23T07:00+00:00',
@@ -89,7 +89,7 @@
my $name = $groups->[$i]->get_groupname;
$rss->add_item(
title => $name,
- link => "$url/public/group.pl?name=$name",
+ link => "$url/group.pl?name=$name",
description => "Vhffs Group",
);
Modified: trunk/vhffs-public/rss/lastusers.pl
===================================================================
--- trunk/vhffs-panel/public/rss/lastusers.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-public/rss/lastusers.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -41,7 +41,7 @@
my $vhffs = init Vhffs::Main;
my $url;
-$url = "" if( ! defined ( $url = $vhffs->get_config->get_panel_url ) );
+$url = "" if( ! defined ( $url = $vhffs->get_config->get_panel_public_url ) );
if( $vhffs->get_config->get_panel_rss_users == 1 && $vhffs->get_config->get_panel_public == 1 )
{
@@ -61,7 +61,7 @@
$rss->channel(
title => $title,
- link => "$url/public/lastusers.pl",
+ link => "$url/lastusers.pl",
description => "Best hosting platform",
dc => {
date => '2000-08-23T07:00+00:00',
@@ -87,7 +87,7 @@
my $username = $users->[$i]->get_username;
$rss->add_item(
title => $username,
- link => "$url/public/user.pl?name=$username",
+ link => "$url/user.pl?name=$username",
description => "Vhffs User",
);
Added: trunk/vhffs-public/themes/vhffs/main.css
===================================================================
--- trunk/vhffs-panel/public/themes/vhffs/main.css 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-public/themes/vhffs/main.css 2007-07-17 14:39:47 UTC (rev 731)
@@ -0,0 +1,816 @@
+body
+{
+ font-size: 0.8em;
+ margin: 0;
+ padding: 0;
+ color: black;
+ background-color: white;
+ font-family: Arial,Verdana,sans-serif;
+}
+
+h1
+{
+ font-size: 3em;
+ text-align: center;
+}
+
+#chooselang img
+{
+ margin-left: 10px;
+ margin-right: 10px;
+}
+
+#chooselang
+{
+ right: 15%;
+ top: 10%;
+ position: absolute;
+}
+
+
+.foothome a
+{
+ color: black;
+}
+
+#public
+{
+ margin-top: 5em;
+}
+
+#public h1
+{
+ font-size: 3em;
+ padding-right: 2em;
+ text-align: right;
+}
+
+#public h2
+{
+ font-size: 2em;
+}
+
+
+input, textarea, select {
+ color: black;
+ border: thin solid black;
+ background-image: url('./images/inputbg.png');
+ background-repeat: repeat-x;
+ background-position: bottom center;
+ background-color: white;
+}
+
+input[type="submit"], input[type="button"] {
+ background-image: url('./images/buttonbg.png');
+ background-repeat: repeat-x;
+ background-position: bottom center;
+ background-color: white;
+ border-style:outset;
+}
+
+input:hover, textarea:hover, select:hover
+{
+ background-color: white;
+}
+
+.misc
+{
+ margin-left: 2em;
+ margin-right: 2em;
+ position: relative;
+}
+
+.misc input
+{
+ background-color: white;
+}
+
+
+#title p
+{
+text-align: center;
+}
+
+#logo
+{
+ position:absolute;
+ top:50px;
+ left:0.2em;
+}
+
+body a
+{
+ color: black;
+}
+
+.listengine_header
+{
+ margin: 0px;
+ padding: 0px;
+ color: black;
+ font-family:"Trebuchet MS",Verdana,Geneva,Arial,Helvetica,sans-serif;
+ font-size: small;
+}
+
+
+.listengine_body
+{
+ margin: 0px;
+ padding: 0px;
+ color: white;
+ font-family:"Trebuchet MS",Verdana,Geneva,Arial,Helvetica,sans-serif;
+ font-size: small;
+}
+
+a:link, a:visited, a:hover {
+ color: black;
+}
+
+a img
+{
+ border-style:none;
+}
+
+.logo
+{
+ display:block;
+ background-image:url("./images/logo.png");
+ text-align:right;
+ width:80%;
+ margin-left: 3em;
+ height:131px;
+ background-position: left center;
+ background-repeat:no-repeat;
+}
+
+.foothome
+{
+ position: relative;
+ display:block;
+ text-align: center;
+ padding-left: 2em;
+ padding-right: 2em;
+ margin-top: 3em;
+ width: 40%;
+}
+
+#header
+{
+ position: fixed;
+ width:100%;
+ margin-top: 0;
+ padding-left: 0;
+ text-align: center;
+ height: 50px;
+ background-color: white;
+ border-bottom:1px solid black;
+ padding-top: 0;
+ z-index:1;
+ display: block;
+}
+
+#contextual_menu {
+ position:fixed;
+ width:650px;
+ height:2em;
+ top:50px;
+ left:50%;
+ margin-left:-325px;
+ z-index:2;
+ text-align:center;
+ background:url('images/tab.png') no-repeat right bottom;
+}
+
+#contextual_menu p {
+ margin: 0 0 0 0;
+ padding: 0.5em 1em 0 1em;
+}
+
+#contextual_menu p a {
+ margin-right:0.1em;
+}
+
+div#username_menu {
+ width:350px;
+ text-align:right;
+ position:absolute;
+ left:50%;
+ margin-top:10px;
+ margin-bottom:10px;
+}
+
+div#group_menu {
+ width:350px;
+ position:absolute;
+ text-align:left;
+ left:50%;
+ margin-left:-350px;
+ margin-top:10px;
+ margin-bottom:10px;
+}
+
+#groupname {
+ font-style:italic;
+ font-size:large;
+}
+
+#groupname img {
+ vertical-align:middle;
+}
+
+form p
+{
+ margin:0px;
+ margin-top:5px;
+ margin-bottom:5px;
+}
+
+/*form input, form select
+{
+ width:200px;
+}
+*/
+
+input.autowidth {
+ width:auto;
+}
+
+form textarea {
+ width:350px;
+}
+
+form input[type="checkbox"], form input[type="radio"]
+{
+ width:auto;
+
+}
+
+/* Les deux d\xE9finitions suivantes sont un hack pour ie afin de regler le
+bug 62.
+
+L'astuce a \xE9t\xE9 trouv\xE9e sur le blog alsa cr\xE9ation :
+
+http://www.alsacreations.com/blog/index.php?2004/08/17/54-min-%20style=%22background:yellow%22%3Eheight-sur-internet-explorer
+
+*/
+
+.formLabel, label
+{
+
+ width:200px;
+ float:left;
+ display:block;
+}
+
+html>body label
+{
+ width:auto;
+ min-width:200px;
+}
+
+form.largeLabel label {
+ width:auto;
+ min-width:275px;
+}
+
+fieldset
+{
+ margin:0px;
+ padding:0px;
+ margin-top:20px;
+ margin-bottom:20px;
+}
+fieldset input
+{
+ margin-left : 150px;
+ width: 50px;
+ float:left;
+ display:inline;
+}
+fieldset label
+{
+ float:none;
+
+}
+
+#mailUsage input
+{
+ margin-left: 200px;
+
+}
+
+
+#mailUsage label
+{
+ float: none;
+ display: inline;
+}
+
+.formLabelFull
+{
+ display:block;
+ float:none;
+ margin-top:5px;
+ margin-bottom:5px;
+}
+
+.formInput
+{
+ margin:0px;
+}
+
+.formInputFull
+{
+ display:block;
+ margin-left:200px;
+}
+
+.button
+{
+ margin-left:200px;
+ margin-top:10px;
+ margin-bottom:10px;
+}
+
+h1
+{
+ margin-top:0px;
+ padding-top:10px;
+ padding-bottom:20px;
+}
+
+.message
+{
+ padding-top:100px;
+ text-align:center;
+}
+
+table
+{
+ width:100%;
+
+}
+
+table td
+{
+
+ width:15%;
+}
+.mainColumn
+{
+ min-width:30%;
+
+}
+
+#misc h1
+{
+ text-align: right;
+ font-size: 3em;
+ padding-right: 2em;
+}
+
+#misc h2
+{
+ font-size: 1em;
+ text-align: center;
+}
+
+#misc p
+{
+ padding-left:0px;
+}
+
+#misc form
+{
+ width: 50%;
+ float: right;
+}
+
+#misc .loginLinks, #misc label
+{
+ display:block;
+}
+
+#misc .formInput
+{
+ margin:0px;
+ padding:0px;
+ min-width:25%;
+}
+
+#misc .button
+{
+ padding-left:0px;
+}
+
+.error
+{
+ color:red;
+ text-align: center;
+ font-weight:bold;
+}
+
+.info
+{
+ color:blue;
+ text-align: center;
+ font-weight: bold;
+}
+
+.help
+{
+ color: blue;
+ font-style:italic;
+}
+
+.warning
+{
+ color: red;
+ font-weight:bold;
+ text-align: center;
+}
+
+#sub_opts
+{
+ margin-top: 4em;
+}
+
+.public_align_right
+{
+ float: right;
+ position: relative;
+ margin-right: 2em;
+}
+
+.public_align_left
+{
+ float: left;
+ position: relative;
+ margin-left: 2em;
+}
+
+#projectMenu
+{
+ display: block;
+ clear: both;
+}
+
+
+.smalllink
+{
+ font-size: 0.7em;
+}
+
+.last
+{
+ margin-left: 5em;
+ width: 300px;
+}
+
+.last ul
+{
+ position: relative;
+ margin-left: 3em;
+}
+
+.last img
+{
+ position: relative;
+ float: right;
+}
+
+.public_user h1 , .public_user h2
+{
+ float: left;
+ font-size: 1.2em;
+ margin-left: 1em;
+}
+
+.public_user
+{
+ border: thin solid black;
+ margin-top: 5em;
+ margin-left: 25%;
+ width: 400px;
+}
+
+.public_user p , .public_user ul
+{
+ margin-top: 6em;
+}
+
+.public_user img
+{
+ position: relative;
+ float: right;
+ margin-top: 3em;
+ margin-right: 1em;
+}
+
+
+#publicbanner {
+ color: white;
+ position: absolute;
+ height: 2em;
+ width: 100%;
+ top: 0;
+ left: 0;
+ padding: 0;
+ margin: 0;
+ display: inline;
+ background-color: black;
+}
+
+#publicbanner a {
+ color: white;
+ text-decoration: none;
+}
+
+#publicbanner ul{
+ margin-top: 0.4em;
+ margin-left: 3em;
+ padding:0;
+ float:left;
+ display:inline;
+}
+
+#publicbanner form
+{
+ margin-top: 0em;
+ margin-left: 0.3em;
+ position: relative;
+ display: inline;
+}
+
+#publicbanner input
+{
+ height: 1.2em;
+ font-size: 0.9em;
+}
+
+#publicbanner li{
+ padding-top: 0.2em;
+ background-color: transparent;
+ list-style-type: none;
+ display: inline;
+ margin: 0 1em 0 0;
+}
+
+.explain
+{
+ margin-left: 6em;
+ width: 50%;
+ text-align: justify;
+ font-size: 1.3em;
+}
+
+.info_quota
+{
+ text-align: center;
+}
+
+#footer
+{
+ font-size: 0.8em;
+ text-align: right;
+ padding-right: 5em;
+}
+
+
+div#mbox_options
+{
+ padding-left:2em;
+}
+
+div.tooltip {
+ border: 1px solid black;
+ background-color: #ffffdc;
+ width:250px;
+}
+
+.validField:after {
+ content:url('images/good.png');
+}
+
+.invalidField:after {
+ content:url('images/error.png');
+}
+
+body.subscribe div#content {
+ width:600px;
+ margin-left:auto;
+ margin-right:auto;
+}
+
+body.subscribe h1 {
+ font-size: 3em;
+ text-align: center;
+}
+
+body.subscribe img#logo {
+ position:absolute;
+ left:50%;
+ top:0px;
+ margin-left:-400px;
+}
+
+#main {
+ width:575px;
+ margin-left:auto;
+ margin-right:auto;
+ padding-top:5em;
+ padding-left:0px;
+ padding-right:0px;
+}
+
+#help {
+ position: fixed;
+ top:200px;
+ left:50%;
+ width:165px;
+ padding:5px;
+ margin-left:-485px;
+ height:300px;
+ overflow:auto;
+ padding:5px;
+ border: 1px outset black;
+ background: url('images/help_bg.png') repeat-x top;
+
+}
+
+#help h1 {
+ font-size:large;
+ text-align:center;
+ margin-bottom:5px;
+}
+
+#help>h1>img {
+ vertical-align:middle;
+ margin-right:1em;
+}
+
+#help h2 {
+ margin-top:5px;
+ font-size:medium;
+}
+
+div.loading {
+ width:16px;
+ height:16px;
+ background-image:url('images/loading_little.gif');
+}
+
+#userToolBox {
+ display:inline;
+}
+
+#username {
+ vertical-align:50%;
+}
+
+#ownedProjects ul{
+ list-style-image: url('images/projectownerentry.png');
+}
+
+#contribProjects ul {
+ list-style-image: url('images/projectcontribentry.png');
+}
+
+ul.webList {
+ list-style-image: url('images/webentry.png');
+}
+
+ul.mailList {
+ list-style-image: url('images/mailentry.png');
+}
+
+ul.mailingList {
+ list-style-image: url('images/mailingentry.png');
+}
+
+ul.mailinglistList {
+ list-style-image: url('images/mailingentry.png');
+}
+
+ul.mysqlList {
+ list-style-image: url('images/dbentry.png');
+}
+
+ul.pgsqlList {
+ list-style-image: url('images/dbentry.png');
+}
+
+ul.repositoryList {
+ list-style-image: url('images/dbentry.png');
+}
+
+ul.svnList {
+ list-style-image: url('images/svnentry.png');
+}
+
+ul.cvsList {
+ list-style-image: url('images/cvsentry.png');
+}
+
+ul.dnsList {
+ list-style-image: url('images/dnsentry.png');
+}
+
+ul.generalList {
+ list-style-image: url('images/homeentry.png');
+}
+
+ul.userList {
+ list-style-image: url('images/userentry.png');
+}
+
+ul.groupList {
+ list-style-image: url('images/groupentry.png');
+}
+
+div.acltable * {
+margin:0;
+padding:0;
+}
+
+div.acltable {
+border:1px solid #CCCCCC;
+background-color:#EEEEEE;
+}
+
+div.acltable form {
+clear:both;
+}
+
+.clear {
+display:block;
+visibility:hidden;
+clear:both;
+height:0px;
+}
+
+div.acltable div.tableheader, div.acltable div.tablebody {
+margin:1px;
+}
+
+div.acltable div.tablebody form span, div.acltable div.tableheader span {
+display:block;
+float:left;
+overflow:auto;
+width:77.4px;
+margin:1px;
+border:1px solid #FF9999;
+}
+
+div.acltable div.tablebody input[type="submit"] {
+width:75px;
+height:1.7em;
+}
+
+div.acltable div.tableheader span{
+height:5.5em;
+font-size:small;
+font-family:Verdana, Arial, Helvetica, sans-serif;
+text-align:center;
+overflow:hidden;
+}
+
+div.acltable div.tablebody form span {
+height:1.8em;
+text-align:center;
+overflow:hidden;
+}
+
+div#group_quota {
+ width:300px;
+ margin-left: auto;
+ margin-right:auto;
+ border:1px solid black;
+ height:15px;
+ text-align:left;
+}
+
+div#group_quota>img {
+ height:15px;
+}
+
+div#repo_quota {
+ width:300px;
+ margin-left: auto;
+ margin-right:auto;
+ border:1px solid black;
+ height:15px;
+ text-align:left;
+}
+
+div#repo_quota>img {
+ height:15px;
+}
+
+textarea.description {
+ width:100%;
+}
+
+label.description {
+ float:none;
+}
Modified: trunk/vhffs-public/user.pl
===================================================================
--- trunk/vhffs-panel/public/user.pl 2007-07-17 12:25:47 UTC (rev 730)
+++ trunk/vhffs-public/user.pl 2007-07-17 14:39:47 UTC (rev 731)
@@ -112,6 +112,7 @@
$template->param( VALUE_GROUPS => $output );
}
$subtemplate = new HTML::Template( filename => $templatedir."/public/banner.tmpl" );
+ $subtemplate->param( URL_PANEL => $vhffs->get_config->get_panel_url );
$subtemplate->param( BACK_PUBLIC => gettext( "Homepage of public area") );
$subtemplate->param( BACK_LOGIN => gettext( "Go on login page" ) );
$subtemplate->param( WEBSITE_LIST => gettext( "List of all websites" ) );