From ef4d3660605efc7f1328d4533b0f4bfb6c1107e2 Mon Sep 17 00:00:00 2001 From: Paul Arthur Date: Sat, 26 Jan 2013 03:00:32 -0500 Subject: Cosmetics: death to tabs The refactoring I've been doing has reminded me of my strong preference for spaces, and I feel inclined to impose my will on the tree. --- templates/base.css | 14 +- templates/browse_content.inc.php | 2 +- templates/browse_filters.inc.php | 94 +++---- templates/error_page.inc.php | 34 +-- templates/footer.inc.php | 8 +- templates/header.inc.php | 48 ++-- templates/install.css | 130 ++++----- templates/install_header.inc.php | 22 +- templates/javascript_refresh.inc.php | 2 +- templates/list_header.inc.php | 136 ++++----- templates/print.css | 4 +- templates/rightbar.inc.php | 146 +++++----- templates/show_access_list.inc.php | 76 ++--- templates/show_account.inc.php | 52 ++-- templates/show_add_access.inc.php | 120 ++++---- templates/show_add_catalog.inc.php | 68 ++--- templates/show_add_live_stream.inc.php | 60 ++-- templates/show_add_playlist.inc.php | 24 +- templates/show_add_shout.inc.php | 20 +- templates/show_add_user.inc.php | 76 ++--- templates/show_adds_catalog.inc.php | 2 +- templates/show_admin_info.inc.php | 16 +- templates/show_admin_tools.inc.php | 76 ++--- templates/show_album.inc.php | 98 +++---- templates/show_album_art.inc.php | 50 ++-- templates/show_album_row.inc.php | 36 +-- templates/show_albums.inc.php | 64 ++--- templates/show_all_popular.inc.php | 38 +-- templates/show_alphabet_form.inc.php | 8 +- templates/show_artist.inc.php | 46 +-- templates/show_artist_row.inc.php | 12 +- templates/show_artists.inc.php | 42 +-- templates/show_big_art.inc.php | 2 +- templates/show_box_bottom.inc.php | 2 +- templates/show_box_top.inc.php | 6 +- templates/show_catalog_row.inc.php | 12 +- templates/show_catalogs.inc.php | 36 +-- templates/show_clean_catalog.inc.php | 2 +- templates/show_confirmation.inc.php | 18 +- templates/show_create_democratic.inc.php | 32 +-- templates/show_debug.inc.php | 84 +++--- templates/show_democratic.inc.php | 16 +- templates/show_democratic_playlist.inc.php | 88 +++--- templates/show_denied.inc.php | 2 +- templates/show_disabled_songs.inc.php | 52 ++-- templates/show_duplicate.inc.php | 16 +- templates/show_duplicates.inc.php | 80 +++--- templates/show_dynamic.inc.php | 104 +++---- templates/show_edit_access.inc.php | 58 ++-- templates/show_edit_album.inc.php | 30 +- templates/show_edit_album_row.inc.php | 30 +- templates/show_edit_artist.inc.php | 22 +- templates/show_edit_artist_row.inc.php | 10 +- templates/show_edit_catalog.inc.php | 56 ++-- templates/show_edit_live_stream_row.inc.php | 30 +- templates/show_edit_playlist_row.inc.php | 30 +- templates/show_edit_playlist_song_row.inc.php | 10 +- templates/show_edit_playlist_title.inc.php | 30 +- templates/show_edit_shout.inc.php | 16 +- templates/show_edit_smartplaylist_row.inc.php | 30 +- templates/show_edit_smartplaylist_title.inc.php | 30 +- templates/show_edit_song.inc.php | 76 ++--- templates/show_edit_song_row.inc.php | 20 +- templates/show_edit_user.inc.php | 120 ++++---- templates/show_export.inc.php | 40 +-- templates/show_flag_row.inc.php | 26 +- templates/show_flagged.inc.php | 34 +-- templates/show_gather_art.inc.php | 2 +- templates/show_get_albumart.inc.php | 56 ++-- templates/show_import_playlist.inc.php | 30 +- templates/show_index.inc.php | 20 +- templates/show_install.inc.php | 74 ++--- templates/show_install_account.inc.php | 52 ++-- templates/show_install_check.inc.php | 188 ++++++------- templates/show_install_config.inc.php | 102 +++---- templates/show_install_lang.inc.php | 30 +- templates/show_ip_history.inc.php | 26 +- templates/show_live_stream.inc.php | 4 +- templates/show_live_stream_row.inc.php | 16 +- templates/show_live_streams.inc.php | 34 +-- templates/show_localplay_add_instance.inc.php | 10 +- templates/show_localplay_control.inc.php | 2 +- templates/show_localplay_controllers.inc.php | 50 ++-- templates/show_localplay_edit_instance.inc.php | 10 +- templates/show_localplay_instances.inc.php | 26 +- templates/show_localplay_playlist.inc.php | 38 +-- templates/show_localplay_status.inc.php | 16 +- templates/show_login_form.inc.php | 60 ++-- templates/show_lostpassword_form.inc.php | 52 ++-- templates/show_lyrics.inc.php | 24 +- templates/show_lyrics_song.inc.php | 24 +- templates/show_mail_users.inc.php | 102 +++---- templates/show_manage_catalogs.inc.php | 38 +-- templates/show_manage_democratic.inc.php | 62 ++--- templates/show_manage_shoutbox.inc.php | 34 +-- templates/show_newest.inc.php | 2 +- templates/show_now_playing.inc.php | 14 +- templates/show_now_playing_row.inc.php | 80 +++--- templates/show_object_rating.inc.php | 12 +- templates/show_object_row.inc.php | 4 +- templates/show_objects.inc.php | 16 +- templates/show_playlist.inc.php | 72 ++--- templates/show_playlist_row.inc.php | 14 +- templates/show_playlist_song_row.inc.php | 20 +- templates/show_playlist_songs.inc.php | 48 ++-- templates/show_playlist_title.inc.php | 2 +- templates/show_playlists.inc.php | 32 +-- templates/show_playtype_switch.inc.php | 18 +- templates/show_plugins.inc.php | 46 +-- templates/show_popular.inc.php | 2 +- templates/show_preference_admin.inc.php | 34 +-- templates/show_preference_box.inc.php | 72 ++--- templates/show_preferences.inc.php | 22 +- templates/show_random.inc.php | 100 +++---- templates/show_random_albums.inc.php | 20 +- templates/show_recently_played.inc.php | 124 ++++----- templates/show_recommended_artists.inc.php | 42 +-- templates/show_registration_confirmation.inc.php | 2 +- templates/show_rename_artist.inc.php | 18 +- templates/show_rules.inc.php | 40 +-- templates/show_run_add_catalog.inc.php | 2 +- templates/show_search.inc.php | 28 +- templates/show_search_bar.inc.php | 20 +- templates/show_search_descriptor.inc.php | 24 +- templates/show_search_options.inc.php | 14 +- templates/show_shout_row.inc.php | 16 +- templates/show_shoutbox.inc.php | 22 +- templates/show_smartplaylist.inc.php | 44 +-- templates/show_smartplaylist_row.inc.php | 12 +- templates/show_smartplaylist_title.inc.php | 2 +- templates/show_smartplaylists.inc.php | 26 +- templates/show_song.inc.php | 26 +- templates/show_song_row.inc.php | 36 +-- templates/show_songs.inc.php | 48 ++-- templates/show_stats.inc.php | 34 +-- templates/show_stats_newest.inc.php | 2 +- templates/show_stats_popular.inc.php | 2 +- templates/show_tagcloud.inc.php | 6 +- templates/show_test.inc.php | 338 +++++++++++------------ templates/show_test_config.inc.php | 6 +- templates/show_update_items.inc.php | 2 +- templates/show_user.inc.php | 58 ++-- templates/show_user_activate.inc.php | 10 +- templates/show_user_preferences.inc.php | 26 +- templates/show_user_recommendations.inc.php | 68 ++--- templates/show_user_registration.inc.php | 40 +-- templates/show_user_row.inc.php | 68 ++--- templates/show_user_stats.inc.php | 72 ++--- templates/show_users.inc.php | 30 +- templates/show_verify_catalog.inc.php | 2 +- templates/show_video_row.inc.php | 6 +- templates/show_videos.inc.php | 36 +-- templates/show_xspf_player.inc.php | 24 +- templates/sidebar.inc.php | 32 +-- templates/sidebar_admin.inc.php | 4 +- templates/sidebar_home.inc.php | 12 +- templates/sidebar_localplay.inc.php | 48 ++-- templates/sidebar_modules.inc.php | 2 +- templates/sidebar_preferences.inc.php | 8 +- templates/subnavbar.inc.php | 18 +- 160 files changed, 3093 insertions(+), 3093 deletions(-) (limited to 'templates') diff --git a/templates/base.css b/templates/base.css index 89f207c7..cecf6c9f 100644 --- a/templates/base.css +++ b/templates/base.css @@ -1,4 +1,4 @@ -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -27,16 +27,16 @@ *****************/ .tag_size1 { - font-size:.6em; + font-size:.6em; } .tag_size2 { - font-size:.8em; + font-size:.8em; } .tag_size3 { - font-size:1em; + font-size:1em; } .tag_size4 { - font-size:1.2em; + font-size:1.2em; } a.tag_size1, a.tag_size2, a.tag_size3, a.tag_size4 { text-decoration: none; } @@ -48,8 +48,8 @@ a.tag_size1, a.tag_size2, a.tag_size3, a.tag_size4 { text-decoration: none; } * Generic / Misc *****************/ .item_on { - color: #347C17; + color: #347C17; } .item_off { - color: #FF0000; + color: #FF0000; } diff --git a/templates/browse_content.inc.php b/templates/browse_content.inc.php index 2b5fb94a..f1f5ea5d 100644 --- a/templates/browse_content.inc.php +++ b/templates/browse_content.inc.php @@ -1,5 +1,5 @@

-
- - + + +
- -
- id . '&key=min_count&value=1', '')); ?> + +
+ id . '&key=min_count&value=1', '')); ?> - -
- id . '&key=rated&value=1', '')); ?> + +
+ id . '&key=rated&value=1', '')); ?> - get_filter('unplayed') ? 'checked="checked"' : ''; ?>/> -
+ get_filter('unplayed') ? 'checked="checked"' : ''; ?>/> +
- get_filter('playlist_type') ? 'checked="checked"' : ''; ?>/> -
- id . '&key=playlist_type&value=1','')); ?> + get_filter('playlist_type') ? 'checked="checked"' : ''; ?>/> +
+ id . '&key=playlist_type&value=1','')); ?> - get_filter('object_type'); ${$string} = 'selected="selected"'; ?> - /> -
- id . '&type=song','')); ?> - -
- id . '&type=album','')); ?> - -
- id . '&type=artist','')); ?> + get_filter('object_type'); ${$string} = 'selected="selected"'; ?> + /> +
+ id . '&type=song','')); ?> + +
+ id . '&type=album','')); ?> + +
+ id . '&type=artist','')); ?>
-
- +
+ id,'catalog_select', 'catalog_choice'), true); ?>
-  /> - id, '')); ?> +  /> + id, '')); ?>
diff --git a/templates/error_page.inc.php b/templates/error_page.inc.php index 62cd63f5..cc4734bb 100644 --- a/templates/error_page.inc.php +++ b/templates/error_page.inc.php @@ -1,5 +1,5 @@ + xml:lang="" lang="" + dir=""> @@ -36,20 +36,20 @@
- -
 
-
- -

- :
- -
+ +
 
+
+ +

+ :
+ +
diff --git a/templates/footer.inc.php b/templates/footer.inc.php index 846fca78..4176884f 100644 --- a/templates/footer.inc.php +++ b/templates/footer.inc.php @@ -1,5 +1,5 @@ diff --git a/templates/header.inc.php b/templates/header.inc.php index a1deb402..803147c9 100644 --- a/templates/header.inc.php +++ b/templates/header.inc.php @@ -1,5 +1,5 @@
- - -
- -
+ + +
+ +
Loading . . .
has_access(100)) { ?>
- - + +
diff --git a/templates/install.css b/templates/install.css index 359dd0bf..ddc4e0e7 100644 --- a/templates/install.css +++ b/templates/install.css @@ -1,4 +1,4 @@ -/* vim:set tabstop=8 softtabstop=8 shiftwidth=8 noexpandtab: */ +/* vim:set softtabstop=4 shiftwidth=4 expandtab: */ /** * * LICENSE: GNU General Public License, version 2 (GPLv2) @@ -20,123 +20,123 @@ */ body { - font-family:Arial, Helvetica, sans-serif; - font-size: 1em; - margin: 0; - padding: 0; - text-align: center; - background: #FFFFFF url(../images/top_bg.jpg) repeat-x top left; + font-family:Arial, Helvetica, sans-serif; + font-size: 1em; + margin: 0; + padding: 0; + text-align: center; + background: #FFFFFF url(../images/top_bg.jpg) repeat-x top left; } h3 { - text-align:left; - border-bottom: 1px dotted #cccccc; - padding-left: 10px; + text-align:left; + border-bottom: 1px dotted #cccccc; + padding-left: 10px; } /* Header */ #header { - width: 90%; - min-height: 85px; - height: 85px; - margin: 0 auto; - padding: 0; - text-align: left; - font-size: smaller; - display: block; + width: 90%; + min-height: 85px; + height: 85px; + margin: 0 auto; + padding: 0; + text-align: left; + font-size: smaller; + display: block; } #header h1 { - margin: 0; - padding-top: 16px; - color: #000; - font-weight: bold; - font-size: large; + margin: 0; + padding-top: 16px; + color: #000; + font-weight: bold; + font-size: large; } #header p { - font-size: smaller; - color: #000; - margin: 0px; + font-size: smaller; + color: #000; + margin: 0px; } /* Content */ #text-box { - width: 90%; - min-height: 85px; - height: 85px; - display: block; - margin: 0 auto; - padding: 0; - text-align: left; - font-size: smaller; + width: 90%; + min-height: 85px; + height: 85px; + display: block; + margin: 0 auto; + padding: 0; + text-align: left; + font-size: smaller; } .error { - color: #ff0033; - font-weight: bold; + color: #ff0033; + font-weight: bold; } .notify { - border: 1px solid #cccccc; - background-color: #f4f4f4; - padding: 5px; - margin-top: 3px; + border: 1px solid #cccccc; + background-color: #f4f4f4; + padding: 5px; + margin-top: 3px; } .content { - border: 1px solid #cccccc; - padding: 5px; - margin-top: 3px; + border: 1px solid #cccccc; + padding: 5px; + margin-top: 3px; } /* Table style */ td{ - padding:5px; - /*background-color: #D9E0E8;*/ - font-size: smaller; + padding:5px; + /*background-color: #D9E0E8;*/ + font-size: smaller; } .align{ - text-align:right; + text-align:right; } /* Estilos para formas */ input, radio, select, textarea { - border: 1px solid #ddd; - background: #f2f2f2; - font: 11px verdana, sans-serif; - color: #443; - padding: 2px; - outline: none; + border: 1px solid #ddd; + background: #f2f2f2; + font: 11px verdana, sans-serif; + color: #443; + padding: 2px; + outline: none; } input:hover, textarea:hover, input:focus, textarea:focus{ - border: 1px solid #aaa; + border: 1px solid #aaa; } /* Extras */ .ok { - font-weight:bold; - color:#009900; - margin:10px 10px 10px 10px; + font-weight:bold; + color:#009900; + margin:10px 10px 10px 10px; } .notok { - font-weight:bold; - color:#FF3300; - margin:3px 3px 3px 3px; + font-weight:bold; + color:#FF3300; + margin:3px 3px 3px 3px; } /* Bottom */ #bottom { - border-top: 1px dotted #cccccc; - margin-top: 10px; - margin-bottom: 10px; - padding:5px; + border-top: 1px dotted #cccccc; + margin-top: 10px; + margin-bottom: 10px; + padding:5px; } #bottom p { - font-size:10px; + font-size:10px; } diff --git a/templates/install_header.inc.php b/templates/install_header.inc.php index c30417a7..8b5c6434 100644 --- a/templates/install_header.inc.php +++ b/templates/install_header.inc.php @@ -1,5 +1,5 @@ For the love of Music

-
-

-

- -

-
    -
    • +
    +

    +

    + +

    +
      +
      • -
    -

    +

+

-

+

diff --git a/templates/javascript_refresh.inc.php b/templates/javascript_refresh.inc.php index eacab776..aa28b3dc 100644 --- a/templates/javascript_refresh.inc.php +++ b/templates/javascript_refresh.inc.php @@ -1,5 +1,5 @@ get_offset(); -$start = $browse->get_start(); -$total = $browse->get_total(); -$uid = Config::get('list_header_uid'); +$limit = $browse->get_offset(); +$start = $browse->get_start(); +$total = $browse->get_total(); +$uid = Config::get('list_header_uid'); $sides = 5; // ++ the uid @@ -47,86 +47,86 @@ if ($prev_offset < 0) { $prev_offset = '0'; } /* Calculate how many pages total exist */ if ($limit > 0 && $total > $limit) { - $pages = ceil($total / $limit); + $pages = ceil($total / $limit); } else { - $pages = 0; + $pages = 0; } // are there enough items to even need this view? if ($pages > 1) { - /* Calculate current page and how many we have on each side */ - $page_data = array('up' => array(), 'down' => array()); + /* Calculate current page and how many we have on each side */ + $page_data = array('up' => array(), 'down' => array()); - // Can't divide by 0 - if ($start > 0) { - $current_page = floor($start / $limit); - } - else { - $current_page = 0; - } + // Can't divide by 0 + if ($start > 0) { + $current_page = floor($start / $limit); + } + else { + $current_page = 0; + } - // Create 10 pages in either direction - // Down first - $page = $current_page; - $i = 0; - while ($page > 0) { - if ($i == $sides) { $page_data['down'][1] = '...'; $page_data['down'][0] = '0'; break; } - $i++; - $page = $page - 1; - $page_data['down'][$page] = $page * $limit; - } // while page > 0 + // Create 10 pages in either direction + // Down first + $page = $current_page; + $i = 0; + while ($page > 0) { + if ($i == $sides) { $page_data['down'][1] = '...'; $page_data['down'][0] = '0'; break; } + $i++; + $page = $page - 1; + $page_data['down'][$page] = $page * $limit; + } // while page > 0 - // Then up - $page = $current_page + 1; - $i = 0; - while ($page <= $pages) { - if ($page * $limit > $total) { break; } - if ($i == $sides) { - $key = $pages - 1; - if (!$page_data['up'][$key]) { $page_data['up'][$key] = '...'; } - $page_data['up'][$pages] = ($pages - 1) * $limit; - break; - } - $i++; - $page = $page + 1; - $page_data['up'][$page] = ($page - 1) * $limit; - } // end while + // Then up + $page = $current_page + 1; + $i = 0; + while ($page <= $pages) { + if ($page * $limit > $total) { break; } + if ($i == $sides) { + $key = $pages - 1; + if (!$page_data['up'][$key]) { $page_data['up'][$key] = '...'; } + $page_data['up'][$pages] = ($pages - 1) * $limit; + break; + } + $i++; + $page = $page + 1; + $page_data['up'][$page] = ($page - 1) * $limit; + } // end while - // Sort these arrays of hotness - ksort($page_data['up']); - ksort($page_data['down']); + // Sort these arrays of hotness + ksort($page_data['up']); + ksort($page_data['down']); ?>
id . '&start=' . $prev_offset, T_('Prev'),'browse_' . $uid . 'prev','','prev'); ?> - id . '&start=' . $next_offset, T_('Next'),'browse_' . $uid . 'next','','next'); ?> - $offset) { - if ($offset === '...') { echo '... '; } - else { - // Hack Alert - $page++; - echo Ajax::text('?page=browse&action=page&browse_id=' . $browse->id . '&start=' . $offset,$page,'browse_' . $uid . 'page_' . $page,'','page-nb'); - } - } // end foreach down + id . '&start=' . $next_offset, T_('Next'),'browse_' . $uid . 'next','','next'); ?> + $offset) { + if ($offset === '...') { echo '... '; } + else { + // Hack Alert + $page++; + echo Ajax::text('?page=browse&action=page&browse_id=' . $browse->id . '&start=' . $offset,$page,'browse_' . $uid . 'page_' . $page,'','page-nb'); + } + } // end foreach down - /* Echo current page */ - $current_page++; - ?> - - + + $offset) { - if ($offset === '...') { echo '... '; } - else { - echo Ajax::text('?page=browse&action=page&browse_id=' . $browse->id . '&start=' . $offset,$page,'browse_' . $uid . 'page_' . $page,'','page-nb'); - } // end else - } // end foreach up - ?> + /* Echo everything above us */ + foreach ($page_data['up'] as $page=>$offset) { + if ($offset === '...') { echo '... '; } + else { + echo Ajax::text('?page=browse&action=page&browse_id=' . $browse->id . '&start=' . $offset,$page,'browse_' . $uid . 'page_' . $page,'','page-nb'); + } // end else + } // end foreach up + ?>
    -
  • - -
    • -
  • - - -
    • +
  • + +
    • +
  • + + +
    • -
  • - - +
  • + + -
    • + -
  • - -
    • -
  • - - -
    • +
  • + +
    • +
  • + + +
    playlist->get_items(); - } + //FIXME :: this is kludgy + if (!defined('NO_SONGS')) { + $objects = $GLOBALS['user']->playlist->get_items(); + } - // Limit the number of objects we show here - if (count($objects) > 100) { - $truncated = (count($objects) - 100); - $objects = array_slice($objects, 0, 100, true); - } + // Limit the number of objects we show here + if (count($objects) > 100) { + $truncated = (count($objects) - 100); + $objects = array_slice($objects, 0, 100, true); + } - $normal_array = array('radio','song','video','random'); + $normal_array = array('radio','song','video','random'); - foreach ($objects as $uid=>$object_data) { - $type = array_shift($object_data); - if (in_array($type,$normal_array)) { - $object = new $type(array_shift($object_data)); - $object->format(); - } - if ($type == 'random') { - $object->f_link = Random::get_type_name($type); - } + foreach ($objects as $uid=>$object_data) { + $type = array_shift($object_data); + if (in_array($type,$normal_array)) { + $object = new $type(array_shift($object_data)); + $object->format(); + } + if ($type == 'random') { + $object->f_link = Random::get_type_name($type); + } ?>
  • f_link; ?> - +
    • -
    • +
    • -
  • - ... -
    • +
  • + ... +
@@ -121,6 +121,6 @@ // We do this last because we want it to load, and we want to know if there is anything // to even pass if (count($objects)) { - Stream::run_playlist_method(); + Stream::run_playlist_method(); } ?> diff --git a/templates/show_access_list.inc.php b/templates/show_access_list.inc.php index 2973e01c..c724779b 100644 --- a/templates/show_access_list.inc.php +++ b/templates/show_access_list.inc.php @@ -1,5 +1,5 @@
    -
  • - - -
    • -
  • - - -
    • -
  • - - -
  • - - -
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
  • + + +
@@ -47,33 +47,33 @@ - - - - - - - + + + + + + + format(); + /* Start foreach List Item */ + foreach ($list as $access_id) { + $access = new Access($access_id); + $access->format(); ?> - - - - - - - + + + + + + + - +
name); ?>f_start; ?>f_end; ?>f_level; ?>f_user; ?>f_type; ?> - - - name); ?>f_start; ?>f_end; ?>f_level; ?>f_user; ?>f_type; ?> + + +
diff --git a/templates/show_account.inc.php b/templates/show_account.inc.php index 84b8ecf4..0cf951f8 100644 --- a/templates/show_account.inc.php +++ b/templates/show_account.inc.php @@ -1,5 +1,5 @@ /preferences.php?action=update_user" enctype="multipart/form-data"> - - + + - - + + - - + + - - + + - - + +
: - - : + +
: - - : + +
: - - - : + + +
: - - : + +
: - - : + +
- - - - + + + +
diff --git a/templates/show_add_access.inc.php b/templates/show_add_access.inc.php index 9e030ccc..b2d03531 100644 --- a/templates/show_add_access.inc.php +++ b/templates/show_add_access.inc.php @@ -1,5 +1,5 @@ /admin/access.php?action=add_host"> - - + + - - + + - - + + + + - + - - - - + + + +
: - - : + +
: - - - - - : + + + + +
: - - : + +
: - - + - + - - - - + -

- (255.255.255.255) / (ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff) -

+ (255.255.255.255) / (ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff) +
: - - - : - - - : + + + : + + +
- - + +
diff --git a/templates/show_add_catalog.inc.php b/templates/show_add_catalog.inc.php index 7a3049f7..28f01414 100644 --- a/templates/show_add_catalog.inc.php +++ b/templates/show_add_catalog.inc.php @@ -1,5 +1,5 @@ /admin/catalog.php" enctype="multipart/form-data"> - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + +
: - :
- %A =
- %a =
- %c =
- %T =
- %t =
- %y =
- %o =
- 		: + :
+ %A =
+ %a =
+ %c =
+ %T =
+ %t =
+ %y =
+ %o =
+
: :
: - - : + +
: *: *
: *: *
: :
:
:
::
::
diff --git a/templates/show_add_live_stream.inc.php b/templates/show_add_live_stream.inc.php index ef7402ed..37a0b8a3 100644 --- a/templates/show_add_live_stream.inc.php +++ b/templates/show_add_live_stream.inc.php @@ -1,5 +1,5 @@ /radio.php?action=create"> - - + + - - + + - - + + - - + + - - + + - - + +
- - - + + +
- - - + + +
- - - + + +
- - + +
- - + +
- - + +
- - + +
diff --git a/templates/show_add_playlist.inc.php b/templates/show_add_playlist.inc.php index 2a1239b4..9ad0f429 100644 --- a/templates/show_add_playlist.inc.php +++ b/templates/show_add_playlist.inc.php @@ -1,5 +1,5 @@ /playlist.php"> - - + + - - + +
::
: - - : + +
- - + +
diff --git a/templates/show_add_shout.inc.php b/templates/show_add_shout.inc.php index 739b1571..65314084 100644 --- a/templates/show_add_shout.inc.php +++ b/templates/show_add_shout.inc.php @@ -1,5 +1,5 @@ /shout.php?action=add_shout"> - - + - + - +
+
- - - - - + + + + +
diff --git a/templates/show_add_user.inc.php b/templates/show_add_user.inc.php index d42988cd..56d6461f 100644 --- a/templates/show_add_user.inc.php +++ b/templates/show_add_user.inc.php @@ -1,5 +1,5 @@ "> - - + + - - + + - - + + - - + + - - + + - +
- : - - - - + : + + + +
: - - : + +
- : - - - + : + + +
- : - - - - + : + + + +
- : - - - + : + + +
- : - + : + access; ${$var_name} = 'selected="selected"'; ?>
- - + +
diff --git a/templates/show_adds_catalog.inc.php b/templates/show_adds_catalog.inc.php index a1ddf4d9..7fb04e32 100644 --- a/templates/show_adds_catalog.inc.php +++ b/templates/show_adds_catalog.inc.php @@ -1,5 +1,5 @@ - + -   - -
- ... -
+   + +
+ ... +
diff --git a/templates/show_admin_tools.inc.php b/templates/show_admin_tools.inc.php index 0df0be23..6bff2878 100644 --- a/templates/show_admin_tools.inc.php +++ b/templates/show_admin_tools.inc.php @@ -1,5 +1,5 @@ @@ -31,48 +31,48 @@ $catalogs = Catalog::get_catalogs(); - - + + - - - name); ?> -   (path); ?>) - - - -  |  - -  |  - -  |  - -  |  - - - + + + name); ?> +   (path); ?>) + + + +  |  + +  |  + +  |  + +  |  + + + - - - + + + - - + +
@@ -88,12 +88,12 @@ $catalogs = Catalog::get_catalogs();
- - - - - - - + + + + + + +
diff --git a/templates/show_album.inc.php b/templates/show_album.inc.php index 449203ba..b987bf5b 100644 --- a/templates/show_album.inc.php +++ b/templates/show_album.inc.php @@ -1,5 +1,5 @@ name) . ' (' . $album->year . ')'; if ($album->disk) { - $title .= "disk . "\">, " . T_('Disk') . " " . $album->disk . ""; + $title .= "disk . "\">, " . T_('Disk') . " " . $album->disk . ""; } $title .= ' - ' . $album->f_artist_link; ?>
- name != T_('Unknown (Orphaned)')) { + name != T_('Unknown (Orphaned)')) { $name = '[' . $album->f_artist . '] ' . scrub_out($album->full_name); - $aa_url = $web_path . "/image.php?id=" . $album->id . "&type=popup&sid=" . session_id(); - echo ""; - echo "\"".$name."\""; - echo "\n"; - } - ?> + $aa_url = $web_path . "/image.php?id=" . $album->id . "&type=popup&sid=" . session_id(); + echo ""; + echo "\"".$name."\""; + echo "\n"; + } + ?>
- id,'album'); ?> + id,'album'); ?>

:

    -
  • - id,'add', T_('Add'),'play_full_' . $album->id); ?> - id, T_('Add Album'), 'play_full_text_' . $album->id); ?> -
    • -
  • - id,'random', T_('Random'),'play_random_' . $album->id); ?> - id, T_('Add Random from Album'), 'play_random_text_' . $album->id); ?> -
    • - -
  • - - -
    • - -
  • - - -
    • - -
  • - - -
    • - - -
  • - - -
    • - +
  • + id,'add', T_('Add'),'play_full_' . $album->id); ?> + id, T_('Add Album'), 'play_full_text_' . $album->id); ?> +
    • +
  • + id,'random', T_('Random'),'play_random_' . $album->id); ?> + id, T_('Add Random from Album'), 'play_random_text_' . $album->id); ?> +
    • + +
  • + + +
    • + +
  • + + +
    • + +
  • + + +
    • + + +
  • + + +
    • +
@@ -85,12 +85,12 @@ $title .= ' - ' . $album->f_artist_link;  
set_type('song'); - $browse->set_simple_browse(true); - $browse->set_filter('album', $album->id); - $browse->set_sort('track', 'ASC'); - $browse->get_objects(); - $browse->show_objects(); - $browse->store(); + $browse = new Browse(); + $browse->set_type('song'); + $browse->set_simple_browse(true); + $browse->set_filter('album', $album->id); + $browse->set_sort('track', 'ASC'); + $browse->get_objects(); + $browse->show_objects(); + $browse->store(); ?> diff --git a/templates/show_album_art.inc.php b/templates/show_album_art.inc.php index 838bf5fb..1ff7fefc 100644 --- a/templates/show_album_art.inc.php +++ b/templates/show_album_art.inc.php @@ -1,5 +1,5 @@  \n"; } - else { + $j=0; + while ($j < 4) { + $key = $i*4+$j; + $image_url = Config::get('web_path') . '/image.php?type=session&image_index=' . $key; + $dimensions = Core::image_dimensions(Art::get_from_source($_SESSION['form']['images'][$key], 'album')); + if (!isset($images[$key])) { echo " \n"; } + else { ?> - - <?php echo T_('Album Art'); ?> -
-

- - [x] - - - - [] -

- + + <?php echo T_('Album Art'); ?> +
+

+ + [x] + + + + [] +

+ \n"; } + } // end else + $j++; + } // end while cells + if($i < $rows) { echo "\n"; } else { echo ""; } - $i++; + $i++; } // end while ?> diff --git a/templates/show_album_row.inc.php b/templates/show_album_row.inc.php index db6ce30b..1d3782de 100644 --- a/templates/show_album_row.inc.php +++ b/templates/show_album_row.inc.php @@ -1,5 +1,5 @@ - id,'add', T_('Add'),'add_album_' . $album->id); ?> - id,'random', T_('Random'),'random_album_' . $album->id); ?> + id,'add', T_('Add'),'add_album_' . $album->id); ?> + id,'random', T_('Random'),'random_album_' . $album->id); ?> f_artist . '] ' . scrub_out($album->full_name); + $name = '[' . $album->f_artist . '] ' . scrub_out($album->full_name); ?> - <?php echo($name) ?> + <?php echo($name) ?> @@ -41,17 +41,17 @@ if (Art::is_enabled()) { f_tags; ?> id,'album'); ?> - - - - - - - - - - - - id,'edit', T_('Edit'),'edit_album_' . $album->id); ?> - + + + + + + + + + + + + id,'edit', T_('Edit'),'edit_album_' . $album->id); ?> + diff --git a/templates/show_albums.inc.php b/templates/show_albums.inc.php index a9727634..41d5ccb0 100644 --- a/templates/show_albums.inc.php +++ b/templates/show_albums.inc.php @@ -1,5 +1,5 @@ - - - - - id . '&sort=name', T_('Album'),'album_sort_name'); ?> - id . '&sort=artist', T_('Artist'),'album_sort_artist'); ?> - - id . '&sort=year', T_('Year'),'album_sort_year'); ?> - - - + + + + + id . '&sort=name', T_('Album'),'album_sort_name'); ?> + id . '&sort=artist', T_('Artist'),'album_sort_artist'); ?> + + id . '&sort=year', T_('Year'),'album_sort_year'); ?> + + + format(); + if (Config::get('ratings')) { + Rating::build_cache('album',$object_ids); + } + /* Foreach through the albums */ + foreach ($object_ids as $album_id) { + $album = new Album($album_id); + $album->format(); ?> - + - + - - - - - id . '&sort=name', T_('Album'),'album_sort_name_bottom'); ?> - - - id . '&sort=year', T_('Year'),'album_sort_year_bottom'); ?> - - - + + + + + id . '&sort=name', T_('Album'),'album_sort_name_bottom'); ?> + + + id . '&sort=year', T_('Year'),'album_sort_year_bottom'); ?> + + + diff --git a/templates/show_all_popular.inc.php b/templates/show_all_popular.inc.php index 8f1b4119..ea05b14b 100644 --- a/templates/show_all_popular.inc.php +++ b/templates/show_all_popular.inc.php @@ -1,5 +1,5 @@ - - - + + + - - - + + +
- - - - - - + + + + + +
 
- - - - - - + + + + + +
 
diff --git a/templates/show_alphabet_form.inc.php b/templates/show_alphabet_form.inc.php index 0efcdc9b..e1d08658 100644 --- a/templates/show_alphabet_form.inc.php +++ b/templates/show_alphabet_form.inc.php @@ -1,5 +1,5 @@
" enctype="multipart/form-data"> - - - + + +
diff --git a/templates/show_artist.inc.php b/templates/show_artist.inc.php index aa26d52d..7bf95c56 100644 --- a/templates/show_artist.inc.php +++ b/templates/show_artist.inc.php @@ -1,5 +1,5 @@ f_name, 'info-box'); if (Config::get('ratings')) { ?>
- id, 'artist'); ?> + id, 'artist'); ?>

:

  • - - - - f_name); ?> - - - - f_name); ?> - + + + + f_name); ?> + + + + f_name); ?> +
  • - - id,'add', T_('Add'),'add_' . $artist->id); ?> - id,sprintf(T_('Add All Songs By %s'), $artist->f_name),'add_text_' . $artist->id); ?> + + id,'add', T_('Add'),'add_' . $artist->id); ?> + id,sprintf(T_('Add All Songs By %s'), $artist->f_name),'add_text_' . $artist->id); ?>
  • - - id,'random', T_('Random'),'random_' . $artist->id); ?> - id, sprintf(T_('Add Random Songs By %s'), $artist->f_name),'random_text_' . $artist->id); ?> + + id,'random', T_('Random'),'random_' . $artist->id); ?> + id, sprintf(T_('Add Random Songs By %s'), $artist->f_name),'random_text_' . $artist->id); ?>
  • - - + +
  • - - + +
  • @@ -75,6 +75,6 @@ if (Config::get('ratings')) {
show_objects($object_ids); - $browse->store(); + $browse->show_objects($object_ids); + $browse->store(); ?> diff --git a/templates/show_artist_row.inc.php b/templates/show_artist_row.inc.php index f7612c1e..295d2e85 100644 --- a/templates/show_artist_row.inc.php +++ b/templates/show_artist_row.inc.php @@ -1,5 +1,5 @@ - id,'add', T_('Add'),'add_artist_' . $artist->id); ?> - id,'random', T_('Random'),'random_artist_' . $artist->id); ?> + id,'add', T_('Add'),'add_artist_' . $artist->id); ?> + id,'random', T_('Random'),'random_artist_' . $artist->id); ?> f_name_link; ?> songs; ?> @@ -32,11 +32,11 @@ id,'artist'); ?> - - + + - id,'edit', T_('Edit'),'edit_artist_' . $artist->id); ?> + id,'edit', T_('Edit'),'edit_artist_' . $artist->id); ?> diff --git a/templates/show_artists.inc.php b/templates/show_artists.inc.php index 36d9b01e..0a3b664b 100644 --- a/templates/show_artists.inc.php +++ b/templates/show_artists.inc.php @@ -1,5 +1,5 @@ - - - - - - - - + + + + + + + + format(); + $artist = new Artist($artist_id, $_SESSION['catalog']); + $artist->format(); ?> - + - + - - - - - - - - + + + + + + + + diff --git a/templates/show_big_art.inc.php b/templates/show_big_art.inc.php index 08fdb72f..c969ff6c 100644 --- a/templates/show_big_art.inc.php +++ b/templates/show_big_art.inc.php @@ -1,5 +1,5 @@
-

- +

+
diff --git a/templates/show_catalog_row.inc.php b/templates/show_catalog_row.inc.php index 7aef9d27..189e9934 100644 --- a/templates/show_catalog_row.inc.php +++ b/templates/show_catalog_row.inc.php @@ -1,5 +1,5 @@ f_add); ?> f_clean); ?> - - | + + | | - | - | - | + | + | + | diff --git a/templates/show_catalogs.inc.php b/templates/show_catalogs.inc.php index c9f8cedd..86ab877e 100644 --- a/templates/show_catalogs.inc.php +++ b/templates/show_catalogs.inc.php @@ -1,5 +1,5 @@ - - - - - - + + + + + + format(); + foreach ($object_ids as $catalog_id) { + $catalog = new Catalog($catalog_id); + $catalog->format(); ?> - + - + - - - - - - + + + + + + diff --git a/templates/show_clean_catalog.inc.php b/templates/show_clean_catalog.inc.php index f3f26464..07fdf145 100644 --- a/templates/show_clean_catalog.inc.php +++ b/templates/show_clean_catalog.inc.php @@ -1,5 +1,5 @@
-
- - -
+
+ + +
-
- - -
+
+ + +
diff --git a/templates/show_create_democratic.inc.php b/templates/show_create_democratic.inc.php index ec829416..8ec5396a 100644 --- a/templates/show_create_democratic.inc.php +++ b/templates/show_create_democratic.inc.php @@ -1,5 +1,5 @@
- - + + - - + + - - + + - - + +
base_playlist); ?>base_playlist); ?>
- - + +
diff --git a/templates/show_debug.inc.php b/templates/show_debug.inc.php index 369774eb..3669fb2a 100644 --- a/templates/show_debug.inc.php +++ b/templates/show_debug.inc.php @@ -1,5 +1,5 @@
  • - - + +
  • - - + +
@@ -37,48 +37,48 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + +
Open BasedirOpen Basedir
@@ -90,25 +90,25 @@ - - + + $value) { - if ($key == 'database_password' || $key == 'mysql_password') { $value = '*********'; } - if (is_array($value)) { - $string = ''; - foreach ($value as $setting) { - $string .= $setting . '
'; - } - $value = $string; - } - if (Preference::is_boolean($key)) { - $value = print_bool($value); - } + if ($key == 'database_password' || $key == 'mysql_password') { $value = '*********'; } + if (is_array($value)) { + $string = ''; + foreach ($value as $setting) { + $string .= $setting . '
'; + } + $value = $string; + } + if (Preference::is_boolean($key)) { + $value = print_bool($value); + } ?> - - + + diff --git a/templates/show_democratic.inc.php b/templates/show_democratic.inc.php index ed951c06..c3c8be18 100644 --- a/templates/show_democratic.inc.php +++ b/templates/show_democratic.inc.php @@ -1,5 +1,5 @@ is_enabled()) { ?>
  • - :f_cooldown; ?> + :f_cooldown; ?>
  • - - + +
    • is_enabled()) { ?>
  • - id),'all', T_('Play'),'play_democratic'); ?> - + id),'all', T_('Play'),'play_democratic'); ?> +
  • - id),'delete', T_('Clear Playlist'),'clear_democratic'); ?> - + id),'delete', T_('Clear Playlist'),'clear_democratic'); ?> +
    • diff --git a/templates/show_democratic_playlist.inc.php b/templates/show_democratic_playlist.inc.php index 49dd889e..1ce5bda6 100644 --- a/templates/show_democratic_playlist.inc.php +++ b/templates/show_democratic_playlist.inc.php @@ -1,5 +1,5 @@ base_playlist); + $playlist = new Playlist($democratic->base_playlist); ?> - : - - name); ?> - + : + + name); ?> + - - - - - - - - - + + + + + + + + + set_parent(); foreach($object_ids as $item) { - $media = new $item['object_type']($item['object_id']); - $media->format(); + $media = new $item['object_type']($item['object_id']); + $media->format(); ?> - - has_vote($item['object_id'], $item['object_type'])) { ?> - - - id . '&type=' . scrub_out($item['object_type']),'tick', T_('Add Vote'),'remove_vote_' . $item['id']); ?> - - - get_vote($item['id'])); ?> - f_link; ?> - f_album_link; ?> - f_artist_link; ?> - f_time; ?> - - - - - + + has_vote($item['object_id'], $item['object_type'])) { ?> + + + id . '&type=' . scrub_out($item['object_type']),'tick', T_('Add Vote'),'remove_vote_' . $item['id']); ?> + + + get_vote($item['id'])); ?> + f_link; ?> + f_album_link; ?> + f_artist_link; ?> + f_time; ?> + + + + + - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + - - - title; ?> - get_album_name($song->album); ?> - get_artist_name($song->album); ?> - file; ?> - addition_time); ?> + + + title; ?> + get_album_name($song->album); ?> + get_artist_name($song->album); ?> + file; ?> + addition_time); ?> - + - - - + + + - - - - - - + + + + + +
    -    - +    +
    diff --git a/templates/show_duplicate.inc.php b/templates/show_duplicate.inc.php index bc5435f2..85cd3379 100644 --- a/templates/show_duplicate.inc.php +++ b/templates/show_duplicate.inc.php @@ -1,5 +1,5 @@ /admin/duplicates.php?action=find_duplicates" method="post" enctype="multipart/form-data" > - + +
    :: - - />
    + + />
    />
    />
    />
    -
    diff --git a/templates/show_duplicates.inc.php b/templates/show_duplicates.inc.php index 6a62e19c..8bd9cbda 100644 --- a/templates/show_duplicates.inc.php +++ b/templates/show_duplicates.inc.php @@ -1,5 +1,5 @@ - - - - - - - - + + + + + + + + $song_id) { - $song = new Song($song_id); - $song->format(); - $row_key = 'duplicate_' . $song_id; - $button_flip_state_id = 'button_flip_state_' . $song_id; - $current_class = ($key == '0') ? 'row-highlight' : UI::flip_class(); - $button = $song->enabled ? 'disable' : 'enable'; - ?> + foreach ($songs as $key => $song_id) { + $song = new Song($song_id); + $song->format(); + $row_key = 'duplicate_' . $song_id; + $button_flip_state_id = 'button_flip_state_' . $song_id; + $current_class = ($key == '0') ? 'row-highlight' : UI::flip_class(); + $button = $song->enabled ? 'disable' : 'enable'; + ?> - - - - f_link; ?> - f_artist_link; ?> - f_album_link; ?> - f_time; ?> - f_bitrate; ?> - f_size; ?> - file); ?> + + + + f_link; ?> + f_artist_link; ?> + f_album_link; ?> + f_time; ?> + f_bitrate; ?> + f_size; ?> + file); ?> - - - - - - - - + + + + + + + + diff --git a/templates/show_dynamic.inc.php b/templates/show_dynamic.inc.php index 67173b97..65e411e7 100644 --- a/templates/show_dynamic.inc.php +++ b/templates/show_dynamic.inc.php @@ -1,5 +1,5 @@ - - - - + + + + - - - - + + + + - - - - + + + + - - - + + + - +
    - - - - - - - - + + + + + + + +
    - - - - - - + + + + + +
    -
    -     		+
    +
    diff --git a/templates/show_edit_access.inc.php b/templates/show_edit_access.inc.php index 88cdae60..b9a2e6f3 100644 --- a/templates/show_edit_access.inc.php +++ b/templates/show_edit_access.inc.php @@ -1,5 +1,5 @@ /admin/access.php?action=update_record&access_id=id); ?>"> - - + + - + - - - - + + + + - - + + - - + +
    : :
    : :
    : - - - : - - - : + + + : + + +
    : - user); ?> - : + user); ?> +
    : - level; ${$name} = 'checked="checked"'; ?> - > - > - > - > - : + level; ${$name} = 'checked="checked"'; ?> + > + > + > + > +
    - - + +
    diff --git a/templates/show_edit_album.inc.php b/templates/show_edit_album.inc.php index 6895bd1f..e1a40334 100644 --- a/templates/show_edit_album.inc.php +++ b/templates/show_edit_album.inc.php @@ -1,5 +1,5 @@ /admin/flag.php?action=edit_album"> - - + + - - + + - - + +
    - - + +
    - - + +
      - -   + +
    - - + +
    diff --git a/templates/show_edit_album_row.inc.php b/templates/show_edit_album_row.inc.php index e0330e22..3ea037d8 100644 --- a/templates/show_edit_album_row.inc.php +++ b/templates/show_edit_album_row.inc.php @@ -1,5 +1,5 @@ - + - artist_count == '1') { - show_artist_select('artist',$album->artist_id); - } - else { - echo T_('Various'); - } - ?> + artist_count == '1') { + show_artist_select('artist',$album->artist_id); + } + else { + echo T_('Various'); + } + ?> - + - + - - - id . '&type=album_row','download', T_('Save Changes'),'save_album_' . $album->id,'edit_album_' . $album->id); ?> + + + id . '&type=album_row','download', T_('Save Changes'),'save_album_' . $album->id,'edit_album_' . $album->id); ?> diff --git a/templates/show_edit_artist.inc.php b/templates/show_edit_artist.inc.php index 14bb89fe..5fc2f383 100644 --- a/templates/show_edit_artist.inc.php +++ b/templates/show_edit_artist.inc.php @@ -1,5 +1,5 @@ /admin/flag.php?action=edit_artist"> - - + + - - + +
    - - + +
      - -   + +
    - - + +
    diff --git a/templates/show_edit_artist_row.inc.php b/templates/show_edit_artist_row.inc.php index 97424f91..2c52d59f 100644 --- a/templates/show_edit_artist_row.inc.php +++ b/templates/show_edit_artist_row.inc.php @@ -1,5 +1,5 @@ - + - - - id . '&type=artist_row','download', T_('Save Changes'),'save_artist_' . $artist->id,'edit_artist_' . $artist->id); ?> + + + id . '&type=artist_row','download', T_('Save Changes'),'save_artist_' . $artist->id,'edit_artist_' . $artist->id); ?> diff --git a/templates/show_edit_catalog.inc.php b/templates/show_edit_catalog.inc.php index c7d5752e..7a6e6b85 100644 --- a/templates/show_edit_catalog.inc.php +++ b/templates/show_edit_catalog.inc.php @@ -1,5 +1,5 @@ name . ' (' . $catalo
    - - - + + + - - + + @@ -51,24 +51,24 @@ UI::show_box_top(sprintf(T_('Settings for %s') , $catalog->name . ' (' . $catalo - - + + - - + +
    : - :
    - %A=
    - %a=
    - %c=
    - %T=
    - %t=
    - %y=
    - %o=
    -     		: + :
    + %A=
    + %a=
    + %c=
    + %T=
    + %t=
    + %y=
    + %o=
    +
    catalog_type)); ?>catalog_type)); ?>
    : *
    : - - : + +
    - :
    -     		- - + :
    +     		+ +
    - - - + + +
    diff --git a/templates/show_edit_live_stream_row.inc.php b/templates/show_edit_live_stream_row.inc.php index 51e076c9..d44e5605 100644 --- a/templates/show_edit_live_stream_row.inc.php +++ b/templates/show_edit_live_stream_row.inc.php @@ -1,5 +1,5 @@ id; ?>"> - - - - - - + + + + + +
      
    - + - + - + - + - + - - - id . '&type=live_stream_row','download', T_('Save Changes'),'save_live_stream_' . $radio->id,'edit_live_stream_' . $radio->id); ?> + + + id . '&type=live_stream_row','download', T_('Save Changes'),'save_live_stream_' . $radio->id,'edit_live_stream_' . $radio->id); ?>
    diff --git a/templates/show_edit_playlist_row.inc.php b/templates/show_edit_playlist_row.inc.php index 9728f05a..0c587efe 100644 --- a/templates/show_edit_playlist_row.inc.php +++ b/templates/show_edit_playlist_row.inc.php @@ -1,5 +1,5 @@ id; ?>" action="javascript:void(0);"> - - + +
    - - - type; ${$name} = ' selected="selected"'; ?> - - - - - id . '&type=playlist_row','download', T_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> - + + + type; ${$name} = ' selected="selected"'; ?> + + + + + id . '&type=playlist_row','download', T_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> +
    diff --git a/templates/show_edit_playlist_song_row.inc.php b/templates/show_edit_playlist_song_row.inc.php index f5efe593..edaba2a0 100644 --- a/templates/show_edit_playlist_song_row.inc.php +++ b/templates/show_edit_playlist_song_row.inc.php @@ -1,5 +1,5 @@ - + f_link; ?> f_artist_link; ?> @@ -34,9 +34,9 @@ f_track; ?> f_time; ?> - - - id . '&track_id=' . $track['id'],'download', T_('Save Changes'),'save_track_' . $track['id'],'edit_track_' . $track['id']); ?> + + + id . '&track_id=' . $track['id'],'download', T_('Save Changes'),'save_track_' . $track['id'],'edit_track_' . $track['id']); ?> diff --git a/templates/show_edit_playlist_title.inc.php b/templates/show_edit_playlist_title.inc.php index 475a882e..07707c11 100644 --- a/templates/show_edit_playlist_title.inc.php +++ b/templates/show_edit_playlist_title.inc.php @@ -1,5 +1,5 @@ id; ?>" action="javascript:void(0);"> - - + +
    - - - type; ${$name} = ' selected="selected"'; ?> - - - - - id . '&type=playlist_title','download', T_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> - + + + type; ${$name} = ' selected="selected"'; ?> + + + + + id . '&type=playlist_title','download', T_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> +
    diff --git a/templates/show_edit_shout.inc.php b/templates/show_edit_shout.inc.php index c20fee9b..eb4b376d 100644 --- a/templates/show_edit_shout.inc.php +++ b/templates/show_edit_shout.inc.php @@ -1,5 +1,5 @@ id; ?>" /> - - - + - + - +
    f_link, $object->f_link); ?> + f_link, $object->f_link); ?>
    +
    sticky == "1") { echo "checked"; } ?>/> sticky == "1") { echo "checked"; } ?>/>
    - - + +
    diff --git a/templates/show_edit_smartplaylist_row.inc.php b/templates/show_edit_smartplaylist_row.inc.php index 08feb912..d366182a 100644 --- a/templates/show_edit_smartplaylist_row.inc.php +++ b/templates/show_edit_smartplaylist_row.inc.php @@ -1,5 +1,5 @@ id; ?>" action="javascript:void(0);"> - - + +
    - - - type; ${$name} = ' selected="selected"'; ?> - - - - - id . '&type=smartplaylist_row','download', T_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> - + + + type; ${$name} = ' selected="selected"'; ?> + + + + + id . '&type=smartplaylist_row','download', T_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> +
    diff --git a/templates/show_edit_smartplaylist_title.inc.php b/templates/show_edit_smartplaylist_title.inc.php index f036235d..b7432eb0 100644 --- a/templates/show_edit_smartplaylist_title.inc.php +++ b/templates/show_edit_smartplaylist_title.inc.php @@ -1,5 +1,5 @@ id; ?>" action="javascript:void(0);"> - - + +
    - - - type; ${$name} = ' selected="selected"'; ?> - - - - - id . '&type=smartplaylist_title','download', T_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> - + + + type; ${$name} = ' selected="selected"'; ?> + + + + + id . '&type=smartplaylist_title','download', T_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> +
    diff --git a/templates/show_edit_song.inc.php b/templates/show_edit_song.inc.php index 95c427cc..d6793963 100644 --- a/templates/show_edit_song.inc.php +++ b/templates/show_edit_song.inc.php @@ -1,5 +1,5 @@ /admin/flag.php"> - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + +
    :file); ?>:file); ?>
    - - + +
    - album); ?> -

    - -     		+ album); ?> +

    + +
    - artist); ?> -

    - -     		+ artist); ?> +

    + +
    - - + +
    - - + +
    - - + +
      - -   + +
    - - - + + +
    diff --git a/templates/show_edit_song_row.inc.php b/templates/show_edit_song_row.inc.php index 90535c31..d3a87ab1 100644 --- a/templates/show_edit_song_row.inc.php +++ b/templates/show_edit_song_row.inc.php @@ -1,5 +1,5 @@ - + - artist,true,$song->id); ?> -
    + artist,true,$song->id); ?> +
    id,'change','check_inline_song_edit("artist", '.$song->id.')'); ?> - album,true,$song->id); ?> -
    + album,true,$song->id); ?> +
    id,'change','check_inline_song_edit("album", '.$song->id.')'); ?> - + - - - id . '&type=song_row','download', T_('Save Changes'),'save_song_' . $song->id,'edit_song_' . $song->id); ?> + + + id . '&type=song_row','download', T_('Save Changes'),'save_song_' . $song->id,'edit_song_' . $song->id); ?> diff --git a/templates/show_edit_user.inc.php b/templates/show_edit_user.inc.php index 76dfb198..d6cb9942 100644 --- a/templates/show_edit_user.inc.php +++ b/templates/show_edit_user.inc.php @@ -1,5 +1,5 @@ "> - + - - + + - - + + - - + + - - + + - - + + - - + + - + - - + + - - + + - - + +
    - : - - - - + : + + + +
    : - - : + +
    - : - - - + : + + +
    - : - - - - + : + + + +
    - : - - - + : + + +
    - : - + + : + access; ${$var_name} = 'selected="selected"'; ?> -
    - - + +
    - - + +
    - - + +
    - - - - + + + +
    diff --git a/templates/show_export.inc.php b/templates/show_export.inc.php index 96151492..e7cd949e 100644 --- a/templates/show_export.inc.php +++ b/templates/show_export.inc.php @@ -1,5 +1,5 @@
    - - + + + - - + +
    : - : + -
    : - - : + +
    diff --git a/templates/show_flag_row.inc.php b/templates/show_flag_row.inc.php index cbeef4f8..36eff612 100644 --- a/templates/show_flag_row.inc.php +++ b/templates/show_flag_row.inc.php @@ -1,5 +1,5 @@ - f_name; ?> - f_user; ?> - print_flag(); ?> - comment); ?> - print_status(); ?> - - approved) { ?> - id,'disable', T_('Reject'),'reject_flag_' . $flag->id); ?> - - id,'enable', T_('Enable'),'enable_flag_' . $flag->id); ?> - - + f_name; ?> + f_user; ?> + print_flag(); ?> + comment); ?> + print_status(); ?> + + approved) { ?> + id,'disable', T_('Reject'),'reject_flag_' . $flag->id); ?> + + id,'enable', T_('Enable'),'enable_flag_' . $flag->id); ?> + + diff --git a/templates/show_flagged.inc.php b/templates/show_flagged.inc.php index ed51f277..db239205 100644 --- a/templates/show_flagged.inc.php +++ b/templates/show_flagged.inc.php @@ -1,5 +1,5 @@ - - - - - - + + + + + + format(); - require Config::get('prefix') . '/templates/show_flag_row.inc.php'; + $flag = new Flag($flag_id); + $flag->format(); + require Config::get('prefix') . '/templates/show_flag_row.inc.php'; ?> - + - - - - - - + + + + + + diff --git a/templates/show_gather_art.inc.php b/templates/show_gather_art.inc.php index 9f17c90e..56598316 100644 --- a/templates/show_gather_art.inc.php +++ b/templates/show_gather_art.inc.php @@ -1,5 +1,5 @@ /albums.php?action=find_art&album_id=id; ?>&artist_name=&album_name=&cover=" style="Display:inline;"> - - + + - - + + - - + + - - + +
    -   - - - +   + + +
    -   - - - +   + + +
    - - - - + + + +
    - - - - + + + +
    - - + + - +
    diff --git a/templates/show_import_playlist.inc.php b/templates/show_import_playlist.inc.php index a767d41a..436f71c1 100644 --- a/templates/show_import_playlist.inc.php +++ b/templates/show_import_playlist.inc.php @@ -1,5 +1,5 @@ - : - - + : + + - - - - - - + + + + + +
    - - + +
    diff --git a/templates/show_index.inc.php b/templates/show_index.inc.php index 7c12cbf4..7c4db26e 100644 --- a/templates/show_index.inc.php +++ b/templates/show_index.inc.php @@ -1,5 +1,5 @@
    - +
    - +
    diff --git a/templates/show_install.inc.php b/templates/show_install.inc.php index ea2f86a9..7350f431 100644 --- a/templates/show_install.inc.php +++ b/templates/show_install.inc.php @@ -1,5 +1,5 @@ -
    -
    -
    -
    -
    -
    -
    -
    - -
    - -
    " enctype="multipart/form-data" > +
    +
    +
    +
    +
    +
    +
    +
    + +
    + + " enctype="multipart/form-data" > - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + +
    ? ?
     " /> " />
    -
    -
    -

    Ampache Installation.
    - Pour l'Amour de la Musique

    +
    +
    +

    Ampache Installation.
    + Pour l'Amour de la Musique

    diff --git a/templates/show_install_account.inc.php b/templates/show_install_account.inc.php index 86c5b770..e3a0a0d1 100644 --- a/templates/show_install_account.inc.php +++ b/templates/show_install_account.inc.php @@ -1,5 +1,5 @@ -
    -
    -
    -
    -
    -
    -
    - -
    - -
    " enctype="multipart/form-data" > +
    +
    +
    +
    +
    +
    +
    + +
    + + " enctype="multipart/form-data" > - - + + - - + + - - + + - - + + -
      
    - -
    -
    -

    Ampache Installation.
    - For the love of Music.

    + + +
    +
    +

    Ampache Installation.
    + For the love of Music.

    diff --git a/templates/show_install_check.inc.php b/templates/show_install_check.inc.php index 9cd719a8..88ce8c62 100644 --- a/templates/show_install_check.inc.php +++ b/templates/show_install_check.inc.php @@ -1,5 +1,5 @@ @@ -41,13 +41,13 @@ @@ -55,73 +55,73 @@ : : : : : @@ -130,48 +130,48 @@ : : : : @@ -179,24 +179,24 @@ : diff --git a/templates/show_install_config.inc.php b/templates/show_install_config.inc.php index 703ef890..bae4d3ba 100644 --- a/templates/show_install_config.inc.php +++ b/templates/show_install_config.inc.php @@ -1,5 +1,5 @@ -
    -
    -
    -
    -
    -
    -
    - -
    +
    +
    +
    +
    +
    +
    +
    + +
    " enctype="multipart/form-data" > - - + + - - + + - - + + - - + + - - + + - - + + -
      - - /> - - -   + + /> + + +
    -
    -
    - +
    + +
    + - - - -
    [ ] @@ -92,32 +92,32 @@ require $prefix . '/templates/install_header.inc.php'; ]
      - - [] -
    -
    -
    " enctype="multipart/form-data"> - -
    -
    -
    -

    Ampache Installation.
    - For the love of Music.

    -
    +   + + + [] + + + +
    +
    " enctype="multipart/form-data"> + +
    +
    +
    +

    Ampache Installation.
    + For the love of Music.

    +
    diff --git a/templates/show_install_lang.inc.php b/templates/show_install_lang.inc.php index b90b6712..63e3290e 100644 --- a/templates/show_install_lang.inc.php +++ b/templates/show_install_lang.inc.php @@ -1,5 +1,5 @@ -
    - -
    +
    + +
    - -

    - -

    + +

    + +

    " enctype="multipart/form-data" > \n"; foreach ($languages as $lang=>$name) { - $var_name = $lang . "_lang"; + $var_name = $lang . "_lang"; - echo "\t\n"; + echo "\t\n"; } // end foreach echo "\n"; ?> -
    -
    -
    -

    Ampache Installation.
    - For the love of Music.

    + +
    +
    +

    Ampache Installation.
    + For the love of Music.

    diff --git a/templates/show_ip_history.inc.php b/templates/show_ip_history.inc.php index da4fb607..f1adbe6d 100644 --- a/templates/show_ip_history.inc.php +++ b/templates/show_ip_history.inc.php @@ -1,5 +1,5 @@
  • - - + + - - + +
    • @@ -43,21 +43,21 @@ - + - - - - - - + + + + + + - + diff --git a/templates/show_live_stream.inc.php b/templates/show_live_stream.inc.php index 4cf52c27..47d2bcde 100644 --- a/templates/show_live_stream.inc.php +++ b/templates/show_live_stream.inc.php @@ -1,5 +1,5 @@
    diff --git a/templates/show_live_stream_row.inc.php b/templates/show_live_stream_row.inc.php index 620d7366..033f05a6 100644 --- a/templates/show_live_stream_row.inc.php +++ b/templates/show_live_stream_row.inc.php @@ -1,5 +1,5 @@ - id,'add', T_('Add'),'add_radio_' . $radio->id); ?> + id,'add', T_('Add'),'add_radio_' . $radio->id); ?> f_name_link; ?> f_callsign; ?> f_frequency; ?> f_tag; ?> - - id,'edit', T_('Edit'),'edit_radio_' . $radio->id); ?> - - - id,'delete', T_('Delete'),'delete_radio_' . $radio->id); ?> - + + id,'edit', T_('Edit'),'edit_radio_' . $radio->id); ?> + + + id,'delete', T_('Delete'),'delete_radio_' . $radio->id); ?> + diff --git a/templates/show_live_streams.inc.php b/templates/show_live_streams.inc.php index e03b4d13..1cc782f0 100644 --- a/templates/show_live_streams.inc.php +++ b/templates/show_live_streams.inc.php @@ -1,5 +1,5 @@ - - - - - - + + + + + + format(); + $radio = new Radio($radio_id); + $radio->format(); ?> - + - + - - - - - - + + + + + + diff --git a/templates/show_localplay_add_instance.inc.php b/templates/show_localplay_add_instance.inc.php index ec92c41f..d980c8e8 100644 --- a/templates/show_localplay_add_instance.inc.php +++ b/templates/show_localplay_add_instance.inc.php @@ -1,5 +1,5 @@ $field) { ?> - - + + -
    - +
    +
    diff --git a/templates/show_localplay_control.inc.php b/templates/show_localplay_control.inc.php index 5c3b099e..5ca4a43f 100644 --- a/templates/show_localplay_control.inc.php +++ b/templates/show_localplay_control.inc.php @@ -1,5 +1,5 @@ - - - - + + + + player_loaded()) { continue; } - $localplay->format(); - if (Localplay::is_enabled($controller)) { - $action = 'confirm_uninstall_localplay'; - $action_txt = T_('Disable'); - } - else { - $action = 'install_localplay'; - $action_txt = T_('Activate'); - } + $localplay = new Localplay($controller); + if (!$localplay->player_loaded()) { continue; } + $localplay->format(); + if (Localplay::is_enabled($controller)) { + $action = 'confirm_uninstall_localplay'; + $action_txt = T_('Disable'); + } + else { + $action = 'install_localplay'; + $action_txt = T_('Activate'); + } ?> - f_name); ?> - f_description); ?> - f_version); ?> - + f_name); ?> + f_description); ?> + f_version); ?> + - + - - - - + + + +
    diff --git a/templates/show_localplay_edit_instance.inc.php b/templates/show_localplay_edit_instance.inc.php index 9d9484ce..1bd14364 100644 --- a/templates/show_localplay_edit_instance.inc.php +++ b/templates/show_localplay_edit_instance.inc.php @@ -1,5 +1,5 @@ $field) { ?> - - + + -
    - +
    +
    diff --git a/templates/show_localplay_instances.inc.php b/templates/show_localplay_instances.inc.php index 755744b7..6972479f 100644 --- a/templates/show_localplay_instances.inc.php +++ b/templates/show_localplay_instances.inc.php @@ -1,5 +1,5 @@ - $field) { ?> - - - + $field) { ?> + + + $name) { - $instance = $localplay->get_instance($uid); + $instance = $localplay->get_instance($uid); ?> - $field) { ?> - - - + $field) { ?> + + +
    - - - + + +
    diff --git a/templates/show_localplay_playlist.inc.php b/templates/show_localplay_playlist.inc.php index 0f5b2633..8a1781b0 100644 --- a/templates/show_localplay_playlist.inc.php +++ b/templates/show_localplay_playlist.inc.php @@ -1,5 +1,5 @@ status(); - - - + + + - - - - > - format_name($object['name'],$object['id']); ?> - - - - + + + + > + format_name($object['name'],$object['id']); ?> + + + + - + - - - + + + diff --git a/templates/show_localplay_status.inc.php b/templates/show_localplay_status.inc.php index 87f25283..00fa065f 100644 --- a/templates/show_localplay_status.inc.php +++ b/templates/show_localplay_status.inc.php @@ -1,5 +1,5 @@ :%
  • - | - - + | + +
  • - | - - + | + +
  • - +
    • diff --git a/templates/show_login_form.inc.php b/templates/show_login_form.inc.php index a972fc34..c2e73677 100644 --- a/templates/show_login_form.inc.php +++ b/templates/show_login_form.inc.php @@ -1,5 +1,5 @@ = Config::get('remember_length')) { - $remember_disabled = 'disabled="disabled"'; + $remember_disabled = 'disabled="disabled"'; } $htmllang = str_replace("_","-",Config::get('lang')); is_rtl(Config::get('lang')) ? $dir = 'rtl' : $dir = 'ltr'; @@ -45,54 +45,54 @@ function focus(){ document.login.username.focus(); }
    -