summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorivan <ivan>2009-08-12 11:58:22 +0000
committerivan <ivan>2009-08-12 11:58:22 +0000
commit4ce9a16a64e3a720085582b3b095bba0b6e514de (patch)
treec2607620224e583265f8c7c04caea8a7e338ea19
parent68fd776bf40bba780a3a8de95f630a51d4e5a70d (diff)
slight about/credits UI tweak
-rw-r--r--httemplate/docs/about.html4
-rw-r--r--httemplate/docs/credits.html4
-rw-r--r--httemplate/docs/license.html4
-rw-r--r--httemplate/elements/header-popup.html33
4 files changed, 31 insertions, 14 deletions
diff --git a/httemplate/docs/about.html b/httemplate/docs/about.html
index 29f120b5d..303c62d1c 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') %>
<CENTER>
-<IMG SRC="<%$fsurl%>images/small-logo.png" BORDER=0"><BR>
+<IMG SRC="<%$fsurl%>images/small-logo.png" BORDER="0"><BR>
<H3>version <% $FS::VERSION %></H3>
</CENTER>
diff --git a/httemplate/docs/credits.html b/httemplate/docs/credits.html
index 6dd3b09f2..cb7e87901 100644
--- a/httemplate/docs/credits.html
+++ b/httemplate/docs/credits.html
@@ -24,10 +24,8 @@
<CENTER>Freeside</CENTER>
</FONT>
-<BR>
-
<CENTER>
-<IMG SRC="<%$fsurl%>images/small-logo.png" BORDER=0"><BR>
+<IMG SRC="<%$fsurl%>images/small-logo.png" BORDER="0"><BR>
<H3>version <% $FS::VERSION %></H3>
</CENTER>
diff --git a/httemplate/docs/license.html b/httemplate/docs/license.html
index dab47d665..5df35e07d 100644
--- a/httemplate/docs/license.html
+++ b/httemplate/docs/license.html
@@ -1,6 +1,6 @@
-<% include('/elements/header-popup.html', 'Freeside') %>
+<% include('/elements/header-popup.html', { title=>'Freeside', nobr=>1 } ) %>
<CENTER>
-<IMG SRC="<%$fsurl%>images/small-logo.png" BORDER=0"><BR>
+<IMG SRC="<%$fsurl%>images/small-logo.png" BORDER="0"><BR>
<H3>version <% $FS::VERSION %></H3>
</CENTER>
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 <HEAD> section
-% my $conf = new FS::Conf;
-%
-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<HTML>
<HEAD>
@@ -21,4 +14,30 @@
<FONT SIZE=6>
<CENTER><% $title %></CENTER>
</FONT>
+
+% unless ( $nobr ) {
<BR><!--<BR>-->
+% }
+
+<%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 <HEAD> section
+}
+
+my $conf = new FS::Conf;
+
+</%init>