Index: /branches/htmlform/cgi-bin/main.cgi =================================================================== --- /branches/htmlform/cgi-bin/main.cgi (revision 450) +++ /branches/htmlform/cgi-bin/main.cgi (revision 451) @@ -55,8 +55,8 @@ $ENV{HTML_TEMPLATE_ROOT} = '/home/kdeugau/dev/ipdb/trunk/templates'; -# Headerize! Make sure we replace the $$EXTRA0$$ bit as needed. -printHeader('', ($IPDBacl{$authuser} =~ /a/ ? - 'Add new assignment' : '' - )); +my $header = HTML::Template->new(filename => "header.tmpl"); +$header->param(version => $IPDB::VERSION); +$header->param(addperm => $IPDBacl{$authuser} =~ /a/); +print "Content-type: text/html\n\n", $header->output; # Set up the CGI object... Index: /branches/htmlform/cgi-bin/search.cgi =================================================================== --- /branches/htmlform/cgi-bin/search.cgi (revision 450) +++ /branches/htmlform/cgi-bin/search.cgi (revision 451) @@ -74,8 +74,8 @@ } -# Headerize! Make sure we replace the $$EXTRA0$$ bit as needed. -printHeader('', ($IPDBacl{$authuser} =~ /a/ ? - 'Add new assignment' : '' - )); +my $header = HTML::Template->new(filename => "header.tmpl"); +$header->param(version => $IPDB::VERSION); +$header->param(addperm => $IPDBacl{$authuser} =~ /a/); +print "Content-type: text/html\n\n", $header->output; if ($webvar{stype} eq 'q') { Index: /branches/htmlform/ipdb.css =================================================================== --- /branches/htmlform/ipdb.css (revision 450) +++ /branches/htmlform/ipdb.css (revision 451) @@ -1,3 +1,55 @@ +/* Default/global defs for specific tags */ +fieldset { + border: none; + padding: 0px; + margin: 0px; +} + /* Specific divs */ +#bodyheader { + margin-left: 4px; + position: relative; +} +#homelink { + font-size: 13px; + font-weight: bold; + position: absolute; + right: 10px; + bottom: 2px; + text-align: right; +} +#subheader { + background-color: #D0E0E0; + font-size: 90%; + padding: 3px; + border-top: thin solid #000000; + /* apparently this is required to keep "contained" position: absolute divs from escaping. O_o */ + position: relative; +} +#csearch { + float: right; + padding: 3px; +} +#newlink { + position: absolute; + right: 10px; + top: 6px; + text-align: right; +} +#main { + padding: 10px; + border-top: thin solid #000000; +/* text-align: center;*/ + padding-top: 20px; + position: relative; +} +#utils { + font-size: 13px; + font-weight: bold; + position: absolute; + right: 10px; + top: 2px; + text-align: right; +} #adminlink { position: absolute; @@ -27,4 +79,9 @@ a:hover { color:#dd00dd; } /* mouse over link */ a:active { color:#cc0000; } /* selected link */ + +table.centre { + margin-left: auto; + margin-right: auto; +} /* Defs for bulk-data rows */ @@ -81,4 +138,5 @@ } +/* Generic classes */ .indent { margin-left: 5%; Index: /branches/htmlform/templates/footer.tmpl =================================================================== --- /branches/htmlform/templates/footer.tmpl (revision 450) +++ /branches/htmlform/templates/footer.tmpl (revision 451) @@ -1,10 +1,10 @@
- + -