Changeset 1719

Show
Ignore:
Timestamp:
08/30/08 13:59:11 (3 months ago)
Author:
vollmerk
Message:

sync to trunk

Location:
trunk
Files:
2 added
4 modified

Legend:

Unmodified
Added
Removed

  • trunk/config/ampache.cfg.php.dist

    r1655 r1719  
    526526; use_rss = false (values true | false) 
    527527; 
    528 ;DEFAULT: use_rss = false  
    529 ;use_rss = false 
     528;DEFAULT: use_rss = true 
     529use_rss = true 
    530530; 
    531531; 

  • trunk/docs/CHANGELOG

    r1714 r1719  
    55-------------------------------------------------------------------------- 
    66  v.3.5-Alpha1 
     7        - Add links to RSS feeds and set default to TRUE in config.dist 
    78        - Fixed Dynamic Random/Related URLs with players that always send 
    89                a byte offset (MPD) 

  • trunk/templates/show_index.inc.php

    r1640 r1719  
    4343                $data = Song::get_recently_played(); 
    4444                Song::build_cache(array_keys($data));  
    45                 show_box_top(_('Recently Played'));  
     45                $link = Config::get('use_rss') ? ' ' . RSS::get_display('recentlyplayed') :  ''; 
     46                show_box_top(_('Recently Played') . $link);  
    4647                require_once Config::get('prefix') . '/templates/show_recently_played.inc.php';  
    4748                show_box_bottom();  

  • trunk/templates/show_now_playing.inc.php

    r1268 r1719  
    22/* 
    33 
    4 Copyright (c) 2001 - 2007 Ampache.org 
     4Copyright (c) Ampache.org 
    55All rights reserved. 
    66 
    … …  
    2929 
    3030if (count($results)) { 
     31$link = Config::get('use_rss') ? ' ' . RSS::get_display('nowplaying') : '';  
    3132?> 
    32 <?php show_box_top(_('Now Playing')); ?> 
     33<?php show_box_top(_('Now Playing') . $link); ?> 
    3334<div class="np_row"> 
    3435<?php