Changeset 1721

Timestamp:

08/30/08 14:07:01 (3 months ago)

Author:

vollmerk

Message:

sync back to the branch... doing a lot of this wheee

Location:

branches/3.4

Files:

• server/ajax.server.php (modified) (1 diff)
• templates/show_index.inc.php (modified) (1 diff)
• templates/show_recently_played.inc.php (modified) (2 diffs)

branches/3.4/server/ajax.server.php

@@ -298 +298 @@
                 $data = Song::get_recently_played(); 
                 if (count($data)) { 
-                        show_box_top(_('Recently Played')); 
                         require_once Config::get('prefix') . '/templates/show_recently_played.inc.php'; 
-                        show_box_bottom(); 
                 }
                 $results['recently_played'] = ob_get_contents(); 

branches/3.4/templates/show_index.inc.php

@@ -42 +42 @@
         <?php
                 $data = Song::get_recently_played();
-                $link = Config::get('use_rss') ? ' ' . RSS::get_display('recentlyplayed') :  ''; 
-                show_box_top(_('Recently Played') . $link); 
                 if (count($data)) { require_once Config::get('prefix') . '/templates/show_recently_played.inc.php'; }
-                show_box_bottom(); 
         ?>
 </div>

branches/3.4/templates/show_recently_played.inc.php

@@ -22 +22 @@
 /* Define the time places starting at 0 */
 $time_unit = array('',_('seconds ago'),_('minutes ago'),_('hours ago'),_('days ago'),_('weeks ago'),_('months ago'),_('years ago')); 
-
+$link = Config::get('use_rss') ? ' ' . RSS::get_display('recentlyplayed') :  '';
+show_box_top(_('Recently Played') . $link);
 ?>
 <table class="tabledata" cellpadding="0" cellspacing="0">
@@ -99 +100 @@
 </tr>
 </table>
+<?php show_box_bottom(); ?>