From 0ee87ce2f12ab1ba734f6d2b60c60469c07f9b8c Mon Sep 17 00:00:00 2001 From: ivan Date: Fri, 11 Nov 2011 23:59:50 +0000 Subject: DSL status pulling, RT#13656 --- httemplate/elements/header-popup.html | 22 +++++++++++----------- httemplate/view/svc_Status.html | 7 +------ 2 files changed, 12 insertions(+), 17 deletions(-) (limited to 'httemplate') diff --git a/httemplate/elements/header-popup.html b/httemplate/elements/header-popup.html index d94f7eb48..472a7325e 100644 --- a/httemplate/elements/header-popup.html +++ b/httemplate/elements/header-popup.html @@ -2,15 +2,15 @@ Example: - include( '/elements/header-popup.html', - { - 'title' => 'Title', - 'menubar' => \@menubar, - 'etc' => '', #included in tag, for things like onLoad= - 'head' => '', #included before closing tag - 'nobr' => 0, #1 for no

after the title - } - ); + <& /elements/header-popup.html, + { + 'title' => 'Title', + 'menubar' => \@menubar, + 'etc' => '', #included in tag, for things like onLoad= + 'head' => '', #included before closing tag + 'nobr' => 0, #1 for no

after the title + } + &> #old-style include( '/elements/header.html', 'Title', $menubar, $etc, $head); @@ -29,14 +29,14 @@ Example: > +% if ( $title ) {
<% $title |h %>
- +% } % unless ( $nobr ) {
% } - <%init> my( $title, $menubar, $etc, $head ) = ( '', '', '', '' ); diff --git a/httemplate/view/svc_Status.html b/httemplate/view/svc_Status.html index 4a64d47bc..74fd6bd81 100644 --- a/httemplate/view/svc_Status.html +++ b/httemplate/view/svc_Status.html @@ -4,12 +4,7 @@ 'nobr' => 0, #1 for no

after the title } &> -% foreach my $export ( grep $_->can('export_getstatus'), $part_svc->part_export ) { -% my $html = ''; -% my %hash = (); -% $export->export_getstatus( $svc_x, \$html, \%hash ); <% $html %> -% } <%init> $cgi->param('svcnum') =~ /^(\d+)$/ or die 'illegal svcnum'; @@ -19,6 +14,6 @@ my $cust_svc = qsearchs( 'cust_svc', { 'svcnum' => $svcnum } ); die "Unknown svcnum" unless $cust_svc; my $svc_x = $cust_svc->svc_x; -my $part_svc = $cust_svc->part_svc; +my $html = $svc_x->getstatus_html; -- cgit v1.2.1