summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-01-03 21:08:29 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-01-03 21:08:29 +0000
commit1e711449f77825983a3fe04f6fef2c61c4fa989d (patch)
tree751c085586f85382e2ec5dfdb6d82a3de9af5b9c /templates
parenta95d696db3b6ad263497664b9dca15765c1f62c3 (diff)
downloadampache-1e711449f77825983a3fe04f6fef2c61c4fa989d.tar.gz
ampache-1e711449f77825983a3fe04f6fef2c61c4fa989d.tar.bz2
ampache-1e711449f77825983a3fe04f6fef2c61c4fa989d.zip
fixed title text on now playing to show full title rather then truncated
Diffstat (limited to 'templates')
-rw-r--r--templates/show_now_playing_row.inc.php9
-rw-r--r--templates/show_preferences.inc9
2 files changed, 8 insertions, 10 deletions
diff --git a/templates/show_now_playing_row.inc.php b/templates/show_now_playing_row.inc.php
index a0ab25f1..3fb4c794 100644
--- a/templates/show_now_playing_row.inc.php
+++ b/templates/show_now_playing_row.inc.php
@@ -5,9 +5,8 @@ Copyright (c) 2001 - 2006 Ampache.org
All rights reserved.
This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+modify it under the terms of the GNU General Public License v2
+as published by the Free Software Foundation.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -33,9 +32,9 @@ $artist = scrub_out(truncate_with_ellipse($song->f_artist_full,'25'));
</a>
</td>
<td class="np_cell">
- <a title="<?php echo scrub_out($song->album_full); ?>" href="<?php echo $web_path; ?>/albums.php?action=show&amp;album=<?php echo $song->album; ?>">
+ <a title="<?php echo scrub_out($song->f_album_full); ?>" href="<?php echo $web_path; ?>/albums.php?action=show&amp;album=<?php echo $song->album; ?>">
<?php echo $album; ?></a> /
- <a title="<?php echo scrub_out($song->artist_full); ?>" href="<?php echo $web_path; ?>/artists.php?action=show&amp;artist=<?php echo $song->artist; ?>">
+ <a title="<?php echo scrub_out($song->f_artist_full); ?>" href="<?php echo $web_path; ?>/artists.php?action=show&amp;artist=<?php echo $song->artist; ?>">
<?php echo $artist; ?>
</a>
</td>
diff --git a/templates/show_preferences.inc b/templates/show_preferences.inc
index bba6b3ff..3db56651 100644
--- a/templates/show_preferences.inc
+++ b/templates/show_preferences.inc
@@ -5,9 +5,8 @@
All rights reserved
This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
+ modify it under the terms of the GNU General Public License v2
+ as published by the Free Software Foundation.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -49,7 +48,7 @@ if (($GLOBALS['user']->has_access(100)) AND ($user_id == '-1' AND conf('use_auth
?>
<?php show_box_top(); ?>
<span class="header1">
-<?php echo _("Editing"); ?> <?php echo $fullname; ?> <?php echo _('preferences'); ?>
+<?php echo _('Editing'); ?> <?php echo $fullname; ?> <?php echo _('preferences'); ?>
<?php if ($GLOBALS['user']->has_access(100)) { ?>
[<a href="<?php echo conf('web_path'); ?>/admin/preferences.php?action=fix_preferences&amp;user_id=<?php echo $user_id; ?>"><?php echo _("Rebuild Preferences"); ?></a>]
<?php } ?>
@@ -88,7 +87,7 @@ if ($current_tab != 'account' && $current_tab != 'modules') {
show_preference_box($preferences[$current_tab]);
?>
- <input class="button" type="submit" value="<?php echo _("Update Preferences"); ?>" />
+ <input class="button" type="submit" value="<?php echo _('Update Preferences'); ?>" />
<input type="hidden" name="action" value="update_preferences" />
<input type="hidden" name="user_id" value="<?php echo $user_id; ?>" />&nbsp;&nbsp;
<input type="hidden" name="tab" value="<?php echo scrub_out($current_tab); ?>" />