From 600a15aa56c212e1206fced9cbcf9de103c2f95b Mon Sep 17 00:00:00 2001 From: ivan Date: Wed, 12 Aug 2009 11:58:21 +0000 Subject: [PATCH] slight about/credits UI tweak --- httemplate/docs/about.html | 4 ++-- httemplate/docs/credits.html | 4 +--- httemplate/docs/license.html | 6 +++--- httemplate/elements/header-popup.html | 33 ++++++++++++++++++++++++++------- 4 files changed, 32 insertions(+), 15 deletions(-) diff --git a/httemplate/docs/about.html b/httemplate/docs/about.html index fbf0a66f5..04af73db8 100644 --- a/httemplate/docs/about.html +++ b/httemplate/docs/about.html @@ -1,9 +1,9 @@ -<% include('/elements/header-popup.html', 'Freeside') %> +<% include('/elements/header-popup.html', { title=>'Freeside', nobr=>1 } ) %> <% include('/elements/init_overlib.html') %>
-
+

version <% $FS::VERSION %>

diff --git a/httemplate/docs/credits.html b/httemplate/docs/credits.html index a944f48fa..d927722e0 100644 --- a/httemplate/docs/credits.html +++ b/httemplate/docs/credits.html @@ -24,10 +24,8 @@
Freeside
-
-
-
+

version <% $FS::VERSION %>

diff --git a/httemplate/docs/license.html b/httemplate/docs/license.html index a673bc9dd..fc3da6913 100644 --- a/httemplate/docs/license.html +++ b/httemplate/docs/license.html @@ -1,12 +1,12 @@ -<% include('/elements/header-popup.html', 'Freeside') %> +<% include('/elements/header-popup.html', { title=>'Freeside', nobr=>1 } ) %>
-
+

version <% $FS::VERSION %>

-Copyright © 2005-2008 Freeside Internet Services, Inc.
+Copyright © 2005-2009 Freeside Internet Services, Inc.
Copyright © 2000-2005 Ivan Kohler
Copyright © 1999 Silicon Interactive Software Design
All rights reserved
diff --git a/httemplate/elements/header-popup.html b/httemplate/elements/header-popup.html index 68be108d2..d74581b07 100644 --- a/httemplate/elements/header-popup.html +++ b/httemplate/elements/header-popup.html @@ -1,10 +1,3 @@ -% -% my($title, $menubar) = ( shift, shift ); #$menubar is unused here though -% my $etc = @_ ? shift : ''; #$etc is for things like onLoad= etc. -% my $head = @_ ? shift : ''; #$head is for things that go in the section -% my $conf = new FS::Conf; -% - @@ -21,4 +14,30 @@

<% $title %>
+ +% unless ( $nobr ) {
+% } + +<%init> + +my( $title, $menubar, $etc, $head ) = ( '', '', '', '' ); +#my( $nobr, $nocss ) = ( 0, 0 ); +my $nobr = 0; +if ( ref($_[0]) ) { + my $opt = shift; + $title = $opt->{title}; + $menubar = $opt->{menubar}; + $etc = $opt->{etc}; + $head = $opt->{head}; + $nobr = $opt->{nobr}; +# $nocss = $opt->{nocss}; +} else { + ($title, $menubar) = ( shift, shift ); + $etc = @_ ? shift : ''; #$etc is for things like onLoad= etc. + $head = @_ ? shift : ''; #$head is for things that go in the section +} + +my $conf = new FS::Conf; + + -- 2.11.0