michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-09 16:52:19 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Use common function for main page header

Browse Source
This commit is contained in:
Jamie Cameron
2010-03-21 21:52:49 -07:00
parent 16564821f4
commit d47279471f
2 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
blue-theme/index.cgi
View File

@@ -26,21 +26,18 @@ if ($in{'page'}) {
$title = &get_html_framed_title();
&PrintHeader();
$cols = &get_product_name() eq 'usermin' ? 180 : 230;
print <<EOF;
<html>
<head> <title>$title</title> </head>
&popup_header($title, undef, undef, 1);
print <<EOF;
<frameset cols="$cols,*" border=0>
<frame name="left" src="left.cgi$cat" scrolling="auto">
<frame name="right" src="$goto" noresize>
<noframes>
<body>
<p>This page uses frames, but your browser doesn't support them.</p>
</body>
</noframes>
</frameset>
</html>
EOF
&popup_footer();

37
web-lib-funcs.pl
View File

@@ -789,12 +789,8 @@ if (@_ > 0) {
}
print "$tconfig{'headhtml'}\n" if ($tconfig{'headhtml'});
if ($tconfig{'headinclude'}) {
local $_;
open(INC, "$theme_root_directory/$tconfig{'headinclude'}");
while(<INC>) {
print;
}
close(INC);
print &read_file_contents(
"$theme_root_directory/$tconfig{'headinclude'}");
}
print "</head>\n";
my $bgcolor = defined($tconfig{'cs_page'}) ? $tconfig{'cs_page'} :
@@ -1021,7 +1017,7 @@ else {
}
}
=head2 popup_header([title], [head-stuff], [body-stuff])
=head2 popup_header([title], [head-stuff], [body-stuff], [no-body])
Outputs a page header, suitable for a popup window. If no title is given,
absolutely no decorations are output. Also useful in framesets. The parameters
@@ -1033,6 +1029,8 @@ are :
=item body-stuff - HTML attributes to be include in the <body> tag.
=item no-body - If set to 1, don't generate a body tag
=cut
sub popup_header
{
@@ -1056,12 +1054,8 @@ print "<title>$_[0]</title>\n";
print $_[1];
print "$tconfig{'headhtml'}\n" if ($tconfig{'headhtml'});
if ($tconfig{'headinclude'}) {
local $_;
open(INC, "$theme_root_directory/$tconfig{'headinclude'}");
while(<INC>) {
print;
}
close(INC);
print &read_file_contents(
"$theme_root_directory/$tconfig{'headinclude'}");
}
print "</head>\n";
my $bgcolor = defined($tconfig{'cs_page'}) ? $tconfig{'cs_page'} :
@@ -1072,10 +1066,12 @@ my $text = defined($tconfig{'cs_text'}) ? $tconfig{'cs_text'} :
defined($gconfig{'cs_text'}) ? $gconfig{'cs_text'} : "000000";
my $bgimage = defined($tconfig{'bgimage'}) ? "background=$tconfig{'bgimage'}"
: "";
print "<body id='popup' bgcolor=#$bgcolor link=#$link vlink=#$link ",
"text=#$text $bgimage $tconfig{'inbody'} $_[2]>\n";
if (defined(&theme_popup_prebody)) {
&theme_popup_prebody(@_);
if (!$_[3]) {
print "<body id='popup' bgcolor=#$bgcolor link=#$link vlink=#$link ",
"text=#$text $bgimage $tconfig{'inbody'} $_[2]>\n";
if (defined(&theme_popup_prebody)) {
&theme_popup_prebody(@_);
}
}
}
@@ -1152,7 +1148,7 @@ if (!$_[$i]) {
}
}
=head2 popup_footer
=head2 popup_footer([no-body])
Outputs html for a footer for a popup window, started by popup_header.
@@ -1164,7 +1160,10 @@ if (defined(&theme_popup_footer)) {
&theme_popup_footer(@_);
return;
}
print "</body></html>\n";
if (!$_[0]) {
print "</body>\n";
}
print "</html>\n";
}
=head2 load_theme_library