From ff182eaa7045ca68faf1f09bd73256aba11aa101 Mon Sep 17 00:00:00 2001
From: pecesama <pecesama@gmail.com>
Date: Fri, 6 Jul 2007 06:29:38 +0000
Subject: [PATCH] Path for bug on theme selection

---
 index.php                         | 8 +++++---
 themes/tumblr/template_header.htm | 6 ++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/index.php b/index.php
index cc9c58c..126b281 100644
--- a/index.php
+++ b/index.php
@@ -60,10 +60,12 @@
 	$gelato_includes = "<script language=\"javascript\" type=\"text/javascript\" src=\"".$conf->urlGelato."/admin/scripts/mootools.js\"></script>\n";
 	$gelato_includes .= "\t<script language=\"javascript\" type=\"text/javascript\" src=\"".$conf->urlGelato."/admin/scripts/slimbox.js\"></script>\n";
 	$gelato_includes .= "\t<link rel=\"stylesheet\" type=\"text/css\" href=\"".$conf->urlGelato."/admin/css/slimbox.css\" />\n";
-	$gelato_includes .= "\t<link rel=\"shortcut icon\" href=\"".$conf->urlGelato."/images/favicon.ico\" />";
+	$gelato_includes .= "\t<link rel=\"shortcut icon\" href=\"".$conf->urlGelato."/images/favicon.ico\" />\n";
+	$gelato_includes .= "\t<link rel=\"stylesheet\" type=\"text/css\" href=\"".$conf->urlGelato."/themes/".$conf->template."/style.css\"/>\n";
+	$gelato_includes .= "\t<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"".$conf->urlGelato."/rss.php\"/>";
 	
-	$input = array("{Gelato_includes}","{Title}", "{Description}", "{URL_Tumble}");
-	$output = array($gelato_includes, $conf->title, $conf->description, $conf->urlGelato);
+	$input = array("{Gelato_includes}","{Title}", "{Description}", "{URL_Tumble}", "{Template_name}");
+	$output = array($gelato_includes, $conf->title, $conf->description, $conf->urlGelato, $conf->template);
 	
 	$template->cargarPlantilla($input, $output, "template_header");
 	$template->mostrarPlantilla();
diff --git a/themes/tumblr/template_header.htm b/themes/tumblr/template_header.htm
index a981976..5efcd23 100644
--- a/themes/tumblr/template_header.htm
+++ b/themes/tumblr/template_header.htm
@@ -3,9 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>    
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-	{Gelato_includes}
-	<link rel="stylesheet" type="text/css" href="{URL_Tumble}/themes/tumblr/style.css"/>
-	<link rel="alternate" type="application/rss+xml" title="RSS" href="{URL_Tumble}/rss.php"/>
+	{Gelato_includes}	
     <title>{Title}</title>
     <!--[if IE]>
         <style type="text/css">
@@ -17,7 +15,7 @@
 </head>
 <body>
     <div id="container">
-        <a href="{URL_Tumble}/rss.php"><img src="{URL_Tumble}/themes/tumblr/img/rss.gif" id="rss" alt="RSS" title="RSS" /></a>
+        <a href="{URL_Tumble}/rss.php"><img src="{URL_Tumble}/themes/{Template_name}/img/rss.gif" id="rss" alt="RSS" title="RSS" /></a>
 
         <h1><a href="{URL_Tumble}/">{Title}</a></h1>