diff options
| -rw-r--r-- | lib/class/song.class.php | 10 | ||||
| -rw-r--r-- | templates/show_songs.inc.php | 17 | ||||
| -rw-r--r-- | templates/sidebar_preferences.inc.php | 13 |
3 files changed, 27 insertions, 13 deletions
diff --git a/lib/class/song.class.php b/lib/class/song.class.php index ca1b5bbf..ddfe4275 100644 --- a/lib/class/song.class.php +++ b/lib/class/song.class.php @@ -665,21 +665,19 @@ class Song { $this->f_bitrate = intval($this->bitrate/1000) . "-" . strtoupper($this->mode); // Format Genre - $this->f_genre = $this->get_genre_name(); + $this->f_genre_link = $this->get_genre_name(); // Format the Time $min = floor($this->time/60); $sec = sprintf("%02d", ($this->time%60) ); $this->f_time = $min . ":" . $sec; + // Format the track (there isn't really anything to do here) + $this->f_track = $this->track; + // Format the size $this->f_size = sprintf("%.2f",($this->size/1048576)); - // Set style - if (preg_match("/id3/", $this->flagtype)) { $this->f_style = "style=\"color: #33c;\""; } - elseif (preg_match("/(mp3|del|sort|ren)/", $this->flagtype)) { $this->f_style = "style=\"color: #C00;\""; } - if (!$this->enabled) { $this->f_style = "style=\"text-decoration: line-through;\""; } - return true; } // format_song diff --git a/templates/show_songs.inc.php b/templates/show_songs.inc.php index 00a8decd..95ea8f3d 100644 --- a/templates/show_songs.inc.php +++ b/templates/show_songs.inc.php @@ -37,6 +37,10 @@ $ajax_url = Config::get('ajax_url'); </th> <th><?php echo _('Artist'); ?></th> <th><?php echo _('Album'); ?></th> + <th><?php echo _('Genre'); ?></th> + <th><?php echo _('Track'); ?></th> + <td><?php echo _('Time'); ?></th> + <td><?php echo _('Action'); ?></td> </tr> <?php foreach ($object_ids as $song_id) { @@ -50,6 +54,19 @@ $ajax_url = Config::get('ajax_url'); <td><?php echo $song->f_link; ?></td> <td><?php echo $song->f_artist_link; ?></td> <td><?php echo $song->f_album_link; ?></td> + <td><?php echo $song->f_genre_link; ?></td> + <td><?php echo $song->f_track; ?></td> + <td><?php echo $song->f_time; ?></td> + <td> + <span> + <?php echo get_user_icon('flag_off','flag',_('Flag')); ?> + </span> + <?php if ($GLOBALS['user']->has_access(100)) { ?> + <span> + <?php echo get_user_icon('edit','',_('Edit')); ?> + </span> + <?php } ?> + </td> </tr> <?php } ?> </table> diff --git a/templates/sidebar_preferences.inc.php b/templates/sidebar_preferences.inc.php index e5e2867b..c1e6471e 100644 --- a/templates/sidebar_preferences.inc.php +++ b/templates/sidebar_preferences.inc.php @@ -1,8 +1,7 @@ -<h4><?php echo _('Browse By'); ?></h4> -<select name="type"> - <option value="song"><?php echo _('Song Title'); ?></option> - <option value="album"><?php echo _('Albums'); ?></option> - <option value="artist"><?php echo _('Artist'); ?></option> - <option value="genre"><?php echo _('Genre'); ?></option> -</select> +<h4><?php echo _('Sections'); ?></h4> +<hr /> +<a href="<?php echo $web_path; ?>/preferences.php?tab=interface"><?php echo _('Interface'); ?></a> +<a href="<?php echo $web_path; ?>/preferences.php?tab=streaming"><?php echo _('Streaming'); ?></a> +<a href="<?php echo $web_path; ?>/preferences.php?tab=options"><?php echo _('Options'); ?></a> +<a href="<?php echo $web_path; ?>/preferences.php?tab=account"><?php echo _('Account'); ?></a> <hr /> |