From d572c2776f5ab7f66a632f54006dabe2f159c02b Mon Sep 17 00:00:00 2001 From: Paul Arthur Date: Sat, 26 Jan 2013 01:28:34 -0500 Subject: Move show_box_{top,bottom}() from ui.lib.php to UI --- templates/header.inc.php | 4 ++-- templates/show_access_list.inc.php | 8 ++++---- templates/show_add_access.inc.php | 4 ++-- templates/show_add_catalog.inc.php | 4 ++-- templates/show_add_live_stream.inc.php | 4 ++-- templates/show_add_playlist.inc.php | 4 ++-- templates/show_add_shout.inc.php | 4 ++-- templates/show_add_user.inc.php | 4 ++-- templates/show_adds_catalog.inc.php | 4 ++-- templates/show_admin_info.inc.php | 8 ++++---- templates/show_admin_tools.inc.php | 8 ++++---- templates/show_album.inc.php | 4 ++-- templates/show_album_art.inc.php | 4 ++-- templates/show_artist.inc.php | 4 ++-- templates/show_clean_catalog.inc.php | 4 ++-- templates/show_confirmation.inc.php | 4 ++-- templates/show_create_democratic.inc.php | 4 ++-- templates/show_debug.inc.php | 12 ++++++------ templates/show_democratic.inc.php | 4 ++-- templates/show_duplicate.inc.php | 4 ++-- templates/show_duplicates.inc.php | 4 ++-- templates/show_dynamic.inc.php | 4 ++-- templates/show_edit_access.inc.php | 4 ++-- templates/show_edit_album.inc.php | 4 ++-- templates/show_edit_artist.inc.php | 4 ++-- templates/show_edit_catalog.inc.php | 4 ++-- templates/show_edit_shout.inc.php | 4 ++-- templates/show_edit_song.inc.php | 4 ++-- templates/show_edit_user.inc.php | 4 ++-- templates/show_export.inc.php | 4 ++-- templates/show_gather_art.inc.php | 4 ++-- templates/show_get_albumart.inc.php | 4 ++-- templates/show_import_playlist.inc.php | 4 ++-- templates/show_index.inc.php | 2 +- templates/show_ip_history.inc.php | 4 ++-- templates/show_live_stream.inc.php | 4 ++-- templates/show_localplay_add_instance.inc.php | 4 ++-- templates/show_localplay_edit_instance.inc.php | 4 ++-- templates/show_localplay_instances.inc.php | 4 ++-- templates/show_localplay_status.inc.php | 4 ++-- templates/show_login_form.inc.php | 4 ++-- templates/show_lyrics.inc.php | 4 ++-- templates/show_lyrics_song.inc.php | 4 ++-- templates/show_mail_users.inc.php | 4 ++-- templates/show_manage_catalogs.inc.php | 4 ++-- templates/show_manage_democratic.inc.php | 4 ++-- templates/show_newest.inc.php | 4 ++-- templates/show_now_playing.inc.php | 4 ++-- templates/show_playlist.inc.php | 4 ++-- templates/show_popular.inc.php | 4 ++-- templates/show_preference_admin.inc.php | 4 ++-- templates/show_preferences.inc.php | 4 ++-- templates/show_random.inc.php | 4 ++-- templates/show_random_albums.inc.php | 4 ++-- templates/show_recently_played.inc.php | 4 ++-- templates/show_recommended_artists.inc.php | 2 +- templates/show_rename_artist.inc.php | 4 ++-- templates/show_rules.inc.php | 4 ++-- templates/show_search.inc.php | 4 ++-- templates/show_search_options.inc.php | 4 ++-- templates/show_shoutbox.inc.php | 4 ++-- templates/show_smartplaylist.inc.php | 4 ++-- templates/show_song.inc.php | 4 ++-- templates/show_stats.inc.php | 4 ++-- templates/show_stats_popular.inc.php | 8 ++++---- templates/show_update_items.inc.php | 4 ++-- templates/show_user.inc.php | 4 ++-- templates/show_user_preferences.inc.php | 4 ++-- templates/show_user_recommendations.inc.php | 4 ++-- templates/show_user_stats.inc.php | 4 ++-- templates/show_verify_catalog.inc.php | 4 ++-- 71 files changed, 152 insertions(+), 152 deletions(-) (limited to 'templates') diff --git a/templates/header.inc.php b/templates/header.inc.php index f6d5a8ad..a1deb402 100644 --- a/templates/header.inc.php +++ b/templates/header.inc.php @@ -66,11 +66,11 @@ if (is_rtl(Config::get('lang'))
- + fullname; ?> [] - +
title), 'box box_lyrics'); +UI::show_box_top(sprintf(T_('%s Lyrics'), $song->title), 'box box_lyrics'); ?> @@ -48,4 +48,4 @@ show_box_top(sprintf(T_('%s Lyrics'), $song->title), 'box box_lyrics');
- + diff --git a/templates/show_lyrics_song.inc.php b/templates/show_lyrics_song.inc.php index 677f1517..eb99a1cf 100644 --- a/templates/show_lyrics_song.inc.php +++ b/templates/show_lyrics_song.inc.php @@ -20,7 +20,7 @@ * */ -show_box_top($song->title , 'box box_lyrics_song'); +UI::show_box_top($song->title , 'box box_lyrics_song'); /* Prepare the variables */ $title = scrub_out(UI::truncate($song->title)); @@ -63,4 +63,4 @@ $artist = scrub_out(UI::truncate($song->f_artist_full));
- + diff --git a/templates/show_mail_users.inc.php b/templates/show_mail_users.inc.php index 4ce04ea8..91af8eb0 100644 --- a/templates/show_mail_users.inc.php +++ b/templates/show_mail_users.inc.php @@ -21,7 +21,7 @@ */ ?> - +
@@ -122,5 +122,5 @@ - + diff --git a/templates/show_manage_catalogs.inc.php b/templates/show_manage_catalogs.inc.php index 20ef4458..c26d0778 100644 --- a/templates/show_manage_catalogs.inc.php +++ b/templates/show_manage_catalogs.inc.php @@ -20,7 +20,7 @@ * */ ?> - +
@@ -46,7 +46,7 @@
- + +UI::show_box_top(T_('Manage Democratic Playlists')); ?> @@ -69,4 +69,4 @@ show_box_top(T_('Manage Democratic Playlists')); ?>
- + diff --git a/templates/show_newest.inc.php b/templates/show_newest.inc.php index 96a1540e..8a28bb12 100644 --- a/templates/show_newest.inc.php +++ b/templates/show_newest.inc.php @@ -20,6 +20,6 @@ * */ ?> - + - + diff --git a/templates/show_now_playing.inc.php b/templates/show_now_playing.inc.php index 6b3c985b..c56aea60 100644 --- a/templates/show_now_playing.inc.php +++ b/templates/show_now_playing.inc.php @@ -30,7 +30,7 @@ if (count($results)) { $link = Config::get('use_rss') ? ' ' . Ampache_RSS::get_display('nowplaying') : ''; ?> - + - + diff --git a/templates/show_playlist.inc.php b/templates/show_playlist.inc.php index 5580f76e..1b552d60 100644 --- a/templates/show_playlist.inc.php +++ b/templates/show_playlist.inc.php @@ -31,7 +31,7 @@ ob_start(); require Config::get('prefix') . '/templates/show_playlist_title.inc.php'; $title = ob_get_contents(); ob_end_clean(); -show_box_top('
' . $title . +UI::show_box_top('
' . $title . '
', 'info-box'); ?>
@@ -68,7 +68,7 @@ show_box_top('
' . $title .
- + set_type('playlist_song'); diff --git a/templates/show_popular.inc.php b/templates/show_popular.inc.php index 2b5bf262..e6c0b3b7 100644 --- a/templates/show_popular.inc.php +++ b/templates/show_popular.inc.php @@ -20,7 +20,7 @@ * */ -show_box_top(T_('Information')); +UI::show_box_top(T_('Information')); $object_ids = Stats::get_top('song'); $browse = new Browse(); @@ -40,5 +40,5 @@ $browse->set_type('artist'); $browse->show_objects($object_ids); $browse->store(); -show_box_bottom(); +UI::show_box_bottom(); ?> diff --git a/templates/show_preference_admin.inc.php b/templates/show_preference_admin.inc.php index 3d984e6c..69e72bef 100644 --- a/templates/show_preference_admin.inc.php +++ b/templates/show_preference_admin.inc.php @@ -20,7 +20,7 @@ * */ -show_box_top(T_('Preference Administration')); +UI::show_box_top(T_('Preference Administration')); ?>
@@ -57,4 +57,4 @@ show_box_top(T_('Preference Administration')); - + diff --git a/templates/show_preferences.inc.php b/templates/show_preferences.inc.php index 7ece8439..4e9cc556 100644 --- a/templates/show_preferences.inc.php +++ b/templates/show_preferences.inc.php @@ -26,7 +26,7 @@ */ ?> - + @@ -49,4 +49,4 @@ if ($_REQUEST['tab'] == 'account') { ?> - + diff --git a/templates/show_random.inc.php b/templates/show_random.inc.php index fb5eddab..58abec32 100644 --- a/templates/show_random.inc.php +++ b/templates/show_random.inc.php @@ -20,7 +20,7 @@ * */ ?> - +
@@ -103,7 +103,7 @@ - +
- + - + diff --git a/templates/show_recently_played.inc.php b/templates/show_recently_played.inc.php index 2aecf9e7..da8fb6d7 100644 --- a/templates/show_recently_played.inc.php +++ b/templates/show_recently_played.inc.php @@ -21,7 +21,7 @@ */ $link = Config::get('use_rss') ? ' ' . Ampache_RSS::get_display('recently_played') : ''; -show_box_top(T_('Recently Played') . $link, 'box box_recently_played'); +UI::show_box_top(T_('Recently Played') . $link, 'box box_recently_played'); ?>
@@ -111,4 +111,4 @@ show_box_top(T_('Recently Played') . $link, 'box box_recently_played');
- + diff --git a/templates/show_recommended_artists.inc.php b/templates/show_recommended_artists.inc.php index f4b6fa50..c48e394f 100644 --- a/templates/show_recommended_artists.inc.php +++ b/templates/show_recommended_artists.inc.php @@ -20,7 +20,7 @@ * */ ?> - + diff --git a/templates/show_rename_artist.inc.php b/templates/show_rename_artist.inc.php index 74ef6485..1c0d16dc 100644 --- a/templates/show_rename_artist.inc.php +++ b/templates/show_rename_artist.inc.php @@ -26,7 +26,7 @@ function insert() document.getElementById('artist_name').value = 'name; ?>'; } -name)); ?> +name)); ?> id, "artist_id", 4); ?>
@@ -37,4 +37,4 @@ function insert()  

- + diff --git a/templates/show_rules.inc.php b/templates/show_rules.inc.php index 0bd5b97c..29554514 100644 --- a/templates/show_rules.inc.php +++ b/templates/show_rules.inc.php @@ -31,7 +31,7 @@ $logic_operator = strtolower($logic_operator); - +
@@ -54,7 +54,7 @@ $logic_operator = strtolower($logic_operator);
- +