From abbbc08b1380943d37cac42c3cfd17aa43d92e1e Mon Sep 17 00:00:00 2001 From: tetragon Date: Wed, 24 Oct 2007 21:36:16 +0000 Subject: Convert language forms to templates git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@1813 4979c152-3d1c-0410-bac9-87ea11338e46 --- UI/am-language-form.html | 33 ++++++++++++++ bin/am.pl | 113 ++++++++++++++++++++--------------------------- 2 files changed, 82 insertions(+), 64 deletions(-) create mode 100644 UI/am-language-form.html diff --git a/UI/am-language-form.html b/UI/am-language-form.html new file mode 100644 index 00000000..93f6b799 --- /dev/null +++ b/UI/am-language-form.html @@ -0,0 +1,33 @@ + + + +
+ + + + + + + +
+ + + + + + + + + +
'code', size => 10, value => form.code} ?>
'description', size => 60, value => form.description} ?>
+
+ 'hidden', + name => hidden, + value => hiddens.item(hidden) + }; END ?> + +
+ + diff --git a/bin/am.pl b/bin/am.pl index 1f157780..60c73bf0 100644 --- a/bin/am.pl +++ b/bin/am.pl @@ -1135,8 +1135,20 @@ sub add_language { "$form->{script}?action=add_language&path=$form->{path}&login=$form->{login}&sessionid=$form->{sessionid}" unless $form->{callback}; - &language_header; - &form_footer; + my %hiddens; + my @buttons; + &language_header(\%hiddens); + &form_footer_buttons(\%hiddens, \@buttons); + + my $template = LedgerSMB::Template->new_UI( + user => \%myconfig, + locale => $locale, + template => 'am-language-form'); + $template->render({ + form => $form, + buttons => \@buttons, + hiddens => \%hiddens, + }); } @@ -1149,11 +1161,22 @@ sub edit_language { AM->get_language( \%myconfig, \%$form ); $form->{id} = $form->{code}; + $form->{orphaned} = 1; - &language_header; + my %hiddens; + my @buttons; + &language_header(\%hiddens); + &form_footer_buttons(\%hiddens, \@buttons); - $form->{orphaned} = 1; - &form_footer; + my $template = LedgerSMB::Template->new_UI( + user => \%myconfig, + locale => $locale, + template => 'am-language-form'); + $template->render({ + form => $form, + buttons => \@buttons, + hiddens => \%hiddens, + }); } @@ -1233,6 +1256,7 @@ sub list_language { } sub language_header { + my $hiddens = shift; $form->{title} = $locale->text("$form->{title} Language"); @@ -1241,34 +1265,8 @@ sub language_header { for (qw(code description)) { $form->{$_} = $form->quote( $form->{$_} ) } - $form->header; - - print qq| - - -
{script}> - - - - - - - - - - - - - - - - - - - -
$form->{title}
| . $locale->text('Code') . qq|
| . $locale->text('Description') . qq|
-|; - + $hiddens->{type} = 'language'; + $hiddens->{id} = $form->{code}; } sub save_language { @@ -1322,40 +1320,27 @@ sub save_language { sub delete_language { $form->{title} = $locale->text('Confirm!'); - - $form->header; - - print qq| - - -{script}> -|; - for (qw(action nextsub)) { delete $form->{$_} } - $form->hide_form; - - print qq| -

$form->{title}

- -

| - . $locale->text( + my %hiddens; + $hiddens{$_} = $form->{$_} foreach keys %$form; + my @buttons = ({ + name => 'action', + value => 'yes_delete_language', + text => $locale->text('Delete Language'), + }); + my $template = LedgerSMB::Template->new_UI( + user => \%myconfig, + locale => $locale, + template => 'form-confirmation'); + $template->render({ + form => $form, + buttons => \@buttons, + hiddens => \%hiddens, + query => $locale->text( 'Deleting a language will also delete the templates for the language [_1]', - $form->{invnumber} - ) - . qq|

- - - - -
- - - -|; - + $form->{id}), + }); } sub yes_delete_language { -- cgit v1.2.3