Ticket #1080: fix_for_podPress_downloadlinks_container_v2.patch

podpress_theme.php

@@ -36 +36 @@
                                 $val['dimensionH'] = "''";
                         }
                         $dividerNeeded = false;
-
+                        
+                        $podPressEpisodeTitle = __($val['title'], 'podpress'); // if the title is not given by the author then it will be a defaultTitle (see podPress_defaultTitles)
+                        
                         if($val['enablePlayer']) {
                                 if($podPressContent != '') {                    
                                         $podPressContent .= "<br />\n";
                                 }
-                                $podPressContent .= "\n".'<div id="podPressPlayerSpace_'.$GLOBALS['podPressPlayer'].'">&nbsp;</div>'."\n".'<!-- Begin: podPress download link line -->'."\n".'<div class="podPress_downloadlinks">';
+                                $podPressContent .= "\n".'<div id="podPressPlayerSpace_'.$GLOBALS['podPressPlayer'].'">&nbsp;</div>'."\n";
                         }
-
+                        
+                        $podPressContent .= '<!-- Begin: podPress download link line -->'."\n".'<div class="podPress_downloadlinks">';
+                        
                         if(isset($val['image'])) {
                                 if($val['enableDownload'] && !empty($val['URI'])) {
                                         $podPressContent .= '<a href="'.$val['URI'].'" target="new">';
                                 }
-                                $podPressContent .= '<img src="'.podPress_url().'images/'.$val['image'].'" border="0" align="top" class="podPress_imgicon" alt="icon for podpress" />';
+                                $podPressContent .= '<img src="'.podPress_url().'images/'.$val['image'].'" class="podPress_imgicon" alt="'.$podPressEpisodeTitle.'" />';
                                 if($val['enableDownload'] && !empty($val['URI'])) {
                                         $podPressContent .= '</a>';
                                 }
@@ -56 +60 @@
                                         $val['enableDownload'] = false;
                                 }
                         }
+                        
                         if($val['enableTorrentDownload']) {
                                 $podPressContent .= '<a href="'.$val['URI_torrent'].'" target="new">';
                                 if(strstr($val['image'], '_button')) {
@@ -63 +68 @@
                                 } else {
                                         $torrentimg = 'misc_torrent_icon.png';
                                 }
-                                $podPressContent .= '<img src="'.podPress_url().'images/'.$torrentimg.'" border="0" align="top" class="podPress_imgicon" alt="icon for podpress" />';
+                                $podPressContent .= '<img src="'.podPress_url().'images/'.$torrentimg.'" class="podPress_imgicon" alt="'.$podPressEpisodeTitle.' - '.__('Torrent','podpress').'" />';
                                 $podPressContent .= '</a>';
                         }
 
                         $podPressContent .= ' &nbsp;';
-                        $podPressContent .= __($val['title'], 'podpress');
+                        $podPressContent .= $podPressEpisodeTitle;
 
                         if($podPressTemplateData['showDuration'] == 'enabled' && !empty($val['duration']) && preg_match("/([0-9]):([0-9])/", $val['duration'])) {
                                 $podPressContent .= ' ['.$val['duration'].'m]';
@@ -90 +95 @@
                                         } else {
                                                 $previewVal = 'false';
                                         }
-                                        $podPressContent .= "<a href=\"#\" onclick=\"javascript: podPressShowHidePlayer('".$GLOBALS['podPressPlayer']."','".$val['URI_Player']."',".$val['dimensionW'].",".$val['dimensionH'].",'true'); return false;\"><span id=\"podPressPlayerSpace_".$GLOBALS['podPressPlayer']."_PlayLink\">".__('Play Now', 'podpress')."</span></a>";
+                                        $podPressContent .= '<a href="#podPressPlayerSpace_'.$GLOBALS['podPressPlayer'].'" onclick="javascript:podPressShowHidePlayer(\''.$GLOBALS['podPressPlayer'].'\', \''.$val['URI_Player'].'\', '.$val['dimensionW'].', '.$val['dimensionH'].', \'true\'); return false;"><span id="podPressPlayerSpace_'.$GLOBALS['podPressPlayer'].'_PlayLink">'.__('Play Now', 'podpress').'</span></a>';
                                         $dividerNeeded = true;
                                         if($podPress->settings['contentAutoDisplayPlayer']) {
-                                                $podPressPlayBlockScripts .= "podPressShowHidePlayer('".$GLOBALS['podPressPlayer']."', '".$val['URI_Player']."',".$val['dimensionW'].",".$val['dimensionH'].", '".$previewVal."', '".$val['previewImage']."');\n";
+                                                $podPressPlayBlockScripts .= 'podPressShowHidePlayer(\''.$GLOBALS['podPressPlayer'].'\', \''.$val['URI_Player'].'\', '.$val['dimensionW'].', '.$val['dimensionH'].', \''.$previewVal.'\', \''.$val['previewImage'].'\');';
                                         }
                                 }
 
@@ -101 +106 @@
                                         if($dividerNeeded) {
                                                 $podPressContent .= $divider;
                                         }
-                                        $podPressContent .= "<a href=\"#\" onclick=\"javascript: podPressPopupPlayer('".$GLOBALS['podPressPlayer']."', '".$val['URI_Player']."',".$val['dimensionW'].",".$val['dimensionH']."); return false;\">".__('Play in Popup', 'podpress')."</a>";
+                                        $podPressContent .= '<a href="#podPressPlayerSpace_'.$GLOBALS['podPressPlayer'].'" onclick="javascript:podPressPopupPlayer(\''.$GLOBALS['podPressPlayer'].'\', \''.$val['URI_Player'].'\', '.$val['dimensionW'].', '.$val['dimensionH'].'); return false;">'.__('Play in Popup', 'podpress').'</a>';
                                         $dividerNeeded = true;
                                 }
 
@@ -125 +130 @@
                                         $dividerNeeded = true;
                                 }
 
-                                $podPressContent .= '</div>'."\n".'<!-- End: podPress download link line -->'."\n";
                         }
+                        
+                        $podPressContent .= '</div>'."\n".'<!-- End: podPress download link line -->'."\n";
                 }
 
                 if($podPress->settings['contentAutoDisplayPlayer']) {
                         $podPressPlayBlockScripts = '<script type="text/javascript"><!--'."\n".$podPressPlayBlockScripts;
-                        $podPressPlayBlockScripts .= "\n-->\n</script>";
+                        $podPressPlayBlockScripts .= "\n".'-->'."\n".'</script>';
                 }
-                return '<div class="podPress_content">'.$podPressContent.'</div>'."\n".$podPressPlayBlockScripts;
+                return "<!-- Begin: podPress -->\n".'<div class="podPress_content">'.$podPressContent.'</div>'."\n".$podPressPlayBlockScripts."\n<!-- End: podPress -->\n";
         }
         }