diff options
author | ivan <ivan> | 2011-11-11 23:59:50 +0000 |
---|---|---|
committer | ivan <ivan> | 2011-11-11 23:59:50 +0000 |
commit | 0ee87ce2f12ab1ba734f6d2b60c60469c07f9b8c (patch) | |
tree | 5f9a3319673abfb713a71b93cd9292165e753e25 /httemplate | |
parent | 898abe13b00b7dec565740cede15a92810335349 (diff) |
DSL status pulling, RT#13656
Diffstat (limited to 'httemplate')
-rw-r--r-- | httemplate/elements/header-popup.html | 22 | ||||
-rw-r--r-- | httemplate/view/svc_Status.html | 7 |
2 files changed, 12 insertions, 17 deletions
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 <BODY> tag, for things like onLoad= - 'head' => '', #included before closing </HEAD> tag - 'nobr' => 0, #1 for no <BR><BR> after the title - } - ); + <& /elements/header-popup.html, + { + 'title' => 'Title', + 'menubar' => \@menubar, + 'etc' => '', #included in <BODY> tag, for things like onLoad= + 'head' => '', #included before closing </HEAD> tag + 'nobr' => 0, #1 for no <BR><BR> after the title + } + &> #old-style include( '/elements/header.html', 'Title', $menubar, $etc, $head); @@ -29,14 +29,14 @@ Example: </HEAD> <BODY <% $etc %>> <link href="<%$fsurl%>elements/freeside.css" type="text/css" rel="stylesheet"> +% if ( $title ) { <FONT SIZE=6> <CENTER><% $title |h %></CENTER> </FONT> - +% } % unless ( $nobr ) { <BR><!--<BR>--> % } - <%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 <BR><BR> 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; </%init> |