richard
/
sorbetcms
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Some changes :)

master
vbracco 2008-11-01 23:36:04 +00:00
parent 4a309e8faf
commit 9533dd1cf9
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
index.php
View File

@ -49,8 +49,6 @@ $theme = new themes;
} }
$feed_url = $conf->urlGelato.($conf->urlFriendly?"/rss/":"/rss.php"); $feed_url = $conf->urlGelato.($conf->urlFriendly?"/rss/":"/rss.php");
$trigger->call('feed_url');
$theme->set('rssFeed',"\t<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"".$feed_url."\"/>\n");
$gelato_includes = "<meta name=\"generator\" content=\"gelato ".codeName()." (".version().")\" />\n"; $gelato_includes = "<meta name=\"generator\" content=\"gelato ".codeName()." (".version().")\" />\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\" />";
@ -75,6 +73,7 @@ $theme = new themes;
} }
$trigger->call('gelato_includes'); $trigger->call('gelato_includes');
$theme->set('rssFeed',$feed_url);
$theme->set('Gelato_includes',$gelato_includes); $theme->set('Gelato_includes',$gelato_includes);
$theme->set('Title',$conf->title); $theme->set('Title',$conf->title);
$theme->set('Page_Title',$page_title); $theme->set('Page_Title',$page_title);

6
plugins/feedreplacement.php
View File

@ -57,12 +57,10 @@ class feedreplacement extends plugins {
} }
function feedreplacement_includeFeed(){ function feedreplacement_includeFeed(){
global $conf,$gelato_includes; global $conf,$gelato_includes,$feed_url;
$feedreplacement_url = $conf->get_option('feedreplacement_url'); $feedreplacement_url = $conf->get_option('feedreplacement_url');
if($feedreplacement_url!=""){ if($feedreplacement_url!=""){
$feed = ($conf->urlFriendly?"/rss/":"/rss.php"); $feed_url = $feedreplacement_url;
$url = $conf->urlGelato.$feed;
$gelato_includes = str_replace($url,$feedreplacement_url,$gelato_includes);
} }
} }

4
themes/tumblr/index.htm
View File

@ -8,7 +8,7 @@
<script language="javascript" type="text/javascript" src="{URL_Tumble}/admin/scripts/jquery.js"></script> <script language="javascript" type="text/javascript" src="{URL_Tumble}/admin/scripts/jquery.js"></script>
<script language="javascript" type="text/javascript" src="{URL_Tumble}/admin/scripts/lightbox.js"></script> <script language="javascript" type="text/javascript" src="{URL_Tumble}/admin/scripts/lightbox.js"></script>
<link rel="stylesheet" type="text/css" href="{URL_Tumble}/admin/css/lightbox.css" /> <link rel="stylesheet" type="text/css" href="{URL_Tumble}/admin/css/lightbox.css" />
{rssFeed} <link rel="alternate" type="application/rss+xml" title="RSS" href="{rssFeed}" />
<title>{Page_Title}</title> <title>{Page_Title}</title>
<!--[if IE]> <!--[if IE]>
<style type="text/css"> <style type="text/css">
@ -20,7 +20,7 @@
</head> </head>
<body> <body>
<div id="container"> <div id="container">
<a href="{URL_Tumble}/rss.php"><img src="{URL_Tumble}/themes/{Template_name}/img/rss.gif" id="rss" alt="RSS" title="RSS" /></a> <a href="{rssFeed}"><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> <h1><a href="{URL_Tumble}/">{Title}</a></h1>