From e855988af2850d8d8105b56bc0ce9eae8b7d9dc0 Mon Sep 17 00:00:00 2001 From: spocky Date: Wed, 24 Oct 2007 21:15:58 +0000 Subject: renamed a few files (missing php extension) updated most of the tables so that every column is independently customizable by css rules --- templates/header.inc.php | 20 ++-- templates/show_access_list.inc.php | 2 +- templates/show_admin_info.inc.php | 2 +- templates/show_admin_tools.inc.php | 18 ++- templates/show_album_row.inc.php | 14 +-- templates/show_albums.inc.php | 50 ++++---- templates/show_artist_row.inc.php | 10 +- templates/show_artists.inc.php | 36 +++--- templates/show_catalog_row.inc.php | 10 +- templates/show_catalogs.inc.php | 40 +++---- templates/show_confirmation.inc.php | 4 +- templates/show_disabled_songs.inc | 54 --------- templates/show_disabled_songs.inc.php | 70 +++++++++++ templates/show_flagged.inc.php | 50 +++++--- templates/show_genres.inc.php | 38 +++--- templates/show_install.inc | 112 ------------------ templates/show_install.inc.php | 112 ++++++++++++++++++ templates/show_install_config.inc | 143 ----------------------- templates/show_install_config.inc.php | 143 +++++++++++++++++++++++ templates/show_ip_history.inc.php | 25 ++-- templates/show_list_duplicates.inc.php | 56 ++++++--- templates/show_live_stream_row.inc.php | 12 +- templates/show_live_streams.inc.php | 42 +++---- templates/show_local_catalog_info.inc.php | 20 ++-- templates/show_localplay_controllers.inc.php | 32 ++++-- templates/show_localplay_playlist.inc.php | 28 +++-- templates/show_login_form.inc | 74 ------------ templates/show_login_form.inc.php | 74 ++++++++++++ templates/show_playlist_row.inc.php | 10 +- templates/show_playlist_song_row.inc.php | 18 +-- templates/show_playlist_songs.inc.php | 54 +++++---- templates/show_playlists.inc.php | 36 +++--- templates/show_plugins.inc.php | 32 ++++-- templates/show_preference_admin.inc.php | 20 +++- templates/show_preference_box.inc.php | 38 ++++-- templates/show_random.inc.php | 2 +- templates/show_recently_played.inc.php | 38 ++++-- templates/show_search.inc.php | 5 +- templates/show_search_bar.inc.php | 4 +- templates/show_similar_artists.inc | 158 ------------------------- templates/show_similar_artists.inc.php | 166 +++++++++++++++++++++++++++ templates/show_song_row.inc.php | 16 +-- templates/show_songs.inc.php | 58 +++++----- templates/show_tv_playlist.inc.php | 46 +++++--- templates/show_users.inc.php | 73 ++++++------ 45 files changed, 1117 insertions(+), 948 deletions(-) delete mode 100644 templates/show_disabled_songs.inc create mode 100644 templates/show_disabled_songs.inc.php delete mode 100644 templates/show_install.inc create mode 100644 templates/show_install.inc.php delete mode 100644 templates/show_install_config.inc create mode 100644 templates/show_install_config.inc.php delete mode 100644 templates/show_login_form.inc create mode 100644 templates/show_login_form.inc.php delete mode 100644 templates/show_similar_artists.inc create mode 100644 templates/show_similar_artists.inc.php (limited to 'templates') diff --git a/templates/header.inc.php b/templates/header.inc.php index ef3672f1..c6400ada 100644 --- a/templates/header.inc.php +++ b/templates/header.inc.php @@ -58,19 +58,19 @@ if (Config::get('use_rss')) { ?> echo " class=\"vertical_menu\" "; }?>> -
-
- - Ampache: For the love of music - -
-
- + +
+
diff --git a/templates/show_access_list.inc.php b/templates/show_access_list.inc.php index 1374b81a..0c3c1fee 100644 --- a/templates/show_access_list.inc.php +++ b/templates/show_access_list.inc.php @@ -35,7 +35,7 @@ to add any server's IP address that you want to access your Ampache catalog or b stream from this server.

- +

diff --git a/templates/show_admin_info.inc.php b/templates/show_admin_info.inc.php index ddf2a77b..b011740d 100644 --- a/templates/show_admin_info.inc.php +++ b/templates/show_admin_info.inc.php @@ -33,7 +33,7 @@ $songs = Catalog::get_disabled(10);   - +
...
diff --git a/templates/show_admin_tools.inc.php b/templates/show_admin_tools.inc.php index 02237e59..b1e3e9e4 100644 --- a/templates/show_admin_tools.inc.php +++ b/templates/show_admin_tools.inc.php @@ -25,18 +25,22 @@ $catalogs = Catalog::get_catalogs(); ?>
- - - ++ + + + + + - - + + + +
+ name); ?>   (path); ?>) +  |  @@ -65,6 +69,10 @@ $catalogs = Catalog::get_catalogs();
  diff --git a/templates/show_album_row.inc.php b/templates/show_album_row.inc.php index 7d5ffde0..6d8189d3 100644 --- a/templates/show_album_row.inc.php +++ b/templates/show_album_row.inc.php @@ -19,22 +19,22 @@ */ ?> - + id,'add',_('Add'),'add_album_' . $album->id); ?> id,'random',_('Random'),'random_album_' . $album->id); ?> - + -f_name_link; ?> -f_artist_link; ?> -song_count; ?> -year; ?> - +f_name_link; ?> +f_artist_link; ?> +song_count; ?> +year; ?> + diff --git a/templates/show_albums.inc.php b/templates/show_albums.inc.php index fe2af1be..962739ce 100644 --- a/templates/show_albums.inc.php +++ b/templates/show_albums.inc.php @@ -22,26 +22,28 @@ $web_path = Config::get('web_path'); $ajax_url = Config::get('ajax_url'); ?> - +
- - - - - - - + + + + + + + + + - - + + - + - - - - - + + + + + - - + + - + - - - - - + + + + +
diff --git a/templates/show_artist_row.inc.php b/templates/show_artist_row.inc.php index ab5ac563..e20ccfd9 100644 --- a/templates/show_artist_row.inc.php +++ b/templates/show_artist_row.inc.php @@ -19,14 +19,14 @@ */ ?> - + id,'add',_('Add'),'add_artist_' . $artist->id); ?> id,'random',_('Random'),'random_artist_' . $artist->id); ?> -f_name_link; ?> -songs; ?> -albums; ?> - +f_name_link; ?> +songs; ?> +albums; ?> +
diff --git a/templates/show_artists.inc.php b/templates/show_artists.inc.php index f67f02cd..954686aa 100644 --- a/templates/show_artists.inc.php +++ b/templates/show_artists.inc.php @@ -22,20 +22,20 @@ $web_path = Config::get('web_path'); ?> - +
- - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + +
diff --git a/templates/show_catalog_row.inc.php b/templates/show_catalog_row.inc.php index 34f7ea77..faf9b406 100644 --- a/templates/show_catalog_row.inc.php +++ b/templates/show_catalog_row.inc.php @@ -20,11 +20,11 @@ */ $web_path = Config::get('web_path'); ?> -f_name_link; ?> -f_path); ?> -f_update); ?> -f_add); ?> - +f_name_link; ?> +f_path); ?> +f_update); ?> +f_add); ?> +
| | diff --git a/templates/show_catalogs.inc.php b/templates/show_catalogs.inc.php index b8b6173e..9174838c 100644 --- a/templates/show_catalogs.inc.php +++ b/templates/show_catalogs.inc.php @@ -20,20 +20,20 @@ */ ?> - +
- - - - - + + + + + - - - - - - + + + + + + - - - - - - - - + + + + + + +
  + | | @@ -63,5 +56,12 @@ |
diff --git a/templates/show_confirmation.inc.php b/templates/show_confirmation.inc.php index 21b20ca3..fb66ce4b 100644 --- a/templates/show_confirmation.inc.php +++ b/templates/show_confirmation.inc.php @@ -22,8 +22,8 @@
- + - "> + "> diff --git a/templates/show_disabled_songs.inc b/templates/show_disabled_songs.inc deleted file mode 100644 index 833d1881..00000000 --- a/templates/show_disabled_songs.inc +++ /dev/null @@ -1,54 +0,0 @@ - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
title; ?>get_album_name($song->album); ?>get_artist_name($song->album); ?>file; ?>addition_time); ?>
-    - -
-
diff --git a/templates/show_disabled_songs.inc.php b/templates/show_disabled_songs.inc.php new file mode 100644 index 00000000..1f051306 --- /dev/null +++ b/templates/show_disabled_songs.inc.php @@ -0,0 +1,70 @@ + +
+
+ ++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
title; ?>get_album_name($song->album); ?>get_artist_name($song->album); ?>file; ?>addition_time); ?>
+    + +
+
+
diff --git a/templates/show_flagged.inc.php b/templates/show_flagged.inc.php index 0860d805..ec8c7cd0 100644 --- a/templates/show_flagged.inc.php +++ b/templates/show_flagged.inc.php @@ -22,27 +22,36 @@ $web_path = Config::get('web_path'); ?>
- - - - - - - - - +
++ + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + +
+ print_name(); ?>f_user_username); ?>print_flag(); ?>comment); ?>print_status(); ?> + print_name(); ?>f_user_username); ?>print_flag(); ?>comment); ?>print_status(); ?> approved) { ?> @@ -68,6 +77,15 @@ $web_path = Config::get('web_path');
diff --git a/templates/show_genres.inc.php b/templates/show_genres.inc.php index f0570100..d2df78ba 100644 --- a/templates/show_genres.inc.php +++ b/templates/show_genres.inc.php @@ -25,18 +25,18 @@ */ ?> - +
- - - - + + + + - - - - - + + + + + format(); ?> - - - - + + - - - - - + + + + +
+ @@ -52,9 +52,9 @@ foreach ($object_ids as $genre_id) { f_link; ?>get_song_count(); ?> + f_link; ?>get_song_count(); ?> @@ -63,11 +63,11 @@ foreach ($object_ids as $genre_id) {
diff --git a/templates/show_install.inc b/templates/show_install.inc deleted file mode 100644 index 5a477e74..00000000 --- a/templates/show_install.inc +++ /dev/null @@ -1,112 +0,0 @@ - - - - -Ampache :: For The Love Of Music - Install - - - - - -
- -
- -

- -

-
    -
  • -
  • -
-

- -

-
- -
-
-
-
-
-
-
-
- -
- Insert Ampache Database -
" enctype="multipart/form-data" > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
?
 " />
-
- -
-
-

Ampache Installation.
- For the love of Music.

-
-
- - - diff --git a/templates/show_install.inc.php b/templates/show_install.inc.php new file mode 100644 index 00000000..5a477e74 --- /dev/null +++ b/templates/show_install.inc.php @@ -0,0 +1,112 @@ + + + + +Ampache :: For The Love Of Music - Install + + + + + +
+ +
+ +

+ +

+
    +
  • +
  • +
+

+ +

+
+ +
+
+
+
+
+
+
+
+ +
+ Insert Ampache Database +
" enctype="multipart/form-data" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
?
 " />
+
+ +
+
+

Ampache Installation.
+ For the love of Music.

+
+
+ + + diff --git a/templates/show_install_config.inc b/templates/show_install_config.inc deleted file mode 100644 index 9b5c477b..00000000 --- a/templates/show_install_config.inc +++ /dev/null @@ -1,143 +0,0 @@ - - - - -Ampache :: For The Love Of Music - Install - - - - -
- -
- -
-
    -
  • -
  • -
- -
- -
-
-
-
-
-
-
- -
- -
" enctype="multipart/form-data" > - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-
-
- - - - - - - - - - - - - -
[ - ERROR "; - } - else { - $status['read_config'] = 'true'; - echo " OK "; - } - ?> - ] -
- - [ - ERROR "; - } - else { - $status['parse_config'] = 'true'; - echo " OK "; - } - ?> - ] -
  - - [] -
-
-
" enctype="multipart/form-data"> - -
-
-
-

Ampache Installation.
- For the love of Music.

-
-
- - - - diff --git a/templates/show_install_config.inc.php b/templates/show_install_config.inc.php new file mode 100644 index 00000000..9b5c477b --- /dev/null +++ b/templates/show_install_config.inc.php @@ -0,0 +1,143 @@ + + + + +Ampache :: For The Love Of Music - Install + + + + +
+ +
+ +
+
    +
  • +
  • +
+ +
+ +
+
+
+
+
+
+
+ +
+ +
" enctype="multipart/form-data" > + + + + + + + + + + + + + + + + + + + + + + + + + +
 
+
+
+ + + + + + + + + + + + + +
[ + ERROR "; + } + else { + $status['read_config'] = 'true'; + echo " OK "; + } + ?> + ] +
+ + [ + ERROR "; + } + else { + $status['parse_config'] = 'true'; + echo " OK "; + } + ?> + ] +
  + + [] +
+
+
" enctype="multipart/form-data"> + +
+
+
+

Ampache Installation.
+ For the love of Music.

+
+
+ + + + diff --git a/templates/show_ip_history.inc.php b/templates/show_ip_history.inc.php index d3b2a010..0e30c93f 100644 --- a/templates/show_ip_history.inc.php +++ b/templates/show_ip_history.inc.php @@ -28,24 +28,29 @@ ...
- - - - +
- - - -
++ + + + + + - - + + + + +
+ +
diff --git a/templates/show_list_duplicates.inc.php b/templates/show_list_duplicates.inc.php index f4ff4b58..f835cf8a 100644 --- a/templates/show_list_duplicates.inc.php +++ b/templates/show_list_duplicates.inc.php @@ -25,16 +25,26 @@ show_duplicate_searchbox($search_type); if (count($flags)) { ?>
- - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + $check_txt = ''; if ($key == '0' AND $_REQUEST['auto']) { $check_txt = ' checked="checked"'; } echo "". - "". - "". - "". - "". - "". - "". - "". - ""; + "". + "". + "". + "". + "". + "". + "". + ""; echo "\n"; } // end foreach ($dinfolist as $dinfo) @@ -74,6 +84,16 @@ if (count($flags)) { ?> + + + + + + + + + +
id\">".scrub_out($formated_title)." ".scrub_out($dinfo['artist'])." ".scrub_out($dinfo['album'])." ".floor($dinfo['time']/60).":".sprintf("%02d", ($dinfo['time']%60) )."".intval($dinfo['bitrate']/1000)."".sprintf("%.2f", ($dinfo['size']/1048576))."MB".$dinfo['file']."id\">".scrub_out($formated_title)." ".scrub_out($dinfo['artist'])." ".scrub_out($dinfo['album'])." ".floor($dinfo['time']/60).":".sprintf("%02d", ($dinfo['time']%60) )."".intval($dinfo['bitrate']/1000)."".sprintf("%.2f", ($dinfo['size']/1048576))."MB".$dinfo['file']."
diff --git a/templates/show_live_stream_row.inc.php b/templates/show_live_stream_row.inc.php index 773b1d35..23e0f9d7 100644 --- a/templates/show_live_stream_row.inc.php +++ b/templates/show_live_stream_row.inc.php @@ -19,14 +19,14 @@ */ ?> - + id,'add',_('Add'),'add_radio_' . $radio->id); ?> -f_name_link; ?> -f_callsign; ?> -f_frequency; ?> -f_genre; ?> - +f_name_link; ?> +f_callsign; ?> +f_frequency; ?> +f_genre; ?> + has_access('50')) { ?> id,'edit',_('Edit'),'edit_radio_' . $radio->id); ?> diff --git a/templates/show_live_streams.inc.php b/templates/show_live_streams.inc.php index beb44f10..b315922c 100644 --- a/templates/show_live_streams.inc.php +++ b/templates/show_live_streams.inc.php @@ -22,22 +22,22 @@ $web_path = Config::get('web_path'); ?> - +
- - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + +
diff --git a/templates/show_local_catalog_info.inc.php b/templates/show_local_catalog_info.inc.php index 49c6a309..389f3099 100644 --- a/templates/show_local_catalog_info.inc.php +++ b/templates/show_local_catalog_info.inc.php @@ -22,16 +22,16 @@ ?> - - - - - - - - - - +
+ + + + + + + + + diff --git a/templates/show_localplay_controllers.inc.php b/templates/show_localplay_controllers.inc.php index 3e8cd613..ba7b5fcb 100644 --- a/templates/show_localplay_controllers.inc.php +++ b/templates/show_localplay_controllers.inc.php @@ -21,12 +21,18 @@ $web_path = Config::get('web_path'); ?> -
- - - - - +
++ + + + + + + + + + - - - - + + + + + + + + + +
f_name); ?>f_description); ?>f_version); ?>f_name); ?>f_description); ?>f_version); ?>

diff --git a/templates/show_localplay_playlist.inc.php b/templates/show_localplay_playlist.inc.php index 216f1523..10f8ecb9 100644 --- a/templates/show_localplay_playlist.inc.php +++ b/templates/show_localplay_playlist.inc.php @@ -20,25 +20,30 @@ */ ?> - - - - - +
++ + + + + + + + - > format_name($object['name'],$object['id']); ?> - @@ -47,5 +52,10 @@ foreach ($objects as $object) { + + + + +
+ +
diff --git a/templates/show_login_form.inc b/templates/show_login_form.inc deleted file mode 100644 index ea271460..00000000 --- a/templates/show_login_form.inc +++ /dev/null @@ -1,74 +0,0 @@ -= Config::get('remember_length')) { - $remember_disabled = 'disabled="disabled"'; -} -$htmllang = str_replace("_","-",Config::get('lang')); - -?> - - - - - - - - - <?php echo Config::get('site_title'); ?> - - - - -
-

-
-

-
-

-

-

-

-

/>

- - -

- - -
- - - - - -
-
- diff --git a/templates/show_login_form.inc.php b/templates/show_login_form.inc.php new file mode 100644 index 00000000..ea271460 --- /dev/null +++ b/templates/show_login_form.inc.php @@ -0,0 +1,74 @@ += Config::get('remember_length')) { + $remember_disabled = 'disabled="disabled"'; +} +$htmllang = str_replace("_","-",Config::get('lang')); + +?> + + + + + + + + + <?php echo Config::get('site_title'); ?> + + + + +
+

+
+

+
+

+

+

+

+

/>

+ + +

+ + +
+ + + + + +
+
+ diff --git a/templates/show_playlist_row.inc.php b/templates/show_playlist_row.inc.php index 91b7877b..1efb252a 100644 --- a/templates/show_playlist_row.inc.php +++ b/templates/show_playlist_row.inc.php @@ -19,14 +19,14 @@ */ ?> - + id,'add',_('Add'),'add_playlist_' . $playlist->id); ?> id,'random',_('Random'),'random_playlist_' . $playlist->id); ?> -f_link; ?> - -f_user); ?> - +f_link; ?> + +f_user); ?> + diff --git a/templates/show_playlist_song_row.inc.php b/templates/show_playlist_song_row.inc.php index 9cfcc992..e96aa91b 100644 --- a/templates/show_playlist_song_row.inc.php +++ b/templates/show_playlist_song_row.inc.php @@ -19,15 +19,15 @@ */ ?> -id,'add',_('Add'),'playlist_add_' . $song->id); ?> - -f_link; ?> -f_artist_link; ?> -f_album_link; ?> -f_genre_link; ?> -f_track; ?> -f_time; ?> - +id,'add',_('Add'),'playlist_add_' . $song->id); ?> + +f_link; ?> +f_artist_link; ?> +f_album_link; ?> +f_genre_link; ?> +f_track; ?> +f_time; ?> + prefs['download']) { ?> diff --git a/templates/show_playlist_songs.inc.php b/templates/show_playlist_songs.inc.php index 17aa68a6..b0ba1e95 100644 --- a/templates/show_playlist_songs.inc.php +++ b/templates/show_playlist_songs.inc.php @@ -23,22 +23,29 @@ $web_path = Config::get('web_path'); $ajax_url = Config::get('ajax_url'); ?> - - - - - - - - - - - - - - + +
- -
 
++ + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + +
 
- -
 
+ diff --git a/templates/show_playlists.inc.php b/templates/show_playlists.inc.php index c2da7945..385877f8 100644 --- a/templates/show_playlists.inc.php +++ b/templates/show_playlists.inc.php @@ -21,20 +21,20 @@ */ ?> - +
- - - - - + + + + + - - - - - - + + + + + + - - - - - - + + + + + +
diff --git a/templates/show_plugins.inc.php b/templates/show_plugins.inc.php index a87e3f9b..6bc5cf26 100644 --- a/templates/show_plugins.inc.php +++ b/templates/show_plugins.inc.php @@ -21,12 +21,18 @@ $web_path = Config::get('web_path'); ?> - - - - - - +
++ + + + + + + + + + - - - - + + + + + + + + + +
_plugin->name); ?>_plugin->description); ?>_plugin->version); ?>_plugin->name); ?>_plugin->description); ?>_plugin->version); ?>

diff --git a/templates/show_preference_admin.inc.php b/templates/show_preference_admin.inc.php index 6fa4de4a..01cae624 100644 --- a/templates/show_preference_admin.inc.php +++ b/templates/show_preference_admin.inc.php @@ -21,17 +21,21 @@ ?>
- - - - +
++ + + + + + - - + + + + +
+
diff --git a/templates/show_preference_box.inc.php b/templates/show_preference_box.inc.php index e435c005..b1964841 100644 --- a/templates/show_preference_box.inc.php +++ b/templates/show_preference_box.inc.php @@ -26,27 +26,33 @@ if (($GLOBALS['user']->has_access(100) OR !Config::get('use_auth')) AND $_REQUES $is_admin = true; } ?> +
- - - - - - ++ + + + + + + + + + - - + + - - + - - + + + + + + + + +
+ +
diff --git a/templates/show_random.inc.php b/templates/show_random.inc.php index 428d7ccc..5cfdc9a0 100644 --- a/templates/show_random.inc.php +++ b/templates/show_random.inc.php @@ -76,7 +76,7 @@ - + diff --git a/templates/show_recently_played.inc.php b/templates/show_recently_played.inc.php index 0e1ee595..4d3b416d 100644 --- a/templates/show_recently_played.inc.php +++ b/templates/show_recently_played.inc.php @@ -23,13 +23,20 @@ $time_unit = array('',_('seconds ago'),_('minutes ago'),_('hours ago'),_('days ago'),_('weeks ago'),_('months ago'),_('years ago')); ?> - - - - - - - +
++ + + + + + + + + + + + format(); ?> - - - - - + + + + + + + + + + +
+ fullname); ?> f_link; ?>f_album_link; ?>f_artist_link; ?>f_link; ?>f_album_link; ?>f_artist_link; ?>
diff --git a/templates/show_search.inc.php b/templates/show_search.inc.php index 9e97591b..d69574d9 100644 --- a/templates/show_search.inc.php +++ b/templates/show_search.inc.php @@ -25,10 +25,7 @@ ?>
- - - - +
 
- - - - - - - + + + + + +
diff --git a/templates/show_search_bar.inc.php b/templates/show_search_bar.inc.php index 63322f37..e186b78f 100644 --- a/templates/show_search_bar.inc.php +++ b/templates/show_search_bar.inc.php @@ -26,8 +26,8 @@ - - + + diff --git a/templates/show_similar_artists.inc b/templates/show_similar_artists.inc deleted file mode 100644 index 5ab3753e..00000000 --- a/templates/show_similar_artists.inc +++ /dev/null @@ -1,158 +0,0 @@ - - -
-

()

- - - - - - 0) { - $show = true; - foreach ($similar_artists as $artist_array) { -?> - - - - - - - - - - - - - - - - - - - -
  Select
- - - > -
-   - - No Similar Artists found -
-   - - " onclick="window.location.href = '/artists.php?action=show&artist=';" /> -
- " onclick="document.artists.submit();" /> - " onclick="window.location.href = '/artists.php?action=show&artist=';" /> -
-
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Normalize options
- - /> -
- - ' style='display: inline;'/> - default -
- - ' style='display: inline;'/> - default -
-
Compare options
- - /> - - <No Options> -
- - /> - - - ' style='display: inline;' size='2'/> -
OR
- - ' style='display: inline;' size='4'/>% -
-
- - /> - - - ' style='display: inline;' size='2'/> -
- " onclick="document.advanced.submit();" /> -
-
- - diff --git a/templates/show_similar_artists.inc.php b/templates/show_similar_artists.inc.php new file mode 100644 index 00000000..ccf54374 --- /dev/null +++ b/templates/show_similar_artists.inc.php @@ -0,0 +1,166 @@ + + +
+

()

+ + + + + + + + + + 0) { + $show = true; + foreach ($similar_artists as $artist_array) { +?> + + + + + + + + + + + + + + + + + + + + + + + +
  Select
+ + + > +
+   + + No Similar Artists found +
+   + + " onclick="window.location.href = '/artists.php?action=show&artist=';" /> +
+ " onclick="document.artists.submit();" /> + " onclick="window.location.href = '/artists.php?action=show&artist=';" /> +
  Select
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Normalize options
+ + /> +
+ + ' style='display: inline;'/> + default +
+ + ' style='display: inline;'/> + default +
+
Compare options
+ + /> + + <No Options> +
+ + /> + + + ' style='display: inline;' size='2'/> +
OR
+ + ' style='display: inline;' size='4'/>% +
+
+ + /> + + + ' style='display: inline;' size='2'/> +
+ " onclick="document.advanced.submit();" /> +
+
+ + diff --git a/templates/show_song_row.inc.php b/templates/show_song_row.inc.php index 3ae150ca..492609eb 100644 --- a/templates/show_song_row.inc.php +++ b/templates/show_song_row.inc.php @@ -19,16 +19,16 @@ */ ?> -
+ id,'add',_('Add'),'add_' . $song->id); ?> f_link; ?>f_artist_link; ?>f_album_link; ?>f_genre_link; ?>f_track; ?>f_time; ?> +f_link; ?>f_artist_link; ?>f_album_link; ?>f_genre_link; ?>f_track; ?>f_time; ?> prefs['download']) { ?> diff --git a/templates/show_songs.inc.php b/templates/show_songs.inc.php index 293b0b55..0ebd770c 100644 --- a/templates/show_songs.inc.php +++ b/templates/show_songs.inc.php @@ -24,28 +24,26 @@ $web_path = Config::get('web_path'); $ajax_url = Config::get('ajax_url'); ?> - +
- - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + +
- -
- -
diff --git a/templates/show_tv_playlist.inc.php b/templates/show_tv_playlist.inc.php index 50bc7d11..f6fb87bb 100644 --- a/templates/show_tv_playlist.inc.php +++ b/templates/show_tv_playlist.inc.php @@ -21,7 +21,16 @@ /* Some defaults */ $web_path = conf('web_path'); ?> - +
++ + + + + has_access(100)) { ?> + + +base_playlist); @@ -39,13 +48,13 @@ if (!count($songs)) { /* Else we have songs */ else { ?> - - - - - + + + + + has_access(100)) { ?> - + $song_id) { $song->format_song(); ?> - - - - + + + has_access(100)) { ?> - + + + + + + has_access(100)) { ?> + + + +
+ has_vote($song_id)) { ?> get_vote($row_id)); ?>f_link . " / " . $song->f_album_link . " / " . $song->f_artist_link; ?>f_time; ?>get_vote($row_id)); ?>f_link . " / " . $song->f_album_link . " / " . $song->f_artist_link; ?>f_time; ?> + @@ -75,7 +84,18 @@ foreach($songs as $row_id=>$song_id) {
diff --git a/templates/show_users.inc.php b/templates/show_users.inc.php index a9e5fbd4..a27963ab 100644 --- a/templates/show_users.inc.php +++ b/templates/show_users.inc.php @@ -25,24 +25,26 @@ $web_path = Config::get('web_path'); - - - - - - - + + + + + + + + + - - - - - + + + + + - + - - + + create_date ? date("m\/d\/Y - H:i",$client->create_date) : _('Unknown'); ?> - - - - - + + + - - is_logged_in()) AND ($client->is_online())) { - echo ""; + echo ""; } elseif ($client->disabled == 1) { - echo ""; + echo ""; } else { - echo ""; + echo ""; } ?> - - - - - + + + + + - + - - + +
()
()
+ fullname; ?> (username; ?>) - - - - - f_useage; ?> - f_useage; ?> + ip_history; ?> + @@ -93,24 +88,24 @@ foreach ($object_ids as $user_id) {            
()
()
-- cgit