yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-04 02:09:23 +02:00
Code Issues Releases Wiki Activity

Move show_box_{top,bottom}() from ui.lib.php to UI

Browse source
This commit is contained in:
Paul Arthur 2013-01-26 01:28:34 -05:00
parent 04aa79b53c
commit d572c2776f
78 changed files with 218 additions and 222 deletions
Download patch file Download diff file Expand all files Collapse all files

4
admin/catalog.php
View file

@ -236,11 +236,11 @@ switch ($_REQUEST['action']) {
// Run our initial add // Run our initial add
$catalog->run_add($_POST); $catalog->run_add($_POST);
show_box_top(T_('Catalog Created'), 'box box_catalog_created'); UI::show_box_top(T_('Catalog Created'), 'box box_catalog_created');
echo "<h2>" . T_('Catalog Created') . "</h2>"; echo "<h2>" . T_('Catalog Created') . "</h2>";
Error::display('general'); Error::display('general');
Error::display('catalog_add'); Error::display('catalog_add');
show_box_bottom(); UI::show_box_bottom();
show_confirmation('','', Config::get('web_path').'/admin/catalog.php'); show_confirmation('','', Config::get('web_path').'/admin/catalog.php');

8
admin/modules.php
View file

@ -138,15 +138,15 @@ switch ($_REQUEST['action']) {
break; break;
case 'show_plugins': case 'show_plugins':
$plugins = Plugin::get_plugins(); $plugins = Plugin::get_plugins();
show_box_top(T_('Plugins'), 'box box_localplay_plugins'); UI::show_box_top(T_('Plugins'), 'box box_localplay_plugins');
require_once Config::get('prefix') . '/templates/show_plugins.inc.php'; require_once Config::get('prefix') . '/templates/show_plugins.inc.php';
show_box_bottom(); UI::show_box_bottom();
break; break;
case 'show_localplay': case 'show_localplay':
$controllers = Localplay::get_controllers(); $controllers = Localplay::get_controllers();
show_box_top(T_('Localplay Controllers'), 'box box_localplay_controllers'); UI::show_box_top(T_('Localplay Controllers'), 'box box_localplay_controllers');
require_once Config::get('prefix') . '/templates/show_localplay_controllers.inc.php'; require_once Config::get('prefix') . '/templates/show_localplay_controllers.inc.php';
show_box_bottom(); UI::show_box_bottom();
break; break;
default: default:
// Rien a faire // Rien a faire

4
browse.php
View file

@ -70,12 +70,12 @@ switch($_REQUEST['action']) {
$object_ids = $browse->get_saved(); $object_ids = $browse->get_saved();
$keys = array_keys($object_ids); $keys = array_keys($object_ids);
Tag::build_cache($keys); Tag::build_cache($keys);
show_box_top(T_('Tag Cloud'), 'box box_tag_cloud'); UI::show_box_top(T_('Tag Cloud'), 'box box_tag_cloud');
$browse2 = new Browse(); $browse2 = new Browse();
$browse2->set_type('song'); $browse2->set_type('song');
$browse2->store(); $browse2->store();
require_once Config::get('prefix') . '/templates/show_tagcloud.inc.php'; require_once Config::get('prefix') . '/templates/show_tagcloud.inc.php';
show_box_bottom(); UI::show_box_bottom();
require_once Config::get('prefix') . '/templates/browse_content.inc.php'; require_once Config::get('prefix') . '/templates/browse_content.inc.php';
break; break;
case 'artist': case 'artist':

60
lib/class/browse.class.php
View file

@ -127,86 +127,86 @@ class Browse extends Query {
// Switch on the type of browsing we're doing // Switch on the type of browsing we're doing
switch ($type) { switch ($type) {
case 'song': case 'song':
show_box_top(T_('Songs') . $match, $class); UI::show_box_top(T_('Songs') . $match, $class);
Song::build_cache($object_ids); Song::build_cache($object_ids);
require_once Config::get('prefix') . '/templates/show_songs.inc.php'; require_once Config::get('prefix') . '/templates/show_songs.inc.php';
show_box_bottom(); UI::show_box_bottom();
break; break;
case 'album': case 'album':
show_box_top(T_('Albums') . $match, $class); UI::show_box_top(T_('Albums') . $match, $class);
Album::build_cache($object_ids,'extra'); Album::build_cache($object_ids,'extra');
require_once Config::get('prefix') . '/templates/show_albums.inc.php'; require_once Config::get('prefix') . '/templates/show_albums.inc.php';
show_box_bottom(); UI::show_box_bottom();
break; break;
case 'user': case 'user':
show_box_top(T_('Manage Users') . $match, $class); UI::show_box_top(T_('Manage Users') . $match, $class);
require_once Config::get('prefix') . '/templates/show_users.inc.php'; require_once Config::get('prefix') . '/templates/show_users.inc.php';
show_box_bottom(); UI::show_box_bottom();
break; break;
case 'artist': case 'artist':
show_box_top(T_('Artists') . $match, $class); UI::show_box_top(T_('Artists') . $match, $class);
Artist::build_cache($object_ids,'extra'); Artist::build_cache($object_ids,'extra');
require_once Config::get('prefix') . '/templates/show_artists.inc.php'; require_once Config::get('prefix') . '/templates/show_artists.inc.php';
show_box_bottom(); UI::show_box_bottom();
break; break;
case 'live_stream': case 'live_stream':
require_once Config::get('prefix') . '/templates/show_live_stream.inc.php'; require_once Config::get('prefix') . '/templates/show_live_stream.inc.php';
show_box_top(T_('Radio Stations') . $match, $class); UI::show_box_top(T_('Radio Stations') . $match, $class);
require_once Config::get('prefix') . '/templates/show_live_streams.inc.php'; require_once Config::get('prefix') . '/templates/show_live_streams.inc.php';
show_box_bottom(); UI::show_box_bottom();
break; break;
case 'playlist': case 'playlist':
Playlist::build_cache($object_ids); Playlist::build_cache($object_ids);
show_box_top(T_('Playlists') . $match, $class); UI::show_box_top(T_('Playlists') . $match, $class);
require_once Config::get('prefix') . '/templates/show_playlists.inc.php'; require_once Config::get('prefix') . '/templates/show_playlists.inc.php';
show_box_bottom(); UI::show_box_bottom();
break; break;
case 'playlist_song': case 'playlist_song':
show_box_top(T_('Playlist Songs') . $match,$class); UI::show_box_top(T_('Playlist Songs') . $match,$class);
require_once Config::get('prefix') . '/templates/show_playlist_songs.inc.php'; require_once Config::get('prefix') . '/templates/show_playlist_songs.inc.php';
show_box_bottom(); UI::show_box_bottom();
break; break;
case 'playlist_localplay': case 'playlist_localplay':
show_box_top(T_('Current Playlist')); UI::show_box_top(T_('Current Playlist'));
require_once Config::get('prefix') . '/templates/show_localplay_playlist.inc.php'; require_once Config::get('prefix') . '/templates/show_localplay_playlist.inc.php';
show_box_bottom(); UI::show_box_bottom();
break; break;
case 'smartplaylist': case 'smartplaylist':
show_box_top(T_('Smart Playlists') . $match, $class); UI::show_box_top(T_('Smart Playlists') . $match, $class);
require_once Config::get('prefix') . '/templates/show_smartplaylists.inc.php'; require_once Config::get('prefix') . '/templates/show_smartplaylists.inc.php';
show_box_bottom(); UI::show_box_bottom();
break; break;
case 'catalog': case 'catalog':
show_box_top(T_('Catalogs'), $class); UI::show_box_top(T_('Catalogs'), $class);
require_once Config::get('prefix') . '/templates/show_catalogs.inc.php'; require_once Config::get('prefix') . '/templates/show_catalogs.inc.php';
show_box_bottom(); UI::show_box_bottom();
break; break;
case 'shoutbox': case 'shoutbox':
show_box_top(T_('Shoutbox Records'),$class); UI::show_box_top(T_('Shoutbox Records'),$class);
require_once Config::get('prefix') . '/templates/show_manage_shoutbox.inc.php'; require_once Config::get('prefix') . '/templates/show_manage_shoutbox.inc.php';
show_box_bottom(); UI::show_box_bottom();
break; break;
case 'flagged': case 'flagged':
show_box_top(T_('Flagged Records'),$class); UI::show_box_top(T_('Flagged Records'),$class);
require_once Config::get('prefix') . '/templates/show_flagged.inc.php'; require_once Config::get('prefix') . '/templates/show_flagged.inc.php';
show_box_bottom(); UI::show_box_bottom();
break; break;
case 'tag': case 'tag':
Tag::build_cache($tags); Tag::build_cache($tags);
show_box_top(T_('Tag Cloud'),$class); UI::show_box_top(T_('Tag Cloud'),$class);
require_once Config::get('prefix') . '/templates/show_tagcloud.inc.php'; require_once Config::get('prefix') . '/templates/show_tagcloud.inc.php';
show_box_bottom(); UI::show_box_bottom();
break; break;
case 'video': case 'video':
Video::build_cache($object_ids); Video::build_cache($object_ids);
show_box_top(T_('Videos'),$class); UI::show_box_top(T_('Videos'),$class);
require_once Config::get('prefix') . '/templates/show_videos.inc.php'; require_once Config::get('prefix') . '/templates/show_videos.inc.php';
show_box_bottom(); UI::show_box_bottom();
break; break;
case 'democratic': case 'democratic':
show_box_top(T_('Democratic Playlist'),$class); UI::show_box_top(T_('Democratic Playlist'),$class);
require_once Config::get('prefix') . '/templates/show_democratic_playlist.inc.php'; require_once Config::get('prefix') . '/templates/show_democratic_playlist.inc.php';
show_box_bottom(); UI::show_box_bottom();
default: default:
// Rien a faire // Rien a faire
break; break;

20
lib/class/catalog.class.php
View file

@ -277,9 +277,9 @@ class Catalog extends database_object {
public function run_add($options) { public function run_add($options) {
if ($this->catalog_type == 'remote') { if ($this->catalog_type == 'remote') {
show_box_top(T_('Running Remote Sync') . '. . .'); UI::show_box_top(T_('Running Remote Sync') . '. . .');
$this->get_remote_catalog($type=0); $this->get_remote_catalog($type=0);
show_box_bottom(); UI::show_box_bottom();
return true; return true;
} }
@ -1079,9 +1079,9 @@ class Catalog extends database_object {
public function add_to_catalog() { public function add_to_catalog() {
if ($this->catalog_type == 'remote') { if ($this->catalog_type == 'remote') {
show_box_top(T_('Running Remote Update') . '. . .'); UI::show_box_top(T_('Running Remote Update') . '. . .');
$this->get_remote_catalog($type=0); $this->get_remote_catalog($type=0);
show_box_bottom(); UI::show_box_bottom();
return true; return true;
} }
@ -1127,12 +1127,12 @@ class Catalog extends database_object {
$time_diff = ($current_time - $start_time) ?: 0; $time_diff = ($current_time - $start_time) ?: 0;
$rate = intval($this->count / $time_diff) ?: T_('N/A'); $rate = intval($this->count / $time_diff) ?: T_('N/A');
show_box_top(); UI::show_box_top();
echo "\n<br />" . echo "\n<br />" .
printf(T_('Catalog Update Finished. Total Time: [%s] Total Songs: [%s] Songs Per Second: [%s]'), printf(T_('Catalog Update Finished. Total Time: [%s] Total Songs: [%s] Songs Per Second: [%s]'),
date('i:s', $time_diff), $this->count, $rate); date('i:s', $time_diff), $this->count, $rate);
echo '<br /><br />'; echo '<br /><br />';
show_box_bottom(); UI::show_box_bottom();
} // add_to_catalog } // add_to_catalog
@ -1277,11 +1277,11 @@ class Catalog extends database_object {
// Remove any orphaned artists/albums/etc. // Remove any orphaned artists/albums/etc.
self::gc(); self::gc();
show_box_top(); UI::show_box_top();
echo "<strong>"; echo "<strong>";
printf (T_ngettext('Catalog Clean Done. %d file removed.', 'Catalog Clean Done. %d files removed.', $dead_total), $dead_total); printf (T_ngettext('Catalog Clean Done. %d file removed.', 'Catalog Clean Done. %d files removed.', $dead_total), $dead_total);
echo "</strong><br />\n"; echo "</strong><br />\n";
show_box_bottom(); UI::show_box_bottom();
ob_flush(); ob_flush();
flush(); flush();
@ -1381,11 +1381,11 @@ class Catalog extends database_object {
self::gc(); self::gc();
$this->update_last_update(); $this->update_last_update();
show_box_top(); UI::show_box_top();
echo '<strong>'; echo '<strong>';
printf(T_('Catalog Verify Done. %d of %d files updated.'), $total_updated, $number); printf(T_('Catalog Verify Done. %d of %d files updated.'), $total_updated, $number);
echo "</strong><br />\n"; echo "</strong><br />\n";
show_box_bottom(); UI::show_box_bottom();
ob_flush(); ob_flush();
flush(); flush();

18
lib/class/ui.class.php
View file

@ -109,6 +109,24 @@ class UI {
} }
} }
/**
* show_box_top
*
* This shows the top of the box.
*/
public static function show_box_top($title = '', $class = '') {
require Config::get('prefix') . '/templates/show_box_top.inc.php';
}
/**
* show_box_bottom
*
* This shows the bottom of the box
*/
public static function show_box_bottom() {
require Config::get('prefix') . '/templates/show_box_bottom.inc.php';
}
/** /**
* truncate * truncate
* *

22
lib/ui.lib.php
View file

@ -342,28 +342,6 @@ function show_playlist_select($name,$selected='',$style='') {
} // show_playlist_select } // show_playlist_select
/**
* show_box_top
* This function requires the top part of the box
* it takes title as an optional argument
*/
function show_box_top($title='',$class='') {
require Config::get('prefix') . '/templates/show_box_top.inc.php';
} // show_box_top
/**
* show_box_bottom
* This function requires the bottom part of the box
* it does not take any arguments
*/
function show_box_bottom() {
require Config::get('prefix') . '/templates/show_box_bottom.inc.php';
} // show_box_bottom
/** /**
* get_user_icon * get_user_icon
* this function takes a name and a returns either a text representation * this function takes a name and a returns either a text representation

4
templates/header.inc.php
View file

@ -66,11 +66,11 @@ if (is_rtl(Config::get('lang'))
</a> </a>
</h1> </h1>
<div id="headerbox"> <div id="headerbox">
<?php show_box_top('','box box_headerbox'); ?> <?php UI::show_box_top('','box box_headerbox'); ?>
<?php require_once Config::get('prefix') . '/templates/show_search_bar.inc.php'; ?> <?php require_once Config::get('prefix') . '/templates/show_search_bar.inc.php'; ?>
<?php require_once Config::get('prefix') . '/templates/show_playtype_switch.inc.php'; ?> <?php require_once Config::get('prefix') . '/templates/show_playtype_switch.inc.php'; ?>
<span id="loginInfo"><a href="<?php echo Config::get('web_path'); ?>/preferences.php?tab=account"><?php echo $GLOBALS['user']->fullname; ?></a> <a href="<?php echo Config::get('web_path'); ?>/logout.php">[<?php echo T_('Log out'); ?>]</a></span> <span id="loginInfo"><a href="<?php echo Config::get('web_path'); ?>/preferences.php?tab=account"><?php echo $GLOBALS['user']->fullname; ?></a> <a href="<?php echo Config::get('web_path'); ?>/logout.php">[<?php echo T_('Log out'); ?>]</a></span>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>
</div> <!-- End headerbox --> </div> <!-- End headerbox -->
</div><!-- End header --> </div><!-- End header -->
<div id="sidebar"><!-- This is the sidebar --> <div id="sidebar"><!-- This is the sidebar -->

8
templates/show_access_list.inc.php
View file

@ -20,7 +20,7 @@
* *
*/ */
?> ?>
<?php show_box_top(T_('Access Control'), 'box box_access_control'); ?> <?php UI::show_box_top(T_('Access Control'), 'box box_access_control'); ?>
<div id="information_actions" class="left-column"> <div id="information_actions" class="left-column">
<ul> <ul>
<li> <li>
@ -41,8 +41,8 @@
</ul> </ul>
</div> </div>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>
<?php show_box_top(T_('Access Control Entries'), 'box box_access_entries'); ?> <?php UI::show_box_top(T_('Access Control Entries'), 'box box_access_entries'); ?>
<?php Ajax::start_container('browse_content'); ?> <?php Ajax::start_container('browse_content'); ?>
<?php if (count($list)) { ?> <?php if (count($list)) { ?>
<table cellspacing="1" cellpadding="3" class="tabledata"> <table cellspacing="1" cellpadding="3" class="tabledata">
@ -77,4 +77,4 @@
</table> </table>
<?php } // end if count ?> <?php } // end if count ?>
<?php Ajax::end_container(); ?> <?php Ajax::end_container(); ?>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_add_access.inc.php
View file

@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
?> ?>
<?php show_box_top(T_('Add Access Control List'), 'box box_add_access'); ?> <?php UI::show_box_top(T_('Add Access Control List'), 'box box_add_access'); ?>
<?php Error::display('general'); ?> <?php Error::display('general'); ?>
<form name="update_access" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/access.php?action=add_host"> <form name="update_access" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/access.php?action=add_host">
<table class="tabledata" cellpadding="5" cellspacing="0"> <table class="tabledata" cellpadding="5" cellspacing="0">
@ -105,4 +105,4 @@
<input class="button" type="submit" value="<?php echo T_('Create ACL'); ?>" /> <input class="button" type="submit" value="<?php echo T_('Create ACL'); ?>" />
</div> </div>
</form> </form>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_add_catalog.inc.php
View file

@ -23,7 +23,7 @@
$default_rename = "%a - %T - %t"; $default_rename = "%a - %T - %t";
$default_sort = "%a/%A"; $default_sort = "%a/%A";
?> ?>
<?php show_box_top(T_('Add a Catalog'), 'box box_add_catalog'); ?> <?php UI::show_box_top(T_('Add a Catalog'), 'box box_add_catalog'); ?>
<p><?php echo T_("In the form below enter either a local path (i.e. /data/music) or the URL to a remote Ampache installation (i.e http://theotherampache.com)"); ?></p> <p><?php echo T_("In the form below enter either a local path (i.e. /data/music) or the URL to a remote Ampache installation (i.e http://theotherampache.com)"); ?></p>
<?php Error::display('general'); ?> <?php Error::display('general'); ?>
<form name="update_catalog" method="post" action="<?php echo Config::get('web_path'); ?>/admin/catalog.php" enctype="multipart/form-data"> <form name="update_catalog" method="post" action="<?php echo Config::get('web_path'); ?>/admin/catalog.php" enctype="multipart/form-data">
@ -89,4 +89,4 @@ $default_sort = "%a/%A";
<input class="button" type="submit" value="<?php echo T_('Add Catalog'); ?>" /> <input class="button" type="submit" value="<?php echo T_('Add Catalog'); ?>" />
</div> </div>
</form> </form>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_add_live_stream.inc.php
View file

@ -20,7 +20,7 @@
* *
*/ */
?> ?>
<?php show_box_top(T_('Add Radio Station'), 'box box_add_live_stream'); ?> <?php UI::show_box_top(T_('Add Radio Station'), 'box box_add_live_stream'); ?>
<form name="radio" method="post" action="<?php echo Config::get('web_path'); ?>/radio.php?action=create"> <form name="radio" method="post" action="<?php echo Config::get('web_path'); ?>/radio.php?action=create">
<table> <table>
<tr> <tr>
@ -68,4 +68,4 @@
<input class="button" type="submit" value="<?php echo T_('Add'); ?>" /> <input class="button" type="submit" value="<?php echo T_('Add'); ?>" />
</div> </div>
</form> </form>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_add_playlist.inc.php
View file

@ -20,7 +20,7 @@
* *
*/ */
?> ?>
<?php show_box_top(T_('Create a new playlist')); ?> <?php UI::show_box_top(T_('Create a new playlist')); ?>
<form name="songs" method="post" action="<?php echo Config::get('web_path'); ?>/playlist.php"> <form name="songs" method="post" action="<?php echo Config::get('web_path'); ?>/playlist.php">
<table> <table>
<tr> <tr>
@ -42,4 +42,4 @@
<input type="hidden" name="action" value="Create" /> <input type="hidden" name="action" value="Create" />
</div> </div>
</form> </form>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_add_shout.inc.php
View file

@ -20,7 +20,7 @@
* *
*/ */
?> ?>
<?php show_box_top(T_('Post to Shoutbox'), 'box box_add_shout'); ?> <?php UI::show_box_top(T_('Post to Shoutbox'), 'box box_add_shout'); ?>
<form method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/shout.php?action=add_shout"> <form method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/shout.php?action=add_shout">
<table class="tabledata" cellpadding="0" cellspacing="0"> <table class="tabledata" cellpadding="0" cellspacing="0">
<tr> <tr>
@ -44,4 +44,4 @@
</tr> </tr>
</table> </table>
</form> </form>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_add_user.inc.php
View file

@ -20,7 +20,7 @@
* *
*/ */
?> ?>
<?php show_box_top(T_('Adding a New User'), 'box box_add_user'); ?> <?php UI::show_box_top(T_('Adding a New User'), 'box box_add_user'); ?>
<?php Error::display('general'); ?> <?php Error::display('general'); ?>
<form name="add_user" enctype="multpart/form-data" method="post" action="<?php echo Config::get('web_path') . "/admin/users.php?action=add_user"; ?>"> <form name="add_user" enctype="multpart/form-data" method="post" action="<?php echo Config::get('web_path') . "/admin/users.php?action=add_user"; ?>">
<table class="tabledata" cellspacing="0" cellpadding="0"> <table class="tabledata" cellspacing="0" cellpadding="0">
@ -85,4 +85,4 @@
<input type="submit" value="<?php echo T_('Add User'); ?>" /> <input type="submit" value="<?php echo T_('Add User'); ?>" />
</div> </div>
</form> </form>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_adds_catalog.inc.php
View file

@ -20,11 +20,11 @@
* *
*/ */
show_box_top(T_('Starting New Song Search'), 'box box_adds_catalog'); UI::show_box_top(T_('Starting New Song Search'), 'box box_adds_catalog');
/* HINT: Catalog Name */ /* HINT: Catalog Name */
printf(T_('Starting New Song Search on %s catalog'), "<strong>[ $this->name ]</strong>"); printf(T_('Starting New Song Search on %s catalog'), "<strong>[ $this->name ]</strong>");
echo "<br />\n"; echo "<br />\n";
echo T_('Found') . ': <span id="add_count_' . $this->id . '">' . T_('None') . '</span><br />'; echo T_('Found') . ': <span id="add_count_' . $this->id . '">' . T_('None') . '</span><br />';
echo T_('Reading') . ':<span id="add_dir_' . $this->id . '"></span><br />'; echo T_('Reading') . ':<span id="add_dir_' . $this->id . '"></span><br />';
show_box_bottom(); UI::show_box_bottom();
?> ?>

8
templates/show_admin_info.inc.php
View file

@ -29,14 +29,14 @@ $flagged = Flag::get_recent(10);
$songs = Song::get_disabled(10); $songs = Song::get_disabled(10);
?> ?>
<?php show_box_top(T_('Last Ten Flagged Records')); ?> <?php UI::show_box_top(T_('Last Ten Flagged Records')); ?>
<?php require Config::get('prefix') . '/templates/show_flagged.inc.php'; ?> <?php require Config::get('prefix') . '/templates/show_flagged.inc.php'; ?>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>
<?php show_box_top(T_('Disabled Songs')); ?> <?php UI::show_box_top(T_('Disabled Songs')); ?>
<!-- Show Last 10 Disabled Songs -->&nbsp; <!-- Show Last 10 Disabled Songs -->&nbsp;
<?php require Config::get('prefix') . '/templates/show_disabled_songs.inc.php'; ?> <?php require Config::get('prefix') . '/templates/show_disabled_songs.inc.php'; ?>
<div> <div>
<a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=show_disabled"><?php echo T_('Show All'); ?>...</a> <a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=show_disabled"><?php echo T_('Show All'); ?>...</a>
</div> </div>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

8
templates/show_admin_tools.inc.php
View file

@ -24,7 +24,7 @@ $web_path = Config::get('web_path');
$catalogs = Catalog::get_catalogs(); $catalogs = Catalog::get_catalogs();
?> ?>
<?php show_box_top(T_('Catalogs')); ?> <?php UI::show_box_top(T_('Catalogs')); ?>
<table class="tabledata" cellpadding="0" cellspacing="0"> <table class="tabledata" cellpadding="0" cellspacing="0">
<colgroup> <colgroup>
<col id="col_name" /> <col id="col_name" />
@ -84,9 +84,9 @@ $catalogs = Catalog::get_catalogs();
<a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=show_clear_stats"><?php echo T_('Clear Catalog Stats'); ?></a> <a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=show_clear_stats"><?php echo T_('Clear Catalog Stats'); ?></a>
<a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=gather_album_art"><?php echo T_('Gather Album Art'); ?></a> <a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=gather_album_art"><?php echo T_('Gather Album Art'); ?></a>
</div> </div>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>
<?php show_box_top(T_('Other Tools')); ?> <?php UI::show_box_top(T_('Other Tools')); ?>
<div> <div>
<a class="button" href="<?php echo $web_path; ?>/admin/duplicates.php"><?php echo T_('Show Duplicate Songs'); ?></a> <a class="button" href="<?php echo $web_path; ?>/admin/duplicates.php"><?php echo T_('Show Duplicate Songs'); ?></a>
<a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_now_playing"><?php echo T_('Clear Now Playing'); ?></a> <a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_now_playing"><?php echo T_('Clear Now Playing'); ?></a>
@ -96,4 +96,4 @@ $catalogs = Catalog::get_catalogs();
<a class="button" href="<?php echo $web_path; ?>/admin/users.php?action=show_inactive&amp;days=30"><?php echo T_('Show Inactive Users'); ?></a> <a class="button" href="<?php echo $web_path; ?>/admin/users.php?action=show_inactive&amp;days=30"><?php echo T_('Show Inactive Users'); ?></a>
<!-- <a class="button" href="<?php echo $web_path; ?>/admin/system.php?action=check_version"><?php echo T_('Check for New Version'); ?></a>--> <!-- <a class="button" href="<?php echo $web_path; ?>/admin/system.php?action=check_version"><?php echo T_('Check for New Version'); ?></a>-->
</div> </div>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_album.inc.php
View file

@ -29,7 +29,7 @@ if ($album->disk) {
} }
$title .= '&nbsp;-&nbsp;' . $album->f_artist_link; $title .= '&nbsp;-&nbsp;' . $album->f_artist_link;
?> ?>
<?php show_box_top($title,'info-box'); ?> <?php UI::show_box_top($title,'info-box'); ?>
<div class="album_art"> <div class="album_art">
<?php <?php
if ($album->name != T_('Unknown (Orphaned)')) { if ($album->name != T_('Unknown (Orphaned)')) {
@ -80,7 +80,7 @@ $title .= '&nbsp;-&nbsp;' . $album->f_artist_link;
<?php } ?> <?php } ?>
</ul> </ul>
</div> </div>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>
<div id="additional_information"> <div id="additional_information">
&nbsp; &nbsp;
</div> </div>

4
templates/show_album_art.inc.php
View file

@ -25,7 +25,7 @@ $total_images = count($images);
$rows = floor($total_images/4); $rows = floor($total_images/4);
$i = 0; $i = 0;
?> ?>
<?php show_box_top(T_('Select New Album Art'), 'box box_album_art'); ?> <?php UI::show_box_top(T_('Select New Album Art'), 'box box_album_art'); ?>
<table class="table-data"> <table class="table-data">
<tr> <tr>
<?php <?php
@ -60,4 +60,4 @@ while ($i <= $rows) {
} // end while } // end while
?> ?>
</table> </table>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_artist.inc.php
View file

@ -25,7 +25,7 @@ $web_path = Config::get('web_path');
<?php <?php
$browse = new Browse(); $browse = new Browse();
$browse->set_type($object_type); $browse->set_type($object_type);
show_box_top($artist->f_name, 'info-box'); UI::show_box_top($artist->f_name, 'info-box');
if (Config::get('ratings')) { if (Config::get('ratings')) {
?> ?>
<div id="rating_<?php echo intval($artist->id); ?>_artist" style="display:inline;"> <div id="rating_<?php echo intval($artist->id); ?>_artist" style="display:inline;">
@ -73,7 +73,7 @@ if (Config::get('ratings')) {
<?php echo Ajax::observe('show_artist_artCB', 'click', Ajax::action('?page=browse&action=show_art&browse_id=' . $browse->id,'')); ?> <?php echo Ajax::observe('show_artist_artCB', 'click', Ajax::action('?page=browse&action=show_art&browse_id=' . $browse->id,'')); ?>
</ul> </ul>
</div> </div>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>
<?php <?php
$browse->show_objects($object_ids); $browse->show_objects($object_ids);
$browse->store(); $browse->store();

4
templates/show_clean_catalog.inc.php
View file

@ -20,11 +20,11 @@
* *
*/ */
show_box_top(); UI::show_box_top();
/* HINT: Catalog Name */ /* HINT: Catalog Name */
printf(T_('Cleaning the %s Catalog'), "<strong>[ $this->name ]</strong>"); printf(T_('Cleaning the %s Catalog'), "<strong>[ $this->name ]</strong>");
echo "...<br />"; echo "...<br />";
echo T_('Checking') . ': <span id="clean_count_' . $this->id . '"></span><br />'; echo T_('Checking') . ': <span id="clean_count_' . $this->id . '"></span><br />';
echo T_('Reading') . ':<span id="clean_dir_' . $this->id . '"></span><br />'; echo T_('Reading') . ':<span id="clean_dir_' . $this->id . '"></span><br />';
show_box_bottom(); UI::show_box_bottom();
?> ?>

4
templates/show_confirmation.inc.php
View file

@ -22,7 +22,7 @@
$confirmation = Core::form_register($form_name); $confirmation = Core::form_register($form_name);
?> ?>
<?php show_box_top(scrub_out($title), 'box box_confirmation'); ?> <?php UI::show_box_top(scrub_out($title), 'box box_confirmation'); ?>
<?php echo $text; ?> <?php echo $text; ?>
<br /> <br />
<form method="post" action="<?php echo $path; ?>" style="display:inline;"> <form method="post" action="<?php echo $path; ?>" style="display:inline;">
@ -35,4 +35,4 @@ $confirmation = Core::form_register($form_name);
<?php echo $confirmation; ?> <?php echo $confirmation; ?>
</form> </form>
<?php } ?> <?php } ?>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_create_democratic.inc.php
View file

@ -20,7 +20,7 @@
* *
*/ */
show_box_top(T_('Configure Democratic Playlist')); ?> UI::show_box_top(T_('Configure Democratic Playlist')); ?>
<form method="post" action="<?php echo Config::get('web_path'); ?>/democratic.php?action=create" enctype="multipart/form-data"> <form method="post" action="<?php echo Config::get('web_path'); ?>/democratic.php?action=create" enctype="multipart/form-data">
<table class="tabledata" cellspacing="0" cellpadding="0"> <table class="tabledata" cellspacing="0" cellpadding="0">
<tr> <tr>
@ -61,4 +61,4 @@ show_box_top(T_('Configure Democratic Playlist')); ?>
<input type="submit" value="<?php echo T_('Update'); ?>" /> <input type="submit" value="<?php echo T_('Update'); ?>" />
</div> </div>
</form> </form>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

12
templates/show_debug.inc.php
View file

@ -20,7 +20,7 @@
* *
*/ */
?> ?>
<?php show_box_top(T_('Debug Tools'), 'box box_debug_tools'); ?> <?php UI::show_box_top(T_('Debug Tools'), 'box box_debug_tools'); ?>
<div id="information_actions"> <div id="information_actions">
<ul> <ul>
<li> <li>
@ -33,8 +33,8 @@
</li> </li>
</ul> </ul>
</div> </div>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>
<?php show_box_top(T_('PHP Settings'), 'box box_php_settings'); ?> <?php UI::show_box_top(T_('PHP Settings'), 'box box_php_settings'); ?>
<table class="tabledata" cellpadding="0" cellspacing="0"> <table class="tabledata" cellpadding="0" cellspacing="0">
<colgroup> <colgroup>
<col id="col_php_setting"> <col id="col_php_setting">
@ -81,9 +81,9 @@
<td><?php echo print_bool(function_exists('bindtextdomain')); ?></td> <td><?php echo print_bool(function_exists('bindtextdomain')); ?></td>
</tr> </tr>
</table> </table>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>
<?php show_box_top(T_('Current Configuration'), 'box box_current_configuration'); ?> <?php UI::show_box_top(T_('Current Configuration'), 'box box_current_configuration'); ?>
<table class="tabledata" cellpadding="0" cellspacing="0"> <table class="tabledata" cellpadding="0" cellspacing="0">
<colgroup> <colgroup>
<col id="col_configuration"> <col id="col_configuration">
@ -112,4 +112,4 @@
</tr> </tr>
<?php } ?> <?php } ?>
</table> </table>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_democratic.inc.php
View file

@ -21,7 +21,7 @@
*/ */
$string = $democratic->is_enabled() ? sprintf(T_('%s Playlist') ,$democratic->name) : T_('Democratic Playlist'); $string = $democratic->is_enabled() ? sprintf(T_('%s Playlist') ,$democratic->name) : T_('Democratic Playlist');
show_box_top($string , 'info-box'); UI::show_box_top($string , 'info-box');
?> ?>
<div id="information_actions"> <div id="information_actions">
<ul> <ul>
@ -49,4 +49,4 @@ show_box_top($string , 'info-box');
</ul> </ul>
</div> </div>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_duplicate.inc.php
View file

@ -20,7 +20,7 @@
* *
*/ */
?> ?>
<?php show_box_top(T_('Find Duplicates'), 'box box_duplicate'); ?> <?php UI::show_box_top(T_('Find Duplicates'), 'box box_duplicate'); ?>
<form name="duplicates" action="<?php echo Config::get('web_path'); ?>/admin/duplicates.php?action=find_duplicates" method="post" enctype="multipart/form-data" > <form name="duplicates" action="<?php echo Config::get('web_path'); ?>/admin/duplicates.php?action=find_duplicates" method="post" enctype="multipart/form-data" >
<table cellspacing="0" cellpadding="3"> <table cellspacing="0" cellpadding="3">
<tr> <tr>
@ -42,4 +42,4 @@
<input type="submit" value="<?php echo T_('Find Duplicates'); ?>" /> <input type="submit" value="<?php echo T_('Find Duplicates'); ?>" />
</div> </div>
</form> </form>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_duplicates.inc.php
View file

@ -20,7 +20,7 @@
* *
*/ */
?> ?>
<?php show_box_top(T_('Duplicate Songs')); ?> <?php UI::show_box_top(T_('Duplicate Songs')); ?>
<form method="post" enctype="multipart/form-data" action="<?php echo $web_path; ?>/admin/flag.php?action=disable"> <form method="post" enctype="multipart/form-data" action="<?php echo $web_path; ?>/admin/flag.php?action=disable">
<table class="tabledata" cellpadding="0" cellspacing="0"> <table class="tabledata" cellpadding="0" cellspacing="0">
<colgroup> <colgroup>
@ -84,4 +84,4 @@
</tr> </tr>
</table> </table>
</form> </form>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_dynamic.inc.php
View file

@ -20,7 +20,7 @@
* *
*/ */
?> ?>
<?php show_box_top(T_('Advanced Random Rules')); ?> <?php UI::show_box_top(T_('Advanced Random Rules')); ?>
<table class="tabledata" cellpadding="0" cellspacing="0"> <table class="tabledata" cellpadding="0" cellspacing="0">
<colgroup> <colgroup>
<col id="col_field" /> <col id="col_field" />
@ -85,4 +85,4 @@
</td> </td>
</tr> </tr>
</table> </table>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_edit_access.inc.php
View file

@ -20,7 +20,7 @@
* *
*/ */
?> ?>
<?php show_box_top(T_('Edit Access Control List')); ?> <?php UI::show_box_top(T_('Edit Access Control List')); ?>
<form name="edit_access" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/access.php?action=update_record&access_id=<?php echo intval($access->id); ?>"> <form name="edit_access" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/access.php?action=update_record&access_id=<?php echo intval($access->id); ?>">
<table class="table-data"> <table class="table-data">
<tr> <tr>
@ -79,4 +79,4 @@
<input type="submit" value="<?php echo T_('Update'); ?>" /> <input type="submit" value="<?php echo T_('Update'); ?>" />
</div> </div>
</form> </form>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_edit_album.inc.php
View file

@ -21,7 +21,7 @@
*/ */
?> ?>
<?php show_box_top(T_('Edit Album')); ?> <?php UI::show_box_top(T_('Edit Album')); ?>
<form name="edit_album" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/flag.php?action=edit_album"> <form name="edit_album" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/flag.php?action=edit_album">
<table class="tabledata"> <table class="tabledata">
<tr class="<?php echo UI::flip_class(); ?>"> <tr class="<?php echo UI::flip_class(); ?>">
@ -48,4 +48,4 @@
<input type="submit" value="<?php echo T_('Update Album'); ?>" /> <input type="submit" value="<?php echo T_('Update Album'); ?>" />
</div> </div>
</form> </form>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_edit_artist.inc.php
View file

@ -21,7 +21,7 @@
*/ */
?> ?>
<?php show_box_top(T_('Edit Artist')); ?> <?php UI::show_box_top(T_('Edit Artist')); ?>
<form name="edit_artist" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/flag.php?action=edit_artist"> <form name="edit_artist" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/flag.php?action=edit_artist">
<table class="tabledata"> <table class="tabledata">
<tr class="<?php echo UI::flip_class(); ?>"> <tr class="<?php echo UI::flip_class(); ?>">
@ -42,4 +42,4 @@
<input type="submit" value="<?php echo T_('Update Artist'); ?>" /> <input type="submit" value="<?php echo T_('Update Artist'); ?>" />
</div> </div>
</form> </form>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_edit_catalog.inc.php
View file

@ -20,7 +20,7 @@
* *
*/ */
show_box_top(sprintf(T_('Settings for %s') , $catalog->name . ' (' . $catalog->path . ')'), 'box box_edit_catalog'); UI::show_box_top(sprintf(T_('Settings for %s') , $catalog->name . ' (' . $catalog->path . ')'), 'box box_edit_catalog');
?> ?>
<form method="post" action="<?php echo Config::get('web_path'); ?>/admin/catalog.php" enctype="multipart/form-data"> <form method="post" action="<?php echo Config::get('web_path'); ?>/admin/catalog.php" enctype="multipart/form-data">
<table cellspacing="0" cellpadding="0"> <table cellspacing="0" cellpadding="0">
@ -71,4 +71,4 @@ show_box_top(sprintf(T_('Settings for %s') , $catalog->name . ' (' . $catalog->p
<input class="button" type="submit" value="<?php echo T_('Save Catalog Settings'); ?>" /> <input class="button" type="submit" value="<?php echo T_('Save Catalog Settings'); ?>" />
</div> </div>
</form> </form>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_edit_shout.inc.php
View file

@ -20,7 +20,7 @@
* *
*/ */
?> ?>
<?php show_box_top(T_('Edit existing Shoutbox Post')); ?> <?php UI::show_box_top(T_('Edit existing Shoutbox Post')); ?>
<form method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/shout.php?action=edit_shout"> <form method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/shout.php?action=edit_shout">
<input type="hidden" name="shout_id" value="<?php echo $shout->id; ?>" /> <input type="hidden" name="shout_id" value="<?php echo $shout->id; ?>" />
<table class="tabledata" cellpadding="0" cellspacing="0"> <table class="tabledata" cellpadding="0" cellspacing="0">
@ -43,4 +43,4 @@
</tr> </tr>
</table> </table>
</form> </form>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_edit_song.inc.php
View file

@ -21,7 +21,7 @@
*/ */
?> ?>
<?php show_box_top(T_('Edit Song')); ?> <?php UI::show_box_top(T_('Edit Song')); ?>
<form name="edit_song" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/flag.php"> <form name="edit_song" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/flag.php">
<table> <table>
<tr class="<?php echo UI::flip_class(); ?>"> <tr class="<?php echo UI::flip_class(); ?>">
@ -81,4 +81,4 @@
<input type="submit" value="<?php echo T_('Update Song'); ?>" /> <input type="submit" value="<?php echo T_('Update Song'); ?>" />
</div> </div>
</form> </form>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_edit_user.inc.php
View file

@ -20,7 +20,7 @@
* *
*/ */
?> ?>
<?php show_box_top(T_('Editing existing User')); ?> <?php UI::show_box_top(T_('Editing existing User')); ?>
<?php Error::display('general'); ?> <?php Error::display('general'); ?>
<form name="update_user" enctype="multipart/form-data" method="post" action="<?php echo Config::get('web_path') . "/admin/users.php"; ?>"> <form name="update_user" enctype="multipart/form-data" method="post" action="<?php echo Config::get('web_path') . "/admin/users.php"; ?>">
<table class="tabledata" cellspacing="0" cellpadding="0"> <table class="tabledata" cellspacing="0" cellpadding="0">
@ -117,4 +117,4 @@
<input type="hidden" name="user_id" value="<?php echo $client->id; ?>" /> <input type="hidden" name="user_id" value="<?php echo $client->id; ?>" />
</div> </div>
</form> </form>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_export.inc.php
View file

@ -25,7 +25,7 @@ ${$name} = ' selected="selected"';
$name = 'catalog_' . $_REQUEST['export_catalog']; $name = 'catalog_' . $_REQUEST['export_catalog'];
${$name} = ' selected="selected"'; ${$name} = ' selected="selected"';
show_box_top(T_('Export Catalog'), 'box box_export'); ?> UI::show_box_top(T_('Export Catalog'), 'box box_export'); ?>
<form name="duplicates" action="<?php echo Config::get('web_path'); ?>/admin/export.php?action=export" method="post" enctype="multipart/form-data" > <form name="duplicates" action="<?php echo Config::get('web_path'); ?>/admin/export.php?action=export" method="post" enctype="multipart/form-data" >
<table class="tableform" cellspacing="0" cellpadding="3"> <table class="tableform" cellspacing="0" cellpadding="3">
<tr> <tr>
@ -61,4 +61,4 @@ show_box_top(T_('Export Catalog'), 'box box_export'); ?>
<input type="submit" value="<?php echo T_('Export'); ?>" /> <input type="submit" value="<?php echo T_('Export'); ?>" />
</div> </div>
</form> </form>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_gather_art.inc.php
View file

@ -20,9 +20,9 @@
* *
*/ */
show_box_top(T_('Album Art Search'), 'box box_gather_art'); UI::show_box_top(T_('Album Art Search'), 'box box_gather_art');
echo "<strong>" . T_('Starting Album Art Search') . ". . .</strong><br />\n"; echo "<strong>" . T_('Starting Album Art Search') . ". . .</strong><br />\n";
echo T_('Searched') . ": <span id=\"count_art_" . $catalog_id . "\">" . T_('None') . "</span><br />"; echo T_('Searched') . ": <span id=\"count_art_" . $catalog_id . "\">" . T_('None') . "</span><br />";
echo T_('Reading') . ":<span id=\"read_art_$catalog_id\"></span><br />"; echo T_('Reading') . ":<span id=\"read_art_$catalog_id\"></span><br />";
show_box_bottom(); UI::show_box_bottom();
?> ?>

4
templates/show_get_albumart.inc.php
View file

@ -20,7 +20,7 @@
* *
*/ */
?> ?>
<?php show_box_top(T_('Customize Search'), 'box box_get_albumart'); ?> <?php UI::show_box_top(T_('Customize Search'), 'box box_get_albumart'); ?>
<form enctype="multipart/form-data" name="coverart" method="post" action="<?php echo Config::get('web_path'); ?>/albums.php?action=find_art&amp;album_id=<?php echo $album->id; ?>&amp;artist_name=<?php echo urlencode($_REQUEST['artist_name']);?>&amp;album_name=<?php echo urlencode($_REQUEST['album_name']); ?>&amp;cover=<?php echo urlencode($_REQUEST['cover']); ?>" style="Display:inline;"> <form enctype="multipart/form-data" name="coverart" method="post" action="<?php echo Config::get('web_path'); ?>/albums.php?action=find_art&amp;album_id=<?php echo $album->id; ?>&amp;artist_name=<?php echo urlencode($_REQUEST['artist_name']);?>&amp;album_name=<?php echo urlencode($_REQUEST['album_name']); ?>&amp;cover=<?php echo urlencode($_REQUEST['cover']); ?>" style="Display:inline;">
<table> <table>
<tr> <tr>
@ -63,4 +63,4 @@
<input type="submit" value="<?php echo T_('Get Art'); ?>" /> <input type="submit" value="<?php echo T_('Get Art'); ?>" />
</div> </div>
</form> </form>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_import_playlist.inc.php
View file

@ -20,7 +20,7 @@
* *
*/ */
?> ?>
<?php show_box_top(T_('Importing a Playlist from a File'), 'box box_import_playlist'); ?> <?php UI::show_box_top(T_('Importing a Playlist from a File'), 'box box_import_playlist'); ?>
<form method="post" name="import_playlist" action="<?php echo Config::get('web_path'); ?>/playlist.php" enctype="multipart/form-data"> <form method="post" name="import_playlist" action="<?php echo Config::get('web_path'); ?>/playlist.php" enctype="multipart/form-data">
<table cellpadding="0" cellspacing="0"> <table cellpadding="0" cellspacing="0">
<tr> <tr>
@ -46,5 +46,5 @@
<input type="submit" value="<?php echo T_('Import Playlist'); ?>" /> <input type="submit" value="<?php echo T_('Import Playlist'); ?>" />
</div> </div>
</form> </form>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

2
templates/show_index.inc.php
View file

@ -29,7 +29,7 @@ if (Art::is_enabled()) {
echo Ajax::observe('window','load',Ajax::action('?page=index&action=random_albums','random_albums')); echo Ajax::observe('window','load',Ajax::action('?page=index&action=random_albums','random_albums'));
?> ?>
<div id="random_selection"> <div id="random_selection">
<?php show_box_top(T_('Albums of the Moment')); echo T_('Loading...'); show_box_bottom(); ?> <?php UI::show_box_top(T_('Albums of the Moment')); echo T_('Loading...'); UI::show_box_bottom(); ?>
</div> </div>
<?php } ?> <?php } ?>
<!-- Recently Played --> <!-- Recently Played -->

4
templates/show_ip_history.inc.php
View file

@ -20,7 +20,7 @@
* *
*/ */
?> ?>
<?php /* HINT: Username */ show_box_top(sprintf(T_('%s IP History'), $working_user->fullname)); ?> <?php /* HINT: Username */ UI::show_box_top(sprintf(T_('%s IP History'), $working_user->fullname)); ?>
<div id="information_actions"> <div id="information_actions">
<ul> <ul>
<li> <li>
@ -61,4 +61,4 @@
</tr> </tr>
</table> </table>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_live_stream.inc.php
View file

@ -20,7 +20,7 @@
* *
*/ */
?> ?>
<?php show_box_top(T_('Manage Radio Stations'),'info-box'); ?> <?php UI::show_box_top(T_('Manage Radio Stations'),'info-box'); ?>
<div id="information_actions"> <div id="information_actions">
<ul> <ul>
<li> <li>
@ -28,4 +28,4 @@
</li> </li>
</ul> </ul>
</div> </div>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_localplay_add_instance.inc.php
View file

@ -20,7 +20,7 @@
* *
*/ */
?> ?>
<?php show_box_top(T_('Add Localplay Instance'), 'box box_localplay_add_instance'); ?> <?php UI::show_box_top(T_('Add Localplay Instance'), 'box box_localplay_add_instance'); ?>
<form method="post" action="<?php echo Config::get('web_path'); ?>/localplay.php?action=add_instance"> <form method="post" action="<?php echo Config::get('web_path'); ?>/localplay.php?action=add_instance">
<table cellpadding="3" cellspacing="0" class="tabledata"> <table cellpadding="3" cellspacing="0" class="tabledata">
<?php foreach ($fields as $key=>$field) { ?> <?php foreach ($fields as $key=>$field) { ?>
@ -34,4 +34,4 @@
<input type="submit" value="<?php echo T_('Add Instance'); ?>" /> <input type="submit" value="<?php echo T_('Add Instance'); ?>" />
</div> </div>
</form> </form>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_localplay_edit_instance.inc.php
View file

@ -20,7 +20,7 @@
* *
*/ */
?> ?>
<?php show_box_top(T_('Edit Localplay Instance'), 'box box_localplay_edit_instance'); ?> <?php UI::show_box_top(T_('Edit Localplay Instance'), 'box box_localplay_edit_instance'); ?>
<form method="post" action="<?php echo Config::get('web_path'); ?>/localplay.php?action=update_instance&amp;instance=<?php echo intval($_REQUEST['instance']); ?>"> <form method="post" action="<?php echo Config::get('web_path'); ?>/localplay.php?action=update_instance&amp;instance=<?php echo intval($_REQUEST['instance']); ?>">
<table cellpadding="3" cellspacing="0" class="tabledata"> <table cellpadding="3" cellspacing="0" class="tabledata">
<?php foreach ($fields as $key=>$field) { ?> <?php foreach ($fields as $key=>$field) { ?>
@ -34,4 +34,4 @@
<input type="submit" value="<?php echo T_('Update Instance'); ?>" /> <input type="submit" value="<?php echo T_('Update Instance'); ?>" />
</div> </div>
</form> </form>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_localplay_instances.inc.php
View file

@ -20,7 +20,7 @@
* *
*/ */
?> ?>
<?php show_box_top(T_('Show Localplay Instances'), 'box box_localplay_instances'); ?> <?php UI::show_box_top(T_('Show Localplay Instances'), 'box box_localplay_instances'); ?>
<table cellpadding="3" cellspacing="0" class="tabledata"> <table cellpadding="3" cellspacing="0" class="tabledata">
<tr> <tr>
<?php foreach ($fields as $key=>$field) { ?> <?php foreach ($fields as $key=>$field) { ?>
@ -42,4 +42,4 @@
</tr> </tr>
<?php } ?> <?php } ?>
</table> </table>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_localplay_status.inc.php
View file

@ -24,7 +24,7 @@ $status = $localplay->status();
$now_playing = $status['track_title'] ? $status['track_title'] . ' - ' . $status['track_album'] . ' - ' . $status['track_artist'] : ''; $now_playing = $status['track_title'] ? $status['track_title'] . ' - ' . $status['track_album'] . ' - ' . $status['track_artist'] : '';
?> ?>
<?php Ajax::start_container('localplay_status'); ?> <?php Ajax::start_container('localplay_status'); ?>
<?php show_box_top(T_('Localplay Control') . ' - '. strtoupper($localplay->type), 'box box_localplay_status'); ?> <?php UI::show_box_top(T_('Localplay Control') . ' - '. strtoupper($localplay->type), 'box box_localplay_status'); ?>
<?php echo T_('Now Playing'); ?>:<i><?php echo $now_playing; ?></i> <?php echo T_('Now Playing'); ?>:<i><?php echo $now_playing; ?></i>
<div id="information_actions"> <div id="information_actions">
<ul> <ul>
@ -49,5 +49,5 @@ $now_playing = $status['track_title'] ? $status['track_title'] . ' - ' . $status
</li> </li>
</ul> </ul>
</div> </div>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>
<?php Ajax::end_container(); ?> <?php Ajax::end_container(); ?>

4
templates/show_login_form.inc.php
View file

@ -89,9 +89,9 @@ if (@is_readable(Config::get('prefix') . '/config/motd.php')) {
</div> </div>
<div id="motd"> <div id="motd">
<?php <?php
show_box_top(T_('Message of the Day')); UI::show_box_top(T_('Message of the Day'));
require_once Config::get('prefix') . '/config/motd.php'; require_once Config::get('prefix') . '/config/motd.php';
show_box_bottom(); UI::show_box_bottom();
?> ?>
<?php <?php
} }

4
templates/show_lyrics.inc.php
View file

@ -31,7 +31,7 @@
* @todo get lyrics from id3tag, if possible. * @todo get lyrics from id3tag, if possible.
*/ */
/* HINT: Song Title */ /* HINT: Song Title */
show_box_top(sprintf(T_('%s Lyrics'), $song->title), 'box box_lyrics'); UI::show_box_top(sprintf(T_('%s Lyrics'), $song->title), 'box box_lyrics');
?> ?>
<table class="tabledata" cellspacing="0" cellpadding="0"> <table class="tabledata" cellspacing="0" cellpadding="0">
<tr> <tr>
@ -48,4 +48,4 @@ show_box_top(sprintf(T_('%s Lyrics'), $song->title), 'box box_lyrics');
</td> </td>
</tr> </tr>
</table> </table>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_lyrics_song.inc.php
View file

@ -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 */ /* Prepare the variables */
$title = scrub_out(UI::truncate($song->title)); $title = scrub_out(UI::truncate($song->title));
@ -63,4 +63,4 @@ $artist = scrub_out(UI::truncate($song->f_artist_full));
</div> </div>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_mail_users.inc.php
View file

@ -21,7 +21,7 @@
*/ */
?> ?>
<?php show_box_top(T_('Send E-mail to Users'), 'box box_mail_users'); ?> <?php UI::show_box_top(T_('Send E-mail to Users'), 'box box_mail_users'); ?>
<form name="mail" method="post" action="<?php echo Config::get('web_path'); ?>/admin/mail.php?action=send_mail" enctype="multipart/form-data"> <form name="mail" method="post" action="<?php echo Config::get('web_path'); ?>/admin/mail.php?action=send_mail" enctype="multipart/form-data">
<table> <table>
<tr> <tr>
@ -122,5 +122,5 @@
<input class="button" type="submit" value="<?php echo T_('Send Mail'); ?>" /> <input class="button" type="submit" value="<?php echo T_('Send Mail'); ?>" />
</div> </div>
</form> </form>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_manage_catalogs.inc.php
View file

@ -20,7 +20,7 @@
* *
*/ */
?> ?>
<?php show_box_top(T_('Show Catalogs'), 'box box_manage_catalogs') ?> <?php UI::show_box_top(T_('Show Catalogs'), 'box box_manage_catalogs') ?>
<div id="information_actions"> <div id="information_actions">
<table> <table>
<tr> <tr>
@ -46,7 +46,7 @@
</tr> </tr>
</table> </table>
</div> </div>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>
<?php <?php
$catalog_ids = Catalog::get_catalogs(); $catalog_ids = Catalog::get_catalogs();
$browse = new Browse(); $browse = new Browse();

4
templates/show_manage_democratic.inc.php
View file

@ -20,7 +20,7 @@
* *
*/ */
show_box_top(T_('Manage Democratic Playlists')); ?> UI::show_box_top(T_('Manage Democratic Playlists')); ?>
<table class="tabledata" cellpadding="0" cellspacing="0"> <table class="tabledata" cellpadding="0" cellspacing="0">
<colgroup> <colgroup>
<col id="col_number" /> <col id="col_number" />
@ -69,4 +69,4 @@ show_box_top(T_('Manage Democratic Playlists')); ?>
<div> <div>
<a class="button" href="<?php echo Config::get('web_path'); ?>/democratic.php?action=show_create"><?php echo T_('Create New Playlist'); ?></a> <a class="button" href="<?php echo Config::get('web_path'); ?>/democratic.php?action=show_create"><?php echo T_('Create New Playlist'); ?></a>
</div> </div>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_newest.inc.php
View file

@ -20,6 +20,6 @@
* *
*/ */
?> ?>
<?php show_box_top(T_('Information')); ?> <?php UI::show_box_top(T_('Information')); ?>
<?php require_once Config::get('prefix') . '/templates/show_stats_newest.inc.php'; ?> <?php require_once Config::get('prefix') . '/templates/show_stats_newest.inc.php'; ?>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_now_playing.inc.php
View file

@ -30,7 +30,7 @@
if (count($results)) { if (count($results)) {
$link = Config::get('use_rss') ? ' ' . Ampache_RSS::get_display('nowplaying') : ''; $link = Config::get('use_rss') ? ' ' . Ampache_RSS::get_display('nowplaying') : '';
?> ?>
<?php show_box_top(T_('Now Playing') . $link); ?> <?php UI::show_box_top(T_('Now Playing') . $link); ?>
<?php <?php
foreach ($results as $item) { foreach ($results as $item) {
$media = $item['media']; $media = $item['media'];
@ -47,5 +47,5 @@ foreach ($results as $item) {
<?php <?php
} // end foreach } // end foreach
?> ?>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>
<?php } // end if count results ?> <?php } // end if count results ?>

4
templates/show_playlist.inc.php
View file

@ -31,7 +31,7 @@ ob_start();
require Config::get('prefix') . '/templates/show_playlist_title.inc.php'; require Config::get('prefix') . '/templates/show_playlist_title.inc.php';
$title = ob_get_contents(); $title = ob_get_contents();
ob_end_clean(); ob_end_clean();
show_box_top('<div id="playlist_row_' . $playlist->id . '">' . $title . UI::show_box_top('<div id="playlist_row_' . $playlist->id . '">' . $title .
'</div>', 'info-box'); '</div>', 'info-box');
?> ?>
<div id="information_actions"> <div id="information_actions">
@ -68,7 +68,7 @@ show_box_top('<div id="playlist_row_' . $playlist->id . '">' . $title .
<?php } ?> <?php } ?>
</ul> </ul>
</div> </div>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>
<?php <?php
$browse = new Browse(); $browse = new Browse();
$browse->set_type('playlist_song'); $browse->set_type('playlist_song');

4
templates/show_popular.inc.php
View file

@ -20,7 +20,7 @@
* *
*/ */
show_box_top(T_('Information')); UI::show_box_top(T_('Information'));
$object_ids = Stats::get_top('song'); $object_ids = Stats::get_top('song');
$browse = new Browse(); $browse = new Browse();
@ -40,5 +40,5 @@ $browse->set_type('artist');
$browse->show_objects($object_ids); $browse->show_objects($object_ids);
$browse->store(); $browse->store();
show_box_bottom(); UI::show_box_bottom();
?> ?>

4
templates/show_preference_admin.inc.php
View file

@ -20,7 +20,7 @@
* *
*/ */
show_box_top(T_('Preference Administration')); UI::show_box_top(T_('Preference Administration'));
?> ?>
<form method="post" action="<?php echo Config::get('web_path'); ?>/admin/preferences.php" enctype="multipart/form-data"> <form method="post" action="<?php echo Config::get('web_path'); ?>/admin/preferences.php" enctype="multipart/form-data">
<table class="tabledata" cellpadding="0" cellspacing="0"> <table class="tabledata" cellpadding="0" cellspacing="0">
@ -57,4 +57,4 @@ show_box_top(T_('Preference Administration'));
<input type="submit" value="<?php echo T_('Update'); ?>" /> <input type="submit" value="<?php echo T_('Update'); ?>" />
</div> </div>
</form> </form>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_preferences.inc.php
View file

@ -26,7 +26,7 @@
*/ */
?> ?>
<?php /* HINT: Username */ show_box_top(sprintf(T_('Editing %s preferences'), $fullname),'box box_preferences'); ?> <?php /* HINT: Username */ UI::show_box_top(sprintf(T_('Editing %s preferences'), $fullname),'box box_preferences'); ?>
<?php if ($_REQUEST['tab'] != 'account' && $_REQUEST['tab'] != 'modules') { ?> <?php if ($_REQUEST['tab'] != 'account' && $_REQUEST['tab'] != 'modules') { ?>
<form method="post" name="preferences" action="<?php echo Config::get('web_path'); ?>/preferences.php?action=update_preferences" enctype="multipart/form-data"> <form method="post" name="preferences" action="<?php echo Config::get('web_path'); ?>/preferences.php?action=update_preferences" enctype="multipart/form-data">
@ -49,4 +49,4 @@ if ($_REQUEST['tab'] == 'account') {
?> ?>
</form> </form>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_random.inc.php
View file

@ -20,7 +20,7 @@
* *
*/ */
?> ?>
<?php show_box_top(T_('Play Random Selection'), 'box box_random'); ?> <?php UI::show_box_top(T_('Play Random Selection'), 'box box_random'); ?>
<form id="random" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/random.php?action=get_advanced&type=<?php echo $_REQUEST['type'] ? scrub_out($_REQUEST['type']) : 'song'; ?>"> <form id="random" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/random.php?action=get_advanced&type=<?php echo $_REQUEST['type'] ? scrub_out($_REQUEST['type']) : 'song'; ?>">
<table class="tabledata" cellpadding="3" cellspacing="0"> <table class="tabledata" cellpadding="3" cellspacing="0">
<tr id="search_location"> <tr id="search_location">
@ -103,7 +103,7 @@
<input type="submit" value="<?php echo T_('Enqueue'); ?>" /> <input type="submit" value="<?php echo T_('Enqueue'); ?>" />
</div> </div>
</form> </form>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>
<div id="browse"> <div id="browse">
<?php <?php
if (is_array($object_ids)) { if (is_array($object_ids)) {

4
templates/show_random_albums.inc.php
View file

@ -23,7 +23,7 @@
$web_path = Config::get('web_path'); $web_path = Config::get('web_path');
$button = Ajax::button('?page=index&action=random_albums','random', T_('Refresh'),'random_refresh'); $button = Ajax::button('?page=index&action=random_albums','random', T_('Refresh'),'random_refresh');
?> ?>
<?php show_box_top(T_('Albums of the Moment') . ' ' . $button, 'box box_random_albums'); ?> <?php UI::show_box_top(T_('Albums of the Moment') . ' ' . $button, 'box box_random_albums'); ?>
<?php <?php
if ($albums) { if ($albums) {
@ -53,4 +53,4 @@ $button = Ajax::button('?page=index&action=random_albums','random', T_('Refresh'
<?php } // end foreach ?> <?php } // end foreach ?>
<?php } // end if albums ?> <?php } // end if albums ?>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_recently_played.inc.php
View file

@ -21,7 +21,7 @@
*/ */
$link = Config::get('use_rss') ? ' ' . Ampache_RSS::get_display('recently_played') : ''; $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');
?> ?>
<table class="tabledata" cellpadding="0" cellspacing="0"> <table class="tabledata" cellpadding="0" cellspacing="0">
<colgroup> <colgroup>
@ -111,4 +111,4 @@ show_box_top(T_('Recently Played') . $link, 'box box_recently_played');
<th class="cel_lastplayed"><?php echo T_('Last Played'); ?></th> <th class="cel_lastplayed"><?php echo T_('Last Played'); ?></th>
</tr> </tr>
</table> </table>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

2
templates/show_recommended_artists.inc.php
View file

@ -20,7 +20,7 @@
* *
*/ */
?> ?>
<?php show_box_top(T_('Similar Artists'), 'info-box'); ?> <?php UI::show_box_top(T_('Similar Artists'), 'info-box'); ?>
<table class="tabledata" cellpadding="0" cellspacing="0"> <table class="tabledata" cellpadding="0" cellspacing="0">
<colgroup> <colgroup>
<col id="col_add" /> <col id="col_add" />

4
templates/show_rename_artist.inc.php
View file

@ -26,7 +26,7 @@ function insert()
document.getElementById('artist_name').value = '<?php echo $artist->name; ?>'; document.getElementById('artist_name').value = '<?php echo $artist->name; ?>';
} }
</script> </script>
<?php /* HINT: Artist Name */ show_box_top(sprintf(T_('Rename %s'), $artist->name)); ?> <?php /* HINT: Artist Name */ UI::show_box_top(sprintf(T_('Rename %s'), $artist->name)); ?>
<form name="rename_artist" method="post" action="<?php echo Config::get('web_path'); ?>/artists.php?action=rename&amp;artist=<?php echo $artist->id; ?>" style="Display:inline;"> <form name="rename_artist" method="post" action="<?php echo Config::get('web_path'); ?>/artists.php?action=rename&amp;artist=<?php echo $artist->id; ?>" style="Display:inline;">
<?php show_artist_pulldown($artist->id, "artist_id", 4); ?> <?php show_artist_pulldown($artist->id, "artist_id", 4); ?>
<br /> <br />
@ -37,4 +37,4 @@ function insert()
<input type="checkbox" name="update_id3" value="yes" />&nbsp; <?php echo T_('Update id3 tags') ?><br /> <input type="checkbox" name="update_id3" value="yes" />&nbsp; <?php echo T_('Update id3 tags') ?><br />
<input type="submit" value="<?php echo T_('Rename'); ?>" /><br /> <input type="submit" value="<?php echo T_('Rename'); ?>" /><br />
</form> </form>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_rules.inc.php
View file

@ -31,7 +31,7 @@ $logic_operator = strtolower($logic_operator);
<script type="text/javascript" src="<?php echo Config::get('web_path'); ?>/lib/javascript/search.js"></script> <script type="text/javascript" src="<?php echo Config::get('web_path'); ?>/lib/javascript/search.js"></script>
<script type="text/javascript" src="<?php echo Config::get('web_path'); ?>/lib/javascript/search-data.php?type=<?php echo $_REQUEST['type'] ? scrub_out($_REQUEST['type']) : 'song'; ?>"></script> <script type="text/javascript" src="<?php echo Config::get('web_path'); ?>/lib/javascript/search-data.php?type=<?php echo $_REQUEST['type'] ? scrub_out($_REQUEST['type']) : 'song'; ?>"></script>
<?php show_box_top(T_('Rules') . "...", 'box box_rules'); ?> <?php UI::show_box_top(T_('Rules') . "...", 'box box_rules'); ?>
<table class="tabledata" cellpadding="3" cellspacing="0"> <table class="tabledata" cellpadding="3" cellspacing="0">
<tbody id="searchtable"> <tbody id="searchtable">
<tr id="rules_operator"> <tr id="rules_operator">
@ -54,7 +54,7 @@ $logic_operator = strtolower($logic_operator);
</tr> </tr>
</tbody> </tbody>
</table> </table>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>
<?php <?php
if ($playlist) { if ($playlist) {

4
templates/show_search.inc.php
View file

@ -20,7 +20,7 @@
* *
*/ */
show_box_top(T_('Search Ampache') . "...", 'box box_advanced_search'); UI::show_box_top(T_('Search Ampache') . "...", 'box box_advanced_search');
?> ?>
<form id="search" name="search" method="post" action="<?php echo Config::get('web_path'); ?>/search.php?type=<?php echo $_REQUEST['type'] ? scrub_out($_REQUEST['type']) : 'song'; ?>" enctype="multipart/form-data" style="Display:inline"> <form id="search" name="search" method="post" action="<?php echo Config::get('web_path'); ?>/search.php?type=<?php echo $_REQUEST['type'] ? scrub_out($_REQUEST['type']) : 'song'; ?>" enctype="multipart/form-data" style="Display:inline">
<table class="tabledata" cellpadding="3" cellspacing="0"> <table class="tabledata" cellpadding="3" cellspacing="0">
@ -57,4 +57,4 @@ show_box_top(T_('Search Ampache') . "...", 'box box_advanced_search');
<input type="hidden" id="hiddenaction" name="action" value="search" /> <input type="hidden" id="hiddenaction" name="action" value="search" />
</div> </div>
</form> </form>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_search_options.inc.php
View file

@ -20,7 +20,7 @@
* *
*/ */
?> ?>
<?php show_box_top(T_('Options'),'info-box'); ?> <?php UI::show_box_top(T_('Options'),'info-box'); ?>
<div id="information_actions"> <div id="information_actions">
<ul> <ul>
<li> <li>
@ -35,4 +35,4 @@
<?php } ?> <?php } ?>
</ul> </ul>
</div> </div>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_shoutbox.inc.php
View file

@ -20,7 +20,7 @@
* *
*/ */
?> ?>
<?php show_box_top(T_('Shoutbox')); ?> <?php UI::show_box_top(T_('Shoutbox')); ?>
<div id="shoutbox"> <div id="shoutbox">
<?php <?php
foreach ($shouts as $shout_id) { foreach ($shouts as $shout_id) {
@ -39,4 +39,4 @@
</div> </div>
<?php } ?> <?php } ?>
</div> </div>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_smartplaylist.inc.php
View file

@ -25,7 +25,7 @@ ob_start();
require Config::get('prefix') . '/templates/show_smartplaylist_title.inc.php'; require Config::get('prefix') . '/templates/show_smartplaylist_title.inc.php';
$title = ob_get_contents(); $title = ob_get_contents();
ob_end_clean(); ob_end_clean();
show_box_top('<div id="playlist_row_' . $playlist->id . '">' . $title . UI::show_box_top('<div id="playlist_row_' . $playlist->id . '">' . $title .
'</div>' , 'box box_smartplaylist'); '</div>' , 'box box_smartplaylist');
?> ?>
<div id="information_actions"> <div id="information_actions">
@ -65,4 +65,4 @@ show_box_top('<div id="playlist_row_' . $playlist->id . '">' . $title .
</form> </form>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_song.inc.php
View file

@ -23,7 +23,7 @@
$icon = $song->enabled ? 'disable' : 'enable'; $icon = $song->enabled ? 'disable' : 'enable';
$button_flip_state_id = 'button_flip_state_' . $song->id; $button_flip_state_id = 'button_flip_state_' . $song->id;
?> ?>
<?php show_box_top($song->title . ' ' . T_('Details'), 'box box_song_details'); ?> <?php UI::show_box_top($song->title . ' ' . T_('Details'), 'box box_song_details'); ?>
<dl class="song_details"> <dl class="song_details">
<?php if (Config::get('ratings')) { ?> <?php if (Config::get('ratings')) { ?>
<dt class="<?php echo UI::flip_class(); ?>"><?php echo T_('Rating'); ?></dt> <dt class="<?php echo UI::flip_class(); ?>"><?php echo T_('Rating'); ?></dt>
@ -71,4 +71,4 @@ $button_flip_state_id = 'button_flip_state_' . $song->id;
} }
?> ?>
</dl> </dl>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_stats.inc.php
View file

@ -23,7 +23,7 @@
$stats = Catalog::get_stats(); $stats = Catalog::get_stats();
$catalogs = Catalog::get_catalogs(); $catalogs = Catalog::get_catalogs();
?> ?>
<?php show_box_top(T_('Statistics'), 'box box_stats'); ?> <?php UI::show_box_top(T_('Statistics'), 'box box_stats'); ?>
<em><?php echo T_('Catalogs'); ?></em> <em><?php echo T_('Catalogs'); ?></em>
<table class="tabledata" cellpadding="3" cellspacing="1"> <table class="tabledata" cellpadding="3" cellspacing="1">
<tr class="th-top"> <tr class="th-top">
@ -89,4 +89,4 @@ $catalogs = Catalog::get_catalogs();
<?php } ?> <?php } ?>
</table> </table>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

8
templates/show_stats_popular.inc.php
View file

@ -24,15 +24,15 @@
<?php <?php
$objects = Stats::get_top('album'); $objects = Stats::get_top('album');
$headers = array('f_link' => T_('Most Popular Albums')); $headers = array('f_link' => T_('Most Popular Albums'));
show_box_top('','info-box box_popular_albums'); UI::show_box_top('','info-box box_popular_albums');
require Config::get('prefix') . '/templates/show_objects.inc.php'; require Config::get('prefix') . '/templates/show_objects.inc.php';
show_box_bottom(); UI::show_box_bottom();
$objects = Stats::get_top('artist'); $objects = Stats::get_top('artist');
$headers = array('f_name_link' => T_('Most Popular Artists')); $headers = array('f_name_link' => T_('Most Popular Artists'));
show_box_top('','info-box box_popular_artists'); UI::show_box_top('','info-box box_popular_artists');
require Config::get('prefix') . '/templates/show_objects.inc.php'; require Config::get('prefix') . '/templates/show_objects.inc.php';
show_box_bottom(); UI::show_box_bottom();
?> ?>
</div> </div>

4
templates/show_update_items.inc.php
View file

@ -20,10 +20,10 @@
* *
*/ */
show_box_top(T_('Starting Update from Tags'), 'box box_update_items'); UI::show_box_top(T_('Starting Update from Tags'), 'box box_update_items');
Catalog::update_single_item($type,$object_id); Catalog::update_single_item($type,$object_id);
?> ?>
<br /> <br />
<strong><?php echo T_('Update from Tags Complete'); ?></strong>&nbsp;&nbsp; <strong><?php echo T_('Update from Tags Complete'); ?></strong>&nbsp;&nbsp;
<a class="button" href="<?php echo $target_url; ?>"><?php echo T_('Continue'); ?></a> <a class="button" href="<?php echo $target_url; ?>"><?php echo T_('Continue'); ?></a>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_user.inc.php
View file

@ -24,7 +24,7 @@ $last_seen = $client->last_seen ? date("m\/d\/y - H:i",$client->last_seen)
$create_date = $client->create_date ? date("m\/d\/y - H:i",$client->create_date) : T_('Unknown'); $create_date = $client->create_date ? date("m\/d\/y - H:i",$client->create_date) : T_('Unknown');
$client->format(); $client->format();
?> ?>
<?php show_box_top($client->fullname); ?> <?php UI::show_box_top($client->fullname); ?>
<table cellspacing="0"> <table cellspacing="0">
<tr> <tr>
<td valign="top"> <td valign="top">
@ -56,7 +56,7 @@ $client->format();
</td> </td>
</tr> </tr>
</table> </table>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>
<?php <?php
$data = Song::get_recently_played($client->id); $data = Song::get_recently_played($client->id);
require Config::get('prefix') . '/templates/show_recently_played.inc.php'; require Config::get('prefix') . '/templates/show_recently_played.inc.php';

4
templates/show_user_preferences.inc.php
View file

@ -26,7 +26,7 @@
*/ */
?> ?>
<?php /* HINT: Editing Username preferences */ show_box_top(sprintf(T_('Editing %s preferences'), $client->fullname),'box box_preferences'); ?> <?php /* HINT: Editing Username preferences */ UI::show_box_top(sprintf(T_('Editing %s preferences'), $client->fullname),'box box_preferences'); ?>
<form method="post" name="preferences" action="<?php echo Config::get('web_path'); ?>/preferences.php?action=admin_update_preferences" enctype="multipart/form-data"> <form method="post" name="preferences" action="<?php echo Config::get('web_path'); ?>/preferences.php?action=admin_update_preferences" enctype="multipart/form-data">
<table class="tabledata" cellspacing="0"> <table class="tabledata" cellspacing="0">
<colgroup> <colgroup>
@ -58,4 +58,4 @@
</table> </table>
</form> </form>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_user_recommendations.inc.php
View file

@ -20,7 +20,7 @@
* *
*/ */
?> ?>
<?php show_box_top(sprintf('%s Recommendations'), $working_user->fullname); ?> <?php UI::show_box_top(sprintf('%s Recommendations'), $working_user->fullname); ?>
<table class="tabledata"> <table class="tabledata">
<tr> <tr>
<td valign="top"> <td valign="top">
@ -58,4 +58,4 @@
</td> </td>
</tr> </tr>
</table> </table>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_user_stats.inc.php
View file

@ -20,7 +20,7 @@
* *
*/ */
?> ?>
<?php show_box_top(sprintf('%s Favorites'), $working_user->fullname); ?> <?php UI::show_box_top(sprintf('%s Favorites'), $working_user->fullname); ?>
<table class="tabledata"> <table class="tabledata">
<tr> <tr>
<td valign="top"> <td valign="top">
@ -64,4 +64,4 @@
</td> </td>
</tr> </tr>
</table> </table>
<?php show_box_bottom(); ?> <?php UI::show_box_bottom(); ?>

4
templates/show_verify_catalog.inc.php
View file

@ -20,7 +20,7 @@
* *
*/ */
show_box_top(T_('Verify Catalog'), 'box box_verify_catalog'); UI::show_box_top(T_('Verify Catalog'), 'box box_verify_catalog');
/* HINT: Catalog Name */ /* HINT: Catalog Name */
printf(T_('Updating the %s catalog'), "<strong>[ $this->name ]</strong>"); printf(T_('Updating the %s catalog'), "<strong>[ $this->name ]</strong>");
echo "<br />\n"; echo "<br />\n";
@ -28,5 +28,5 @@ printf(T_ngettext('%d item found checking tag information', '%d items found chec
echo "<br />\n\n"; echo "<br />\n\n";
echo T_('Verified') . ': <span id="verify_count_' . $this->id . '">' . $catalog_verify_found . '</span><br />'; echo T_('Verified') . ': <span id="verify_count_' . $this->id . '">' . $catalog_verify_found . '</span><br />';
echo T_('Reading') . ': <span id="verify_dir_' . $this->id . '">' . $catalog_verify_directory . '</span><br />'; echo T_('Reading') . ': <span id="verify_dir_' . $this->id . '">' . $catalog_verify_directory . '</span><br />';
show_box_bottom(); UI::show_box_bottom();
?> ?>