Home Explore Help
Sign In
Paenibacillus
/
sorbetcms
forked from richard/sorbetcms
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Commits 290 Releases 0 Wiki
Browse Source

Added "feed_url" trigger & separate gelato_includes.

Victor De la Rocha 16 years ago
parent
c3685083f3
commit
7dceb5493a
2 changed files with 16 additions and 14 deletions
Unified View Show Diff Stats
  1. 8 11
      index.php
  2. 8 3
      themes/tumblr/index.htm

+ 8 - 11
index.php View File

48 
                 }
48 
                 }
49 
         }
49 
         }
50
50
51 
-        $gelato_includes = "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>\n";
52 
-        $gelato_includes .= "\t<meta name=\"generator\" content=\"gelato ".codeName()." (".version().")\" />\n";
53 
-        $gelato_includes .= "\t<link rel=\"shortcut icon\" href=\"".$conf->urlGelato."/images/favicon.ico\" />\n";
54 
-        $gelato_includes .= "\t<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"".$conf->urlGelato.($conf->urlFriendly?"/rss/":"/rss.php")."\"/>\n";
55 
-        $gelato_includes .= "\t<link rel=\"stylesheet\" type=\"text/css\" href=\"".$conf->urlGelato."/themes/".$conf->template."/style.css\"/>\n";
56 
-        $gelato_includes .= "\t<link rel=\"stylesheet\" type=\"text/css\" href=\"".$conf->urlGelato."/admin/css/lightbox.css\" />\n";
57 
-        $gelato_includes .= "\t<script language=\"javascript\" type=\"text/javascript\" src=\"".$conf->urlGelato."/admin/scripts/jquery.js\"></script>\n";
58 
-        $gelato_includes .= "\t<script language=\"javascript\" type=\"text/javascript\" src=\"".$conf->urlGelato."/admin/scripts/lightbox.js\"></script>";
59 
-
60 
-
51 
+		$feed_url = $conf->urlGelato.($conf->urlFriendly?"/rss/":"/rss.php");
52 
+		$trigger->call('feed_url');
53 
+		$theme->set('rssFeed',"\t<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"".$feed_url."\"/>\n");
54 
+
55 
+        $gelato_includes = "<meta name=\"generator\" content=\"gelato ".codeName()." (".version().")\" />\n";
56 
+        $gelato_includes .= "\t<link rel=\"shortcut icon\" href=\"".$conf->urlGelato."/images/favicon.ico\" />";
57 
+
61 
 		$page_title = $conf->title;
58 
 		$page_title = $conf->title;
62 
 		$page_title_divisor = " &raquo; "; // it should be set in configuration
59 
 		$page_title_divisor = " &raquo; "; // it should be set in configuration
63 
 		$page_title_len = 50; // it should be set in configuration
60 
 		$page_title_len = 50; // it should be set in configuration
76 
 				$page_title .= $page_title_divisor.stripslashes($page_title_data);
73 
 				$page_title .= $page_title_divisor.stripslashes($page_title_data);
77 
 			}
74 
 			}
78 
 		}
75 
 		}
79 
-
76 
+
80 
 		$trigger->call('gelato_includes');
77 
 		$trigger->call('gelato_includes');
81 
 		$theme->set('Gelato_includes',$gelato_includes);
78 
 		$theme->set('Gelato_includes',$gelato_includes);
82 
 		$theme->set('Title',$conf->title);
79 
 		$theme->set('Title',$conf->title);

+ 8 - 3
themes/tumblr/index.htm View File

1 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
1 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
2 
 	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
2 
 	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
3 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
3 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
4 
-<head>
5 
-	{Gelato_includes}
4 
+<head>
5 
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
6 
+	{Gelato_includes}
7 
+	<link rel="stylesheet" type="text/css" href="{URL_Tumble}/themes/{Template_name}/style.css"/>
8 
+	<script language="javascript" type="text/javascript" src="{URL_Tumble}/admin/scripts/jquery.js"></script>
9 
+	<script language="javascript" type="text/javascript" src="{URL_Tumble}/admin/scripts/lightbox.js"></script>
10 
+	<link rel="stylesheet" type="text/css" href="{URL_Tumble}/admin/css/lightbox.css" />
6 
     <title>{Page_Title}</title>
11 
     <title>{Page_Title}</title>
7 
     <!--[if IE]>
12 
     <!--[if IE]>
8 
         <style type="text/css">
13 
         <style type="text/css">
81 
 					<h3>{__("Posted by")} {$row.User} {if {$allowComments}}- <a href="{$row.Permalink}#comments">( {$row.Comments_Number} ) {__("comments")}{/if}</a></h3>
86 
 					<h3>{__("Posted by")} {$row.User} {if {$allowComments}}- <a href="{$row.Permalink}#comments">( {$row.Comments_Number} ) {__("comments")}{/if}</a></h3>
82 
 				</div>
87 
 				</div>
83 
 			{/if}
88 
 			{/if}
84 
-
89 
+
85 
 		{/block}
90 
 		{/block}
86
91
87 
 		{if {$id_post}}
 92 
 		{if {$id_post}}