[Slim-Checkins] r11141 - in /trunk/server/HTML: Default/pageheader.html EN/home.html

Sat Jan 6 14:56:26 PST 2007

Author: kdf
Date: Sat Jan  6 14:56:26 2007
New Revision: 11141

URL: http://svn.slimdevices.com?rev=11141&view=rev
Log:
Bug: n/a
Description: allow page template to set the scripts to be loaded in pageheader.html


Modified:
    trunk/server/HTML/Default/pageheader.html
    trunk/server/HTML/EN/home.html

Modified: trunk/server/HTML/Default/pageheader.html
URL: http://svn.slimdevices.com/trunk/server/HTML/Default/pageheader.html?rev=11141&r1=11140&r2=11141&view=diff
==============================================================================

--- trunk/server/HTML/Default/pageheader.html (original)
+++ trunk/server/HTML/Default/pageheader.html Sat Jan  6 14:56:26 2007
@@ -13,9 +13,7 @@
 	.thumbwrap { width: 97%}
 </style>
 <![endif]-->
-
-	<script type="text/javascript" src="[% webroot %]html/prototype.js" ></script>
-	<script TYPE="text/javascript" language="JavaScript">[% PROCESS html/global.js %]</script>
+	[% IF pageHeaderScripts %][% pageHeaderScripts %][% END %]
 	[% PROCESS html/common.js %]
 </head>
 <body [% bodyscript %]>

Modified: trunk/server/HTML/EN/home.html
URL: http://svn.slimdevices.com/trunk/server/HTML/EN/home.html?rev=11141&r1=11140&r2=11141&view=diff
==============================================================================
--- trunk/server/HTML/EN/home.html (original)
+++ trunk/server/HTML/EN/home.html Sat Jan  6 14:56:26 2007
@@ -27,11 +27,17 @@
 		[% END %]
 	</div>
 
-[% END %]	
+[% END %]
+
+[% pageHeaderScripts = BLOCK %]
+	<script type="text/javascript" src="[% webroot %]html/prototype.js" ></script>
+	<script TYPE="text/javascript" language="JavaScript">[% PROCESS html/global.js %]</script>
+[% END %]
+
 [% END -%]
 [% PROCESS pageheader.html %]
 
-			<div id="progressName"></div>
+			<div id="progressName">[% IF progress.name %][% progress.name _ "_PROGRESS" | string %][% END %]</div>
 			<a href="[% webroot %]progress.html?type=importer"><span id="progressBar" >[% progress.bar %]</span></a>
 
 <div class="homeMenuSection">

