[freeside-commits] freeside/torrus/templates html-incblocks.txt, 1.1.1.1, 1.2

Mon Dec 27 00:40:21 PST 2010

Update of /home/cvs/cvsroot/freeside/torrus/templates
In directory wavetail.420.am:/tmp/cvs-serv16912/torrus/templates

Modified Files:
	html-incblocks.txt 
Log Message:
torrus, RT#10574

Index: html-incblocks.txt
===================================================================
RCS file: /home/cvs/cvsroot/freeside/torrus/templates/html-incblocks.txt,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -w -d -r1.1.1.1 -r1.2

--- html-incblocks.txt	27 Dec 2010 00:04:03 -0000	1.1.1.1
+++ html-incblocks.txt	27 Dec 2010 08:40:19 -0000	1.2
@@ -11,11 +11,9 @@
 
 [% BLOCK htmlstart;
    IF ! contentClass; contentClass="Content"; END %]
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd">
-<HTML>
-<!-- Torrus Copyright (c) 2003-2004 Stanislav Sinyagin -->
-<HEAD>
+
+[% freesideHeader(title, style('stylesheet')) %]
+
 <SCRIPT language="JavaScript"> 
 <!--
 function helpwindow() 
@@ -25,26 +23,9 @@
 } 
 //--> 
 </SCRIPT>
-<TITLE>[% title %]</TITLE>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-[% IF expires %]<META HTTP-EQUIV="Refresh" CONTENT="[% expires %]"/>[% END %]
-<STYLE type="text/css" media="all">
-  @import url( [% plainURL _ style('stylesheet') %] );
-  [% cssoverlay = style('cssoverlay'); IF cssoverlay; %]
-  @import url( [% cssoverlay %] );
-  [% END %]
-</STYLE>
-</HEAD>
-<BODY>
 
 <DIV CLASS="Header">
 
-<SPAN CLASS="CompanyInfo">
-<A TITLE="company info"
-HREF="[%companyURL%]">[% IF companyLogo %]<IMG SRC="[%companyLogo%]"
-ALT=[%companyName%] STYLE="border:0">[% ELSE; companyName; END %]</A>
-</SPAN>
-
 [% IF siteInfo %]
 <SPAN CLASS="SiteInfo">
 [% siteInfo %]

