From 7dc774ec29e2b6f48115a28435e8f5219c286c90 Mon Sep 17 00:00:00 2001 From: wolfpac444 Date: Fri, 4 Apr 2003 23:38:43 +0000 Subject: [PATCH] Templating... --- admin/categorie.pl | 1 - admin/printers.pl | 169 ++++----------- .../default/en/parameters/printers.tmpl | 204 ++++++++++++++++++ 3 files changed, 247 insertions(+), 127 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl diff --git a/admin/categorie.pl b/admin/categorie.pl index e7afbfbbff..ab99eaaed8 100755 --- a/admin/categorie.pl +++ b/admin/categorie.pl @@ -77,7 +77,6 @@ my ($template, $loggedinuser, $cookie) query => $input, type => "intranet", authnotrequired => 0, - flagsrequired => {borrowers => 1}, debug => 1, }); diff --git a/admin/printers.pl b/admin/printers.pl index 9609b318ad..d405f1576d 100755 --- a/admin/printers.pl +++ b/admin/printers.pl @@ -42,6 +42,9 @@ use CGI; use C4::Context; use C4::Output; use C4::Search; +use HTML::Template; +use C4::Auth; +use C4::Interface::CGI::Output; sub StringSearch { my ($env,$searchstring,$type)=@_; @@ -75,15 +78,25 @@ my $script_name="/cgi-bin/koha/admin/printers.pl"; my $pagesize=20; my $op = $input->param('op'); $searchfield=~ s/\,//g; -print $input->header; + +my ($template, $loggedinuser, $cookie) + = get_template_and_user({template_name => "parameters/printers.tmpl", + query => $input, + type => "intranet", + authnotrequired => 0, + debug => 1, + }); + + +$template->param(searchfield => $searchfield, + script_name => $script_name); #start the page and read in includes -print startpage(); -print startmenu('admin'); ################## ADD_FORM ################################## # called by default. Used to create form to add or modify a record if ($op eq 'add_form') { + $template->param(add_form => 1); #---- if primkey exists, it's a modify action, so read values to modify... my $data; if ($searchfield) { @@ -93,85 +106,14 @@ if ($op eq 'add_form') { $data=$sth->fetchrow_hashref; $sth->finish; } - print < - ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// - function isNotNull(f,noalert) { - if (f.value.length ==0) { - return false; - } - return true; - } - ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// - function toUC(f) { - var x=f.value.toUpperCase(); - f.value=x; - return true; - } - ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// - function isNum(v,maybenull) { - var n = new Number(v.value); - if (isNaN(n)) { - return false; - } - if (maybenull==0 && v.value=='') { - return false; - } - return true; - } - ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// - function isDate(f) { - var t = Date.parse(f.value); - if (isNaN(t)) { - return false; - } - } - ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// - function Check(f) { - var ok=1; - var _alertString=""; - var alertString2; - if (f.printername.value.length==0) { - _alertString += "- printer name missing\\n"; - } - if (f.printqueue.value.length==0) { - _alertString += "- Queue missing\\n"; - } - if (_alertString.length==0) { - document.Aform.submit(); - } else { - alertString2 = "Form not submitted because of the following problem(s)\\n"; - alertString2 += "------------------------------------------------------------------------------------\\n\\n"; - alertString2 += _alertString; - alert(alertString2); - } - } - -printend -;#/ - if ($searchfield) { - print "

Modify printer

"; - } else { - print "

Add printer

"; - } - print "
"; - print ""; - print ""; - if ($searchfield) { - print ""; - } else { - print ""; - } - print ""; - print ""; - print ""; - print "
Printer$searchfield
Printer
Queue 
Type 
 
"; - print "
"; -; + + $template->param(printqueue => $data->{'printqueue'}, + printtype => $data->{'printtype'}); # END $OP eq ADD_FORM ################## ADD_VALIDATE ################################## # called by add_form, used to insert/modify data in DB } elsif ($op eq 'add_validate') { + $template->param(add_validate => 1); my $dbh = C4::Context->dbh; my $query = "replace printers (printername,printqueue,printtype) values ("; $query.= $dbh->quote($input->param('printername')).","; @@ -180,83 +122,58 @@ printend my $sth=$dbh->prepare($query); $sth->execute; $sth->finish; - print "data recorded"; - print "
"; - print ""; - print "
"; # END $OP eq ADD_VALIDATE ################## DELETE_CONFIRM ################################## # called by default form, used to confirm deletion of data in DB } elsif ($op eq 'delete_confirm') { + $template->param(delete_confirm => 1); my $dbh = C4::Context->dbh; my $sth=$dbh->prepare($reqsel); $sth->execute; my $data=$sth->fetchrow_hashref; $sth->finish; - print mktablehdr; - print mktablerow(2,'#99cc33',bold('Printer'),bold("$searchfield"),'/images/background-mem.gif'); - print "
"; - print "Queue$data->{'printqueue'}"; - print "Type$data->{'printtype'}"; - print "CONFIRM DELETION"; - print "
"; + $template->param(printqueue => $data->{'printqueue'}, + printtype => $data->{'printtype'}); + # END $OP eq DELETE_CONFIRM ################## DELETE_CONFIRMED ################################## # called by delete_confirm, used to effectively confirm deletion of data in DB } elsif ($op eq 'delete_confirmed') { + $template->param(delete_confirmed => 1); + my $dbh = C4::Context->dbh; -# my $searchfield=$input->param('branchcode'); my $sth=$dbh->prepare($reqdel); $sth->execute; $sth->finish; - print "data deleted"; - print "
"; - print ""; - print "
"; # END $OP eq DELETE_CONFIRMED ################## DEFAULT ################################## } else { # DEFAULT - my @inputs=(["text","searchfield",$searchfield], - ["reset","reset","clr"]); - print mkheadr(2,'Printer admin'); - print mkformnotable("$script_name",@inputs); - print <param(else => 1); -printend - ; - if ($searchfield ne '') { - print "You Searched for $searchfield

"; - } - print mktablehdr; - print mktablerow(5,'#99cc33',bold('Name'),bold('Queue'),bold('Type'), - ' ',' ','/images/background-mem.gif'); my $env; my ($count,$results)=StringSearch($env,$searchfield,'web'); my $toggle="white"; + my @loop; for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){ - if ($toggle eq 'white'){ - $toggle="#ffffcc"; - } else { - $toggle="white"; - } - print mktablerow(5,$toggle,$results->[$i]{'printername'},$results->[$i]{'printqueue'},$results->[$i]{'printtype'}, - mklink("$script_name?op=add_form&searchfield=".$results->[$i]{'printername'},'Edit'), - mklink("$script_name?op=delete_confirm&searchfield=".$results->[$i]{'printername'},'Delete')); + my %row = ( printername => $results->[$i]{'printername'}, + printqueue => $results->[$i]{'printqueue'}, + printtype => $results->[$i]{'printtype'}); + push @loop, \%row; } - print mktableft; - print "

"; - print ""; + + $template->param(loop => \@loop); + if ($offset>0) { - my $prevpage = $offset-$pagesize; - print mklink("$script_name?offset=".$prevpage,'<< Prev'); + $template->param(offsetgtzero => 1, + prevpage => $offset-$pagesize); } print "      "; if ($offset+$pagesize<$count) { - my $nextpage =$offset+$pagesize; - print mklink("$script_name?offset=".$nextpage,'Next >>'); + $template->param(ltcount => 1, + nextpage => $offset+$pagesize); } - print "

"; - print "
"; + } #---- END $OP eq DEFAULT -print endmenu('admin'); -print endpage(); + +output_html_with_http_headers $input, $cookie, $template->output; + diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl new file mode 100644 index 0000000000..ac0928d1a6 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl @@ -0,0 +1,204 @@ + + + + + + +

Modify printer

+ +

Add printer

+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Printer Name + +
Printer Name + +
Queue
Type
+
+ + + + + data recorded +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Printer
Queue
Type
CONFIRM DELETION
+ + + +
+ +
+
+ + + + data deleted +
+ +
+ + + +

Printer admin

+
+ > + +
+ + + You searched for + + + + + + + + + + + + + + + + + + + +
NameQueueType
EditDelete
+ +
+ + + + << Prev + + +        + + + Next >> + + +
+ +
+
+ + + + + -- 2.39.5