diff options
| author | Paul Arthur <paul.arthur@flowerysong.com> | 2013-01-26 01:15:59 -0500 |
|---|---|---|
| committer | Paul Arthur <paul.arthur@flowerysong.com> | 2013-01-26 01:15:59 -0500 |
| commit | eaa44dcd0938ad48f4a9f863b24ca5d3a318ae10 (patch) | |
| tree | 71d577e01200b3a143971a3a23d8f6b7cdf545fe /templates | |
| parent | 42133f38d223a2b3b81d309f2d1a983ef2012485 (diff) | |
| download | ampache-eaa44dcd0938ad48f4a9f863b24ca5d3a318ae10.tar.gz ampache-eaa44dcd0938ad48f4a9f863b24ca5d3a318ae10.tar.bz2 ampache-eaa44dcd0938ad48f4a9f863b24ca5d3a318ae10.zip | |
Continue moving things into UI
check_php_iconv() from lib/debug.lib.php becomes UI::check_iconv()
truncate_with_ellipsis() from lib/ui.lib.php becomes UI::truncate()
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/show_install_check.inc.php | 2 | ||||
| -rw-r--r-- | templates/show_lyrics_song.inc.php | 6 | ||||
| -rw-r--r-- | templates/show_now_playing_row.inc.php | 2 | ||||
| -rw-r--r-- | templates/show_test.inc.php | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/templates/show_install_check.inc.php b/templates/show_install_check.inc.php index 6ff093c9..9cd719a8 100644 --- a/templates/show_install_check.inc.php +++ b/templates/show_install_check.inc.php @@ -102,7 +102,7 @@ <td><?php echo T_('PHP iconv Support'); ?>:</td> <td> <?php - if (!check_php_iconv()) { + if (!UI::check_iconv()) { echo debug_result('',false); Error::add('install', T_('PHP iconv Support')); } diff --git a/templates/show_lyrics_song.inc.php b/templates/show_lyrics_song.inc.php index 74f67b2d..677f1517 100644 --- a/templates/show_lyrics_song.inc.php +++ b/templates/show_lyrics_song.inc.php @@ -23,9 +23,9 @@ show_box_top($song->title , 'box box_lyrics_song'); /* Prepare the variables */ -$title = scrub_out(truncate_with_ellipsis($song->title)); -$album = scrub_out(truncate_with_ellipsis($song->f_album_full)); -$artist = scrub_out(truncate_with_ellipsis($song->f_artist_full)); +$title = scrub_out(UI::truncate($song->title)); +$album = scrub_out(UI::truncate($song->f_album_full)); +$artist = scrub_out(UI::truncate($song->f_artist_full)); ?> <div class="np_group"> <?php if (Config::get('show_album_art')) { ?> diff --git a/templates/show_now_playing_row.inc.php b/templates/show_now_playing_row.inc.php index fc7f7681..30553a8d 100644 --- a/templates/show_now_playing_row.inc.php +++ b/templates/show_now_playing_row.inc.php @@ -81,7 +81,7 @@ <div class="np_cel cel_similar_artist"> <?php if (is_null($a['id'])) { - echo scrub_out(truncate_with_ellipsis($a['name']), Config::get('ellipse_threshold_artist')); + echo scrub_out(UI::truncate($a['name']), Config::get('ellipse_threshold_artist')); } else { $artist = new Artist($a['id']); diff --git a/templates/show_test.inc.php b/templates/show_test.inc.php index 09eee209..c9453a2c 100644 --- a/templates/show_test.inc.php +++ b/templates/show_test.inc.php @@ -99,7 +99,7 @@ <td valign="top"><?php echo T_('PHP iconv extension'); ?></td> <td valign="top">[ <?php - if (!check_php_iconv()) { + if (!UI::check_iconv()) { echo debug_result('',false); } else { |