jfdelrio 17 years ago
parent
commit
14448c7d52
2 changed files with 9 additions and 10 deletions
  1. 7 8
      index.php
  2. 2 2
      themes/tumblr/template_photo.htm

+ 7 - 8
index.php View File

51
         $gelato_includes .= "\t<link rel=\"shortcut icon\" href=\"".$conf->urlGelato."/images/favicon.ico\" />\n";
51
         $gelato_includes .= "\t<link rel=\"shortcut icon\" href=\"".$conf->urlGelato."/images/favicon.ico\" />\n";
52
         $gelato_includes .= "\t<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"".$conf->urlGelato.($conf->urlFriendly?"/rss/":"/rss.php")."\"/>\n";
52
         $gelato_includes .= "\t<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"".$conf->urlGelato.($conf->urlFriendly?"/rss/":"/rss.php")."\"/>\n";
53
         $gelato_includes .= "\t<link rel=\"stylesheet\" type=\"text/css\" href=\"".$conf->urlGelato."/themes/".$conf->template."/style.css\"/>\n";
53
         $gelato_includes .= "\t<link rel=\"stylesheet\" type=\"text/css\" href=\"".$conf->urlGelato."/themes/".$conf->template."/style.css\"/>\n";
54
-        $gelato_includes .= "\t<link rel=\"stylesheet\" type=\"text/css\" href=\"".$conf->urlGelato."/admin/css/slimbox.css\" />\n";    
55
-        $gelato_includes .= "\t<script language=\"javascript\" type=\"text/javascript\" src=\"".$conf->urlGelato."/admin/scripts/mootools.js\"></script>\n";
56
-        $gelato_includes .= "\t<script language=\"javascript\" type=\"text/javascript\" src=\"".$conf->urlGelato."/admin/scripts/slimbox.js\"></script>";
54
+        $gelato_includes .= "\t<link rel=\"stylesheet\" type=\"text/css\" href=\"".$conf->urlGelato."/admin/css/lightbox.css\" />\n";    
55
+        $gelato_includes .= "\t<script language=\"javascript\" type=\"text/javascript\" src=\"".$conf->urlGelato."/admin/scripts/jquery.js\"></script>\n";
56
+        $gelato_includes .= "\t<script language=\"javascript\" type=\"text/javascript\" src=\"".$conf->urlGelato."/admin/scripts/lightbox.js\"></script>";
57
         
57
         
58
         $input = array("{Gelato_includes}","{Title}", "{Description}", "{URL_Tumble}", "{Template_name}");
58
         $input = array("{Gelato_includes}","{Title}", "{Description}", "{URL_Tumble}", "{Template_name}");
59
         $output = array($gelato_includes, $conf->title, $conf->description, $conf->urlGelato, $conf->template);
59
         $output = array($gelato_includes, $conf->title, $conf->description, $conf->urlGelato, $conf->template);
112
                                                 } else {													
112
                                                 } else {													
113
 													$photoPath = str_replace("../", $conf->urlGelato."/", $register["url"]);
113
 													$photoPath = str_replace("../", $conf->urlGelato."/", $register["url"]);
114
                                                 }
114
                                                 }
115
-                                                
116
-                                                $effect = " onclick=\"Lightbox.show('".str_replace("../", $conf->urlGelato."/", $register["url"])."', '".strip_tags($register["description"])."');\" ";
115
+
116
+												$effect = " href=\"".str_replace("../", $conf->urlGelato."/", $register["url"])."\" rel=\"lightbox\"";
117
                                                 
117
                                                 
118
                                                 $input = array("{Date_Added}", "{Permalink}", "{PhotoURL}", "{PhotoAlt}", "{Caption}", "{Effect}", "{URL_Tumble}");
118
                                                 $input = array("{Date_Added}", "{Permalink}", "{PhotoURL}", "{PhotoAlt}", "{Caption}", "{Effect}", "{URL_Tumble}");
119
                                                 $output = array($formatedDate, $permalink, $photoPath, strip_tags($register["description"]), $register["description"], $effect, $conf->urlGelato);
119
                                                 $output = array($formatedDate, $permalink, $photoPath, strip_tags($register["description"]), $register["description"], $effect, $conf->urlGelato);
210
                                 } else {
210
                                 } else {
211
 										$photoPath = str_replace("../", $conf->urlGelato."/", $register["url"]);
211
 										$photoPath = str_replace("../", $conf->urlGelato."/", $register["url"]);
212
                                 }
212
                                 }
213
-                                
214
-                                $effect = " onclick=\"Lightbox.show('".str_replace("../", $conf->urlGelato."/", $register["url"])."', '".strip_tags($register["description"])."');\" ";
215
-                                                
213
+
214
+								$effect = " href=\"".str_replace("../", $conf->urlGelato."/", $register["url"])."\" rel=\"lightbox\"";
216
                                 $input = array("{Date_Added}", "{Permalink}", "{PhotoURL}", "{PhotoAlt}", "{Caption}", "{Effect}", "{URL_Tumble}");
215
                                 $input = array("{Date_Added}", "{Permalink}", "{PhotoURL}", "{PhotoAlt}", "{Caption}", "{Effect}", "{URL_Tumble}");
217
                                 $output = array($formatedDate, $permalink, $photoPath, strip_tags($register["description"]), $register["description"], $effect, $conf->urlGelato);
216
                                 $output = array($formatedDate, $permalink, $photoPath, strip_tags($register["description"]), $register["description"], $effect, $conf->urlGelato);
218
                                 
217
                                 

+ 2 - 2
themes/tumblr/template_photo.htm View File

10
                 
10
                 
11
 			   
11
 			   
12
                     <div class="photo">
12
                     <div class="photo">
13
-                        <img src="{PhotoURL}" alt="{PhotoAlt}" {Effect} /><br/>
14
-                        
13
+                        <a {Effect}><img src="{PhotoURL}" alt="{PhotoAlt}" /></a><br/>
14
+                       
15
                             <div class="caption">{Caption}</div>
15
                             <div class="caption">{Caption}</div>
16
                         
16
                         
17
                     </div>
17
                     </div>