From e7a427f69af2756499cc0f658068b64b7531696a Mon Sep 17 00:00:00 2001 From: tetragon Date: Wed, 5 Dec 2007 19:44:52 +0000 Subject: Merging in my io email changes and templating git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@1947 4979c152-3d1c-0410-bac9-87ea11338e46 --- UI/io-email.html | 125 +++++++++++++++++++++ bin/io.pl | 337 +++++++++++++++++++++++++++++++------------------------ 2 files changed, 315 insertions(+), 147 deletions(-) create mode 100644 UI/io-email.html diff --git a/UI/io-email.html b/UI/io-email.html new file mode 100644 index 00000000..96b61e19 --- /dev/null +++ b/UI/io-email.html @@ -0,0 +1,125 @@ + + + +
+ + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + +
'email', size => 30, value => form.email} ?> 'cc', size => 30, value => form.cc} ?>
'subject', size => 30, value => form.subject} ?> 'bcc', size => 30, value => form.bcc} ?>
+
+ + + + + + + +
'message', rows => 15, cols => 60, text => form.message} ?>
+
+ + + + + + + + + + + + + + + + + + + + +
+ + 'copies', size => '2', value => form.copies, label => text('Copies') } ?> +
'read_receipt', + type => 'checkbox', + label => text('Request read receipt'), + } + ?>
 +'; + END; +END ?> +
-> 'groupprojectnumber', + type => 'checkbox', label => text('Project'), + value => 'groupprojectnumber', + ${print.groupby.groupprojectnumber} = print.groupby.groupprojectnumber}; + PROCESS input element_data={name => 'grouppartsgroup', + type => 'checkbox', label => text('Group'), + value => 'grouppartsgroup', + ${print.groupby.grouppartsgroup} = print.groupby.grouppartsgroup}; + ?> +
-> 'sortby', type => 'radio', + label => text('Item'), value => 'runningnumber', + ${print.sortby.runningnumber} = print.sortby.runningnumber}; + PROCESS input element_data={name => 'sortby', type => 'radio', + label => text('Number'), value => 'partnumber', + ${print.sortby.partnumber} = print.sortby.partnumber}; + PROCESS input element_data={name => 'sortby', type => 'radio', + label => text('Description'), value => 'description', + ${print.sortby.description} = print.sortby.description}; + PROCESS input element_data={name => 'sortby', type => 'radio', + label => text('Bin'), value => 'bin', + ${print.sortby.bin} = print.sortby.bin}; + ?> +
+
+
+ 'hidden', + name => hidden, + value => hiddens.item(hidden) + }; END ?> + +
+ + diff --git a/bin/io.pl b/bin/io.pl index bec37ddb..262c146f 100644 --- a/bin/io.pl +++ b/bin/io.pl @@ -1156,72 +1156,20 @@ sub create_form { sub e_mail { - $bcc = qq||; - if ( $myconfig{role} =~ /(admin|manager)/ ) { - $bcc = qq| - | . $locale->text('Bcc') . qq| - -|; + my %hiddens; + if ( $myconfig{role} !~ /(admin|manager)/ ) { + $hiddens{bcc} = $form->{bcc}; } if ( $form->{formname} =~ /(pick|packing|bin)_list/ ) { $form->{email} = $form->{shiptoemail} if $form->{shiptoemail}; } - $name = $form->{ $form->{vc} }; - $name =~ s/--.*//g; - $title = $locale->text('E-mail') . " $name"; - - $form->header; - - print qq| - - -
- - - - - - - - - - - - - - - - - - -
$title
- - - - - - - - - - - $bcc - -
| . $locale->text('E-mail') . qq|| . $locale->text('Cc') . qq|
| . $locale->text('Subject') . qq|
-
- - - - - - - -
| . $locale->text('Message') . qq|
-
-|; - $form->{oldmedia} = $form->{media}; $form->{media} = "email"; $form->{format} = "pdf"; - &print_options; + my $print_options = &print_options(\%hiddens); for ( qw(email cc bcc subject message formname sendmode format language_code action nextsub) @@ -1230,28 +1178,25 @@ sub e_mail { delete $form->{$_}; } - $form->hide_form; - - print qq| -
- - - -
- -
- - - -|; + $hiddens{$_} = $form->{$_} for keys %$form; + $hiddens{nextsub} = 'send_email'; + my @buttons = ({ + name => 'action', + value => 'send_email', + text => $locale->text('Continue'), + }); + my %template = LedgerSMB::Template->new_UI( + user => \%myconfig, + locale => $locale, + template => 'io-email', + ); + $template->render({ + form => $form, + print => $print_options, + hiddens => \%hiddens, + buttons => \@buttons, + }); } sub send_email { @@ -1267,33 +1212,156 @@ sub send_email { sub print_options { + my $hiddens = shift; + my %options; $form->{sendmode} = "attachment"; $form->{copies} = 1 unless $form->{copies}; $form->{SM}{ $form->{sendmode} } = "selected"; - if ( $form->{selectlanguage} ) { - $form->{"selectlanguage"} = - $form->unescape( $form->{"selectlanguage"} ); - $form->{"selectlanguage"} =~ s/ selected//; - $form->{"selectlanguage"} =~ - s/(