diff options
Diffstat (limited to 'httemplate/elements')
| -rw-r--r-- | httemplate/elements/menubar.html | 7 | ||||
| -rw-r--r-- | httemplate/elements/select-agent.html | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/httemplate/elements/menubar.html b/httemplate/elements/menubar.html index c14904337..ffe83ec57 100644 --- a/httemplate/elements/menubar.html +++ b/httemplate/elements/menubar.html @@ -52,7 +52,12 @@ while (@_) { } - push @html, qq!<A HREF="$url_base$url" $style>$item</A>!; + if ($item eq 'popup') { + push @html, $url; + } + else { + push @html, qq!<A HREF="$url_base$url" $style>$item</A>!; + } } diff --git a/httemplate/elements/select-agent.html b/httemplate/elements/select-agent.html index fd2c57eac..2bd0095da 100644 --- a/httemplate/elements/select-agent.html +++ b/httemplate/elements/select-agent.html @@ -3,7 +3,7 @@ 'name_col' => 'agent', 'value' => $agentnum || '', 'agent_virt' => 1, - 'empty_label' => emt('all'), + 'empty_label' => $empty_label, 'hashref' => { 'disabled' => '' }, 'order_by' => ' ORDER BY agent', 'disable_empty' => $disable_empty, @@ -18,6 +18,7 @@ $opt{'records'} = delete $opt{'agents'} if $opt{'agents'}; my $curuser = $FS::CurrentUser::CurrentUser; +my $empty_label = $opt{'empty_label'} ? $opt{'empty_label'} : 'all'; my $disable_empty = 0; if ( $opt{'agent_null_right'} ) { if ( $curuser->access_right($opt{'agent_null_right'}) ) { |