| [vhffs-dev] [1774] No more HTML::Template in cvs/create |
[ Thread Index |
Date Index
| More vhffs.org/vhffs-dev Archives
]
Revision: 1774
Author: beuss
Date: 2011-05-19 13:09:53 +0200 (Thu, 19 May 2011)
Log Message:
-----------
No more HTML::Template in cvs/create
Modified Paths:
--------------
trunk/vhffs-panel/cvs/create.pl
trunk/vhffs-panel/templates/Makefile.am
Added Paths:
-----------
trunk/vhffs-panel/templates/cvs/create.tt
Removed Paths:
-------------
trunk/vhffs-panel/templates/cvs/create.tmpl
Modified: trunk/vhffs-panel/cvs/create.pl
===================================================================
--- trunk/vhffs-panel/cvs/create.pl 2011-05-19 05:44:26 UTC (rev 1773)
+++ trunk/vhffs-panel/cvs/create.pl 2011-05-19 11:09:53 UTC (rev 1774)
@@ -32,7 +32,6 @@
use strict;
use utf8;
use POSIX qw(locale_h);
-use HTML::Template;
use locale;
use Locale::gettext;
use CGI;
@@ -41,12 +40,10 @@
use lib '%VHFFS_LIB_DIR%';
-use Vhffs::User;
use Vhffs::Group;
-use Vhffs::Main;
+use Vhffs::Services::Cvs;
+use Vhffs::Panel::Cvs;
use Vhffs::Panel::Main;
-use Vhffs::Panel::Menu;
-use Vhffs::Panel::Group;
my $panel = new Vhffs::Panel::Main();
exit 0 unless $panel;
@@ -60,21 +57,17 @@
my $group = Vhffs::Group::get_by_groupname( $vhffs , $cgi->param('group') );
unless( defined $group && $user->can_modify( $group ) ) {
- my $template = new HTML::Template( filename => $templatedir.'/panel/misc/simplemsg.tmpl' );
- $template->param( MESSAGE => gettext( 'You\'re not allowed to do this (ACL rights)' ) );
-
- $panel->build( $template );
- $panel->display;
-}
-else {
+ $panel->render('misc/message.tt', { message => gettext( 'You\'re not allowed to do this (ACL rights)' ) } );
+} else {
my $submitted = defined($cgi->param('cvs_submit'));
my $reponame = '';
my $description = '';
+ my $vars = {};
if($submitted) {
- $reponame = $cgi->param('REPOSITORY_NAME');
+ $reponame = $cgi->param('reponame');
my $fullreponame = $group->get_groupname.'/'.$reponame;
- $description = Encode::decode_utf8( $cgi->param('DESCRIPTION') );
+ $description = Encode::decode_utf8( $cgi->param('description') );
unless( defined $reponame && defined $description ) {
$panel->add_error( gettext('CGI Error !') );
@@ -92,23 +85,12 @@
$panel->add_error( gettext( 'An error occured while creating the object.It probably already exists' ) );
}
}
+ $vars->{reponame} = $reponame;
+ $vars->{description} = $description;
}
- if( !$submitted || $panel->has_errors() ) {
- my $template = new HTML::Template( filename => $templatedir.'/panel/cvs/create.tmpl' );
-
- $panel->set_title( gettext('Create a CVS Repository') );
+ $vars->{group} = $group;
- $template->param( REPOSITORY_NAME => gettext('Repository Name') );
- $template->param( REPOSITORY_VALUE => $reponame );
- $template->param( GROUP_NAME => gettext('Group owning this CVS') );
-
- $template->param( GROUP => $group->get_groupname );
- $template->param( SEND => gettext('Send') );
- $template->param( DESCRIPTION => gettext('Description') );
- $template->param( DESCRIPTION_VALUE => $description );
-
- $panel->build( $template );
- $panel->display;
- }
+ $panel->set_title( gettext('Create a CVS Repository') );
+ $panel->render('cvs/create.tt', $vars);
}
Modified: trunk/vhffs-panel/templates/Makefile.am
===================================================================
--- trunk/vhffs-panel/templates/Makefile.am 2011-05-19 05:44:26 UTC (rev 1773)
+++ trunk/vhffs-panel/templates/Makefile.am 2011-05-19 11:09:53 UTC (rev 1774)
@@ -57,7 +57,6 @@
admin/web/search.tmpl \
admin/cron/part.tmpl \
admin/cron/search.tmpl \
- cvs/create.tmpl \
cvs/prefs.tmpl \
menu/context.tmpl \
menu/context-group.tmpl \
@@ -84,6 +83,7 @@
anonymous/lost-password.tt \
anonymous/lost-password-ack.tt \
anonymous/subscribe.tt \
+ cvs/create.tt \
database/prefs.tt \
dns/create.tt \
dns/prefs.tt \
Deleted: trunk/vhffs-panel/templates/cvs/create.tmpl
===================================================================
--- trunk/vhffs-panel/templates/cvs/create.tmpl 2011-05-19 05:44:26 UTC (rev 1773)
+++ trunk/vhffs-panel/templates/cvs/create.tmpl 2011-05-19 11:09:53 UTC (rev 1774)
@@ -1,24 +0,0 @@
-<form method="post" action="create.pl" accept-charset="utf-8">
- <p>
- <label>
- <TMPL_VAR ESCAPE=1 NAME="GROUP_NAME">:
- </label>
- <TMPL_VAR ESCAPE=1 NAME="GROUP">
- </p>
- <p>
- <label for="REPOSITORY_NAME">
- <TMPL_VAR ESCAPE=1 NAME="REPOSITORY_NAME">:
- </label>
- <TMPL_VAR ESCAPE=1 NAME="GROUP">/<input type="text" name="REPOSITORY_NAME" id="REPOSITORY_NAME" value="<TMPL_VAR ESCAPE=1 NAME="REPOSITORY_VALUE">"/>
- </p>
- <p>
- <label for="PROJECT_USAGE">
- <TMPL_VAR ESCAPE=1 NAME="DESCRIPTION">:
- </label>
- <textarea name="DESCRIPTION" cols="45" rows="15"><TMPL_VAR ESCAPE=1 NAME="DESCRIPTION_VALUE"></textarea>
- </p>
- <p class="button" id="buttonSend">
- <input type="hidden" name="group" value="<TMPL_VAR ESCAPE=1 NAME="GROUP">" />
- <input type="submit" value="<TMPL_VAR ESCAPE=1 NAME="SEND">" id="cvs_submit" name="cvs_submit" />
- </p>
-</form>
Added: trunk/vhffs-panel/templates/cvs/create.tt
===================================================================
--- trunk/vhffs-panel/templates/cvs/create.tt (rev 0)
+++ trunk/vhffs-panel/templates/cvs/create.tt 2011-05-19 11:09:53 UTC (rev 1774)
@@ -0,0 +1,18 @@
+<form method="post" action="#" accept-charset="utf-8">
+ <p>
+ <label>[% 'Owner group for this CVS repository:' | i18n | html %]</label>
+ [% group.get_groupname | html %]
+ </p>
+ <p>
+ <label for="reponame">[% 'Repository name: '%]</label>
+ [% group.get_groupname | html %]/<input type="text" name="reponame" id="reponame" value="[% reponame | html %]"/>
+ </p>
+ <p>
+ <label for="PROJECT_USAGE">[% 'Description:' | i18n | html %]</label>
+ <textarea name="description" id="description" cols="45" rows="7">[% description | html %]</textarea>
+ </p>
+ <p class="button" id="buttonSend">
+ <input type="hidden" name="group" value="[% group.get_groupname | html %]" />
+ <input type="submit" value="[% 'Send' | i18n | html %]" name="cvs_submit"/>
+ </p>
+</form>