Procházet zdrojové kódy

Added "feed_url" trigger & separate gelato_includes.

Victor De la Rocha před 16 roky
rodič
revize
7dceb5493a
2 změnil soubory, kde provedl 16 přidání a 14 odebrání
  1. 8 11
      index.php
  2. 8 3
      themes/tumblr/index.htm

+ 8 - 11
index.php Zobrazit soubor

@@ -48,16 +48,13 @@ $theme = new themes;
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 58
 		$page_title = $conf->title;
62 59
 		$page_title_divisor = " &raquo; "; // it should be set in configuration
63 60
 		$page_title_len = 50; // it should be set in configuration
@@ -76,7 +73,7 @@ $theme = new themes;
76 73
 				$page_title .= $page_title_divisor.stripslashes($page_title_data);
77 74
 			}
78 75
 		}
79
-		
76
+
80 77
 		$trigger->call('gelato_includes');
81 78
 		$theme->set('Gelato_includes',$gelato_includes);
82 79
 		$theme->set('Title',$conf->title);

+ 8 - 3
themes/tumblr/index.htm Zobrazit soubor

@@ -1,8 +1,13 @@
1 1
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
2 2
 	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
3 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 11
     <title>{Page_Title}</title>
7 12
     <!--[if IE]>
8 13
         <style type="text/css">
@@ -81,7 +86,7 @@
81 86
 					<h3>{__("Posted by")} {$row.User} {if {$allowComments}}- <a href="{$row.Permalink}#comments">( {$row.Comments_Number} ) {__("comments")}{/if}</a></h3>
82 87
 				</div>
83 88
 			{/if}
84
-			
89
+
85 90
 		{/block}
86 91
 
87 92
 		{if {$id_post}}