diff options
47 files changed, 388 insertions, 646 deletions
diff --git a/templates/header.inc.php b/templates/header.inc.php index 60a7b473..50453437 100644 --- a/templates/header.inc.php +++ b/templates/header.inc.php @@ -61,7 +61,7 @@ if (Config::get('use_rss')) { ?> <div id="header"><!-- This is the header --> <h1 id="headerlogo"> <a href="http://www.ampache.org"> - <img src="<?php echo $web_path; ?><?php echo Config::get('theme_path'); ?>/images/ampache.png" title="Ampache: For the love of music" alt="Ampache: For the love of music" /> + <img src="<?php echo $web_path; ?><?php echo Config::get('theme_path'); ?>/images/ampache.png" title="<?php echo Config::get('site_title'); ?>" alt="<?php echo Config::get('site_title'); ?>" /> </a> </h1> <div id="headerbox"> diff --git a/templates/print.css b/templates/print.css index 1edc9a20..05027a52 100644 --- a/templates/print.css +++ b/templates/print.css @@ -123,7 +123,4 @@ display: none; select { display: none; } -.text-action { -display: none; -} -} + diff --git a/templates/show_account.inc.php b/templates/show_account.inc.php index 8b179a78..256898f7 100644 --- a/templates/show_account.inc.php +++ b/templates/show_account.inc.php @@ -55,13 +55,11 @@ $_SESSION['forms']['account'] = $form_string; <input type="checkbox" name="clear_stats" value="1" /> </td> </tr> -<tr> - <td colspan="2"> +</table> +<div class="formValidation"> <input type="hidden" name="user_id" value="<?php echo scrub_out($client->id); ?>" /> <input type="hidden" name="action" value="update_user" /> <input type="hidden" name="tab" value="<?php echo scrub_out($_REQUEST['tab']); ?>" /> <input type="hidden" name="form_string" value="<?php echo $form_string; ?>" /> <input class="button" type="submit" value="<?php echo _('Update Account'); ?>" /> - </td> -</tr> -</table> +</div> diff --git a/templates/show_add_access.inc.php b/templates/show_add_access.inc.php index 506f9cda..9b26d96e 100644 --- a/templates/show_add_access.inc.php +++ b/templates/show_add_access.inc.php @@ -21,7 +21,7 @@ ?> <?php show_box_top(_('Add Access for a Host')); ?> <form name="update_catalog" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/access.php?action=add_host"> -<table cellpadding="5" cellspacing="0"> +<table class="tabledata" cellpadding="5" cellspacing="0"> <tr> <td><?php echo _('Name'); ?>:</td> <td> @@ -77,11 +77,9 @@ <input type="text" name="key" value="<?php echo scrub_out($_REQUEST['end']); ?>" size="32" maxlength="32" /> </td> </tr> -<tr> - <td colspan="2"> - <input class="button" type="submit" value="<?php echo _('Create ACL'); ?>" /> - </td> -</tr> </table> +<div class="formValidation"> + <input class="button" type="submit" value="<?php echo _('Create ACL'); ?>" /> +</div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_add_catalog.inc.php b/templates/show_add_catalog.inc.php index 2d685a10..cb88f3d9 100644 --- a/templates/show_add_catalog.inc.php +++ b/templates/show_add_catalog.inc.php @@ -79,14 +79,10 @@ $default_sort = "%a/%A"; <td valign="top"><?php echo _('Build Playlists from m3u Files'); ?>:</td> <td><input type="checkbox" name="parse_m3u" value="1" /></td> </tr> - -<tr> - <td> </td> - <td> - <input type="hidden" name="action" value="add_catalog" /> - <input class="button" type="submit" value="<?php echo _('Add Catalog'); ?>" /> - </td> -</tr> </table> +<div class="formValidation"> + <input type="hidden" name="action" value="add_catalog" /> + <input class="button" type="submit" value="<?php echo _('Add Catalog'); ?>" /> +</div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_add_live_stream.inc.php b/templates/show_add_live_stream.inc.php index 059e852a..7acf1b80 100644 --- a/templates/show_add_live_stream.inc.php +++ b/templates/show_add_live_stream.inc.php @@ -69,11 +69,9 @@ <?php echo show_catalog_select('catalog',intval($_REQUEST['catalog'])); ?> </td> </tr> -<tr> - <td colspan="2"> - <input class="button" type="submit" value="<?php echo _('Add'); ?>" /> - </td> -</tr> </table> +<div class="formValidation"> + <input class="button" type="submit" value="<?php echo _('Add'); ?>" /> +</div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_add_playlist.inc.php b/templates/show_add_playlist.inc.php index 1dae3679..bc1800ce 100644 --- a/templates/show_add_playlist.inc.php +++ b/templates/show_add_playlist.inc.php @@ -37,12 +37,10 @@ </select> </td> </tr> -<tr> - <td colspan="2"> +</table> +<div class="formValidation"> <input class="button" type="submit" value="<?php echo _('Create'); ?>" /> <input type="hidden" name="action" value="Create" /> - </td> -</tr> -</table> +</div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_add_user.inc.php b/templates/show_add_user.inc.php index be030a02..af0800cf 100644 --- a/templates/show_add_user.inc.php +++ b/templates/show_add_user.inc.php @@ -79,11 +79,9 @@ </select> </td> </tr> -<tr> - <td colspan="2"> - <input type="submit" value="<?php echo _('Add User'); ?>" /> - </td> -</tr> </table> +<div class="formValidation"> + <input type="submit" value="<?php echo _('Add User'); ?>" /> +</div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_admin_info.inc.php b/templates/show_admin_info.inc.php index b011740d..cf8a52e6 100644 --- a/templates/show_admin_info.inc.php +++ b/templates/show_admin_info.inc.php @@ -34,7 +34,7 @@ $songs = Catalog::get_disabled(10); <?php show_box_top(_('Disabled Songs')); ?> <!-- Show Last 10 Disabled Songs --> <?php require Config::get('prefix') . '/templates/show_disabled_songs.inc.php'; ?> - <div class="text-action"> - <a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_disabled"><?php echo _('Show All'); ?>...</a> + <div> + <a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=show_disabled"><?php echo _('Show All'); ?>...</a> </div> <?php show_box_bottom(); ?> diff --git a/templates/show_admin_tools.inc.php b/templates/show_admin_tools.inc.php index b1e3e9e4..b5a10b57 100644 --- a/templates/show_admin_tools.inc.php +++ b/templates/show_admin_tools.inc.php @@ -74,25 +74,25 @@ $catalogs = Catalog::get_catalogs(); <th class="cel_action"><?php echo _('Action'); ?></th> </tr> </table> -<div class="text-action"> -<a href="<?php echo $web_path; ?>/admin/catalog.php?action=clean_all_catalogs"><?php echo _('Clean All'); ?></a> -<a href="<?php echo $web_path; ?>/admin/catalog.php?action=update_all_catalogs"><?php echo _('Verify All'); ?></a> -<a href="<?php echo $web_path; ?>/admin/catalog.php?action=add_to_all_catalogs"><?php echo _('Add to All'); ?></a> -<a href="<?php echo $web_path; ?>/admin/catalog.php?action=full_service"><?php echo _('Update All'); ?></a> <hr noshade="noshade" size="3" /> -<a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_add_catalog"><?php echo _('Add a Catalog'); ?></a> -<a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_clear_stats"><?php echo _('Clear Catalog Stats'); ?></a> -<a href="<?php echo $web_path; ?>/admin/catalog.php?action=gather_album_art"><?php echo _('Gather Album Art'); ?></a> - +<div> +<a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=clean_all_catalogs"><?php echo _('Clean All'); ?></a> +<a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=update_all_catalogs"><?php echo _('Verify All'); ?></a> +<a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=add_to_all_catalogs"><?php echo _('Add to All'); ?></a> +<a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=full_service"><?php echo _('Update All'); ?></a><hr noshade="noshade" size="3" /> +<a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=show_add_catalog"><?php echo _('Add a Catalog'); ?></a> +<a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=show_clear_stats"><?php echo _('Clear Catalog Stats'); ?></a> +<a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=gather_album_art"><?php echo _('Gather Album Art'); ?></a> </div> <?php show_box_bottom(); ?> + <?php show_box_top(_('Other Tools')); ?> -<div class="text-action"> - <a href="<?php echo $web_path; ?>/admin/duplicates.php"><?php echo _('Show Duplicate Songs'); ?></a> - <a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_now_playing"><?php echo _('Clear Now Playing'); ?></a> - <a href="<?php echo $web_path; ?>/admin/system.php?action=generate_config"><?php echo _('Generate New Config'); ?></a> - <a href="<?php echo $web_path; ?>/admin/preferences.php?action=show_set_preferences"><?php echo _('Preferences Permissions'); ?></a> - <a href="<?php echo $web_path; ?>/admin/system.php?action=export&export=itunes"><?php echo _('Export To Itunes DB'); ?></a> - <a href="<?php echo $web_path; ?>/admin/users.php?action=show_inactive&days=30"><?php echo _('Show Inactive Users'); ?></a> -<!-- <a href="<?php echo $web_path; ?>/admin/system.php?action=check_version"><?php echo _('Check for New Version'); ?></a>--> +<div> + <a class="button" href="<?php echo $web_path; ?>/admin/duplicates.php"><?php echo _('Show Duplicate Songs'); ?></a> + <a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_now_playing"><?php echo _('Clear Now Playing'); ?></a> + <a class="button" href="<?php echo $web_path; ?>/admin/system.php?action=generate_config"><?php echo _('Generate New Config'); ?></a> + <a class="button" href="<?php echo $web_path; ?>/admin/preferences.php?action=show_set_preferences"><?php echo _('Preferences Permissions'); ?></a> + <a class="button" href="<?php echo $web_path; ?>/admin/system.php?action=export&export=itunes"><?php echo _('Export To Itunes DB'); ?></a> + <a class="button" href="<?php echo $web_path; ?>/admin/users.php?action=show_inactive&days=30"><?php echo _('Show Inactive Users'); ?></a> +<!-- <a class="button" href="<?php echo $web_path; ?>/admin/system.php?action=check_version"><?php echo _('Check for New Version'); ?></a>--> </div> <?php show_box_bottom(); ?> diff --git a/templates/show_album.inc.php b/templates/show_album.inc.php index f5874694..4f9956cd 100644 --- a/templates/show_album.inc.php +++ b/templates/show_album.inc.php @@ -36,7 +36,7 @@ $title = scrub_out($album->name) . ' (' . $album->year . ') -- ' } ?> </div> - <div style="display:table-cell;vertical-align:top;" id="rating_<?php echo $album->id; ?>_album"> + <div style="display:table-cell;" id="rating_<?php echo $album->id; ?>_album"> <?php Rating::show($album->id,'album'); ?> </div> <div id="information_actions"> diff --git a/templates/show_box_top.inc.php b/templates/show_box_top.inc.php index d632150e..42bda20d 100644 --- a/templates/show_box_top.inc.php +++ b/templates/show_box_top.inc.php @@ -30,5 +30,5 @@ $class = $class ? $class : 'box'; <?php if ($title) { ?> <h3 class="box-title"><?php echo $title; ?></h3> <?php } ?> - <div class="box-content"> + <div class="box-content clearfix"> diff --git a/templates/show_create_democratic.inc.php b/templates/show_create_democratic.inc.php index 5fa0dbc5..cce0857d 100644 --- a/templates/show_create_democratic.inc.php +++ b/templates/show_create_democratic.inc.php @@ -34,11 +34,9 @@ show_box_top(_('Create Democratic Playlist')); ?> <td><?php echo _('Make Default'); ?></td> <td><input type="checkbox" name="make_default" value="1" /></td> </tr> -<tr> - <td> - <input type="submit" value="<?php echo _('Create'); ?>" /> - </td> -</tr> </table> +<div class="formValidation"> + <input type="submit" value="<?php echo _('Create'); ?>" /> +</div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_disabled_songs.inc.php b/templates/show_disabled_songs.inc.php index 1f051306..2e85543c 100644 --- a/templates/show_disabled_songs.inc.php +++ b/templates/show_disabled_songs.inc.php @@ -52,12 +52,6 @@ <td colspan="7"><span class="error"><?php echo _('No Records Found'); ?></span></td> </tr> <?php } ?> -<tr class="<?php echo flip_class(); ?>"> - <td colspan="7"> - <input class="button" type="submit" value="<?php echo _('Remove'); ?>" /> - <input type="hidden" name="action" value="remove_disabled" /> - </td> -</tr> <tr class="th-bottom"> <th class="cel_select"><a href="#" onclick="check_select('song'); return false;"><?php echo _('Select'); ?></a></td> <th class="cel_song"><?php echo _('Title'); ?></th> @@ -67,4 +61,8 @@ <th class="cel_additiontime"><?php echo _('Addition Time'); ?></th> </tr> </table> +<div class="formValidation"> + <input class="button" type="submit" value="<?php echo _('Remove'); ?>" /> + <input type="hidden" name="action" value="remove_disabled" /> +</div> </form> diff --git a/templates/show_duplicates.inc.php b/templates/show_duplicates.inc.php index b00a3dba..731016ad 100644 --- a/templates/show_duplicates.inc.php +++ b/templates/show_duplicates.inc.php @@ -44,13 +44,10 @@ $web_path = conf('web_path'); <input type="checkbox" name="auto" value="1" <?php echo $auto_check; ?>/><?php echo _('Select Best Guess'); ?> </td> </tr> - <tr> - <td></td> - <td> - <input type="hidden" name="action" value="search" /> - <input type="submit" value="<?php echo _('Search'); ?>" /> - </td> - </tr> </table> +<div class="formValidation"> + <input type="hidden" name="action" value="search" /> + <input type="submit" value="<?php echo _('Search'); ?>" /> +</div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_edit_access.inc.php b/templates/show_edit_access.inc.php index 06a0feb8..4e9bf68a 100644 --- a/templates/show_edit_access.inc.php +++ b/templates/show_edit_access.inc.php @@ -78,9 +78,9 @@ </select> </td> </tr> -<tr> - <td colspan="2"><input type="submit" value="<?php echo _('Update'); ?>" /></td> -</tr> </table> +<div class="formValidation"> + <input type="submit" value="<?php echo _('Update'); ?>" /> +</div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_edit_album.inc.php b/templates/show_edit_album.inc.php index 3fa7fd20..ca657672 100644 --- a/templates/show_edit_album.inc.php +++ b/templates/show_edit_album.inc.php @@ -41,12 +41,10 @@ <input type="checkbox" name="flag" value="1" checked="checked" /> <?php echo _('Flag for Retagging'); ?> </td> </tr> -<tr class="<?php echo flip_class(); ?>"> - <td colspan="2"> +</table> +<div class="formValidation"> <input type="hidden" name="album_id" value="<?php echo $album->id; ?>" /> <input type="submit" value="<?php echo _('Update Album'); ?>" /> - </td> -</tr> -</table> +</div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_edit_artist.inc.php b/templates/show_edit_artist.inc.php index f3f5119a..50e256c8 100644 --- a/templates/show_edit_artist.inc.php +++ b/templates/show_edit_artist.inc.php @@ -35,12 +35,10 @@ <input type="checkbox" name="flag" value="1" checked="checked" /> <?php echo _('Flag for Retagging'); ?> </td> </tr> -<tr class="<?php echo flip_class(); ?>"> - <td colspan="2"> - <input type="hidden" name="artist_id" value="<?php echo $artist->id; ?>" /> - <input type="submit" value="<?php echo _('Update Album'); ?>" /> - </td> -</tr> </table> +<div class="formValidation"> + <input type="hidden" name="artist_id" value="<?php echo $artist->id; ?>" /> + <input type="submit" value="<?php echo _('Update Artist'); ?>" /> +</div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_edit_catalog.inc.php b/templates/show_edit_catalog.inc.php index 867daa1c..baf9db79 100644 --- a/templates/show_edit_catalog.inc.php +++ b/templates/show_edit_catalog.inc.php @@ -61,14 +61,11 @@ <input size="60" type="text" name="sort_pattern" value="<?php echo scrub_out($catalog->sort_pattern);?>" /> </td> </tr> -<tr> - <td> </td> - <td> +</table> +<div class="formValidation"> <input type="hidden" name="catalog_id" value="<?php echo scrub_out($catalog->id); ?>" /> <input type="hidden" name="action" value="update_catalog_settings" /> <input type="submit" value="<?php echo _('Save Catalog Settings'); ?>" /> - </td> -</tr> -</table> +</div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_edit_song.inc.php b/templates/show_edit_song.inc.php index b7dbeb6b..028d2933 100644 --- a/templates/show_edit_song.inc.php +++ b/templates/show_edit_song.inc.php @@ -81,14 +81,11 @@ <input type="checkbox" name="flag" value="1" checked="checked" /> <?php echo _('Flag for Retagging'); ?> </td> </tr> -<tr class="<?php echo flip_class(); ?>"> - <td> </td> - <td> +</table> +<div class="formValidation"> <input type="hidden" name="song_id" value="<?php echo $song->id; ?>" /> <input type="hidden" name="action" value="edit_song" /> <input type="submit" value="<?php echo _('Update Song'); ?>" /> - </td> -</tr> -</table> +</div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_edit_user.inc.php b/templates/show_edit_user.inc.php index 60b0e95f..45dcb890 100644 --- a/templates/show_edit_user.inc.php +++ b/templates/show_edit_user.inc.php @@ -77,13 +77,11 @@ </select> </td> </tr> -<tr> - <td colspan="2"> +</table> +<div class="formValidation"> <input type="hidden" name="action" value="update_user" /> <input type="submit" value="<?php echo _('Update User'); ?>" /> <input type="hidden" name="user_id" value="<?php echo $client->id; ?>" /> - </td> -</tr> -</table> +</div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_flag.inc.php b/templates/show_flag.inc.php index 5648b889..715a8873 100644 --- a/templates/show_flag.inc.php +++ b/templates/show_flag.inc.php @@ -64,15 +64,12 @@ switch ($type) { <td><?php echo _('Comment'); ?>:</td> <td><input name="comment" type="text" size="50" maxlength="128" value="" /></td> </tr> -<tr class="<?php echo flip_class(); ?>"> - <td> </td> - <td> +</table> +<div class="formValidation"> <input type="submit" value="<?php echo _('Flag'); ?>" /> <input type="hidden" name="id" value="<?php echo scrub_out($_REQUEST['id']); ?>" /> <input type="hidden" name="action" value="flag" /> <input type="hidden" name="type" value="<?php echo scrub_out($type); ?>" /> - </td> -</tr> -</table> +</div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_flagged.inc.php b/templates/show_flagged.inc.php index ec8c7cd0..e8eb0b72 100644 --- a/templates/show_flagged.inc.php +++ b/templates/show_flagged.inc.php @@ -68,15 +68,6 @@ $web_path = Config::get('web_path'); <td colspan="7" class="error"><?php echo _('No Records Found'); ?></td> </tr> <?php } ?> -<tr class="<?php echo flip_class(); ?>"> - <td colspan="7"> - <select name="update_action"> - <option value="reject"><?php echo _('Reject'); ?></option> - <option value="approve"><?php echo _('Approve'); ?></option> - </select> - <input class="button" type="submit" value="<?php echo _('Update'); ?>" /> - </td> -</tr> <tr class="th-bottom"> <th class="cel_select"><a href="#" onclick="check_select('song'); return false;"><?php echo _('Select'); ?></a></th> <th class="cel_object"><?php echo _('Object'); ?></th> @@ -87,9 +78,16 @@ $web_path = Config::get('web_path'); <th class="cel_action"><?php echo _('Action'); ?></th> </tr> </table> +<div class="formValidation"> + <select name="update_action"> + <option value="reject"><?php echo _('Reject'); ?></option> + <option value="approve"><?php echo _('Approve'); ?></option> + </select> + <input class="button" type="submit" value="<?php echo _('Update'); ?>" /> +</div> </form> -<div class="text-action"> -<a href="<?php echo $web_path; ?>/admin/flag.php?action=show_flagged"> - <?php echo _('Show All'); ?>... -</a> +<div> + <a class="button" href="<?php echo $web_path; ?>/admin/flag.php?action=show_flagged"> + <?php echo _('Show All'); ?>... + </a> </div> diff --git a/templates/show_get_albumart.inc.php b/templates/show_get_albumart.inc.php index 67335e14..df863e50 100644 --- a/templates/show_get_albumart.inc.php +++ b/templates/show_get_albumart.inc.php @@ -55,15 +55,12 @@ <input type="file" size="40" id="file" name="file" value="" /> </td> </tr> - -<tr> - <td> +</table> +<div class="formValidation"> <input type="hidden" name="action" value="find_art" /> <input type="hidden" name="album_id" value="<?php echo $album->id; ?>" /> - <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo Config::get('max_upload_size'); ?>" /> + <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo Config::get('max_upload_size'); ?>" /> <input type="submit" value="<?php echo _('Get Art'); ?>" /> - </td> -</tr> -</table> +</div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_import_playlist.inc.php b/templates/show_import_playlist.inc.php index d80e167f..4f469442 100644 --- a/templates/show_import_playlist.inc.php +++ b/templates/show_import_playlist.inc.php @@ -20,8 +20,8 @@ */ ?> -<form method="post" name="import_playlist" action="<?php echo conf('web_path'); ?>/playlist.php" enctype="multipart/form-data"> <?php show_box_top(_('Importing a Playlist from a File')); ?> +<form method="post" name="import_playlist" action="<?php echo conf('web_path'); ?>/playlist.php" enctype="multipart/form-data"> <table cellpadding="0" cellspacing="0"> <tr> <td> @@ -41,13 +41,11 @@ </select> </td> </tr> -<tr> - <td> </td> - <td> +</table> +<div class="formValidation"> <input type="hidden" name="action" value="import_playlist" /> <input type="submit" value="<?php echo _('Import Playlist'); ?>" /> - </td> -</tr> -</table> -<?php show_box_bottom(); ?> +</div> </form> +<?php show_box_bottom(); ?> + diff --git a/templates/show_ip_history.inc.php b/templates/show_ip_history.inc.php index 0e30c93f..9b266772 100644 --- a/templates/show_ip_history.inc.php +++ b/templates/show_ip_history.inc.php @@ -21,11 +21,11 @@ */ ?> <?php show_box_top($working_user->fullname . ' ' . _('IP History')); ?> -<div class="text-action"> +<div> <?php if (isset($_REQUEST['all'])){ ?> - <a href="<?php echo Config::get('web_path')?>/admin/users.php?action=show_ip_history&user_id=<?php echo $working_user->id?>"><?php echo _('Show Unique'); ?>...</a> + <a class="button" href="<?php echo Config::get('web_path')?>/admin/users.php?action=show_ip_history&user_id=<?php echo $working_user->id?>"><?php echo _('Show Unique'); ?>...</a> <?php }else{ ?> - <a href="<?php echo Config::get('web_path')?>/admin/users.php?action=show_ip_history&user_id=<?php echo $working_user->id?>&all"><?php echo _('Show All'); ?>...</a> + <a class="button" href="<?php echo Config::get('web_path')?>/admin/users.php?action=show_ip_history&user_id=<?php echo $working_user->id?>&all"><?php echo _('Show All'); ?>...</a> <?php }?> </div> <table class="tabledata" cellpadding="0" cellspacing="0"> diff --git a/templates/show_list_duplicates.inc.php b/templates/show_list_duplicates.inc.php index f835cf8a..25abeecc 100644 --- a/templates/show_list_duplicates.inc.php +++ b/templates/show_list_duplicates.inc.php @@ -81,9 +81,6 @@ if (count($flags)) { ?> } // end foreach ($flags as $flag) ?> - <tr> - <td colspan="8" class="<?php echo flip_class(); ?>"><input type="submit" value="<?php echo _('Disable Songs'); ?>" /></td> - </tr> <tr class="th-bottom"> <th class="cel_disable"><?php echo _('Disable'); ?></th> <th class="cel_song"><?php echo _('Song'); ?></th> @@ -95,6 +92,9 @@ if (count($flags)) { ?> <th class="cel_filename"><?php echo _('Filename'); ?></th> </tr> </table> + <div class="formValidation"> + <input type="submit" value="<?php echo _('Disable Songs'); ?>" /> + </div> </form> <?php show_box_bottom(); ?> <?php } else { ?> diff --git a/templates/show_localplay.inc.php b/templates/show_localplay.inc.php index 2cac12bd..281a925c 100644 --- a/templates/show_localplay.inc.php +++ b/templates/show_localplay.inc.php @@ -29,7 +29,7 @@ $localplay = init_localplay(); <td valign="top"> <strong><?php echo _('Actions'); ?>:</strong><br /> <?php if ($localplay->has_function('delete_all')) { ?> - <div class="text-action"><a href="<?php echo $web_path; ?>/localplay.php?action=delete_all"><?php echo _('Clear Playlist'); ?></a></div> + <div><a class="button" href="<?php echo $web_path; ?>/localplay.php?action=delete_all"><?php echo _('Clear Playlist'); ?></a></div> <?php } ?> </td><td> <?php $add_info = "&return=1"; ?> diff --git a/templates/show_localplay_add_instance.inc.php b/templates/show_localplay_add_instance.inc.php index fb95a343..224994c7 100644 --- a/templates/show_localplay_add_instance.inc.php +++ b/templates/show_localplay_add_instance.inc.php @@ -30,11 +30,9 @@ <td><input type="textbox" name="<?php echo $key; ?>" /></td> </tr> <?php } ?> -<tr> - <td colspan="2"> - <input type="submit" value="<?php echo _('Add Instance'); ?>" /> - </td> -</tr> </table> + <div class="formValidation"> + <input type="submit" value="<?php echo _('Add Instance'); ?>" /> + </div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_login_form.inc.php b/templates/show_login_form.inc.php index ea271460..36b38ef0 100644 --- a/templates/show_login_form.inc.php +++ b/templates/show_login_form.inc.php @@ -41,28 +41,45 @@ function focus(){ document.login.username.focus(); } </script> </head> -<body bgcolor="#D3D3D3" onload="focus();"> -<div id="container"> - <h1 onclick="document.location='http://www.ampache.org';" title="<?php echo Config::get('site_title'); ?>" style="cursor:pointer;" ><span><?php echo Config::get('site_title'); ?></span></h1> - <div> - <p id="loginp_0"><?php echo Config::get('site_title'); ?></p> - <form name="login" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ; ?>/login.php" style="Display:inline"> - <p class="loginp_1" id="usernamebox"><label for="username"><?php echo _('Login'); ; ?>:</label> - <input class="text_input" type="text" id="username" name="username" value="<?php echo $_REQUEST['username']; ; ?>" /></p> - <p class="loginp_1" id="passwordbox"><label for="password"><?php echo _('Password'); ; ?>:</label> - <input class="text_input" type="password" id="password" name="password" value="" /></p> - <p class="loginp_1" id="remembermebox"><label for="rememberme"><?php echo _('Remember Me'); ?> </label><input class="check_input" type="checkbox" id="rememberme" name="rememberme" <?php echo $remember_disabled; ?> /></p> +<body id="loginPage" onload="focus();"> +<div id="maincontainer"> + <div id="header"><!-- This is the header --> + <h1 id="headerlogo"> + <a href="http://www.ampache.org"> + <img src="<?php echo Config::get('web_path'); ?><?php echo Config::get('theme_path'); ?>/images/ampache.png" title="<?php echo Config::get('site_title'); ?>" alt="<?php echo Config::get('site_title'); ?>" /> + </a> + </h1> + </div> + <div id="loginbox"> + <h2><?php echo Config::get('site_title'); ?></h2> + <form name="login" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/login.php"> + + <div class="loginfield" id="usernamefield"> + <label for="username"><?php echo _('Login'); ; ?>:</label> + <input class="text_input" type="text" id="username" name="username" value="<?php echo $_REQUEST['username']; ; ?>" /> + </div> + <div class="loginfield" id="passwordfield"> + <label for="password"><?php echo _('Password'); ; ?>:</label> + <input class="text_input" type="password" id="password" name="password" value="" /> + </div> + <div class="loginfield" id="remembermefield"><label for="rememberme"> + <?php echo _('Remember Me'); ?> </label><input type="checkbox" id="rememberme" name="rememberme" <?php echo $remember_disabled; ?> /> + </div> + <?php echo Config::get('login_message'); ?> <?php Error::display('general'); ?> - <p><input class="button" type="submit" value="<?php echo _('Login'); ?>" /></p> - <input type="hidden" name="referrer" value="<?php echo scrub_out($_SERVER['HTTP_REFERRER']); ?>" /> - <input type="hidden" name="action" value="login" /> + + <div class="formValidation"> + <input class="button" id="loginbutton" type="submit" value="<?php echo _('Login'); ?>" /> + <input type="hidden" name="referrer" value="<?php echo scrub_out($_SERVER['HTTP_REFERRER']); ?>" /> + <input type="hidden" name="action" value="login" /> + + <?php if (Config::get('allow_public_registration')) { ?> + <a class="button" id="registerbutton" href="<?php echo Config::get('web_path'); ?>/register.php"><?php echo _('Register'); ?></a> + <?php } // end if (conf('allow_public_registration')) ?> + </div> + </form> - <?php if (Config::get('allow_public_registration')) { ?> - <span class="text-action"> - <a href="<?php echo Config::get('web_path'); ?>/register.php"><?php echo _('Register'); ?></a> - </span> - <?php } // end if (conf('allow_public_registration')) ?> </div> </div> <?php diff --git a/templates/show_mail_users.inc.php b/templates/show_mail_users.inc.php index 3285d70f..a98128a1 100644 --- a/templates/show_mail_users.inc.php +++ b/templates/show_mail_users.inc.php @@ -21,8 +21,8 @@ */ ?> -<form name="mail" method="post" action="<?php echo conf('web_path'); ?>/admin/mail.php" enctype="multipart/form-data"> <?php show_box_top(_('Send E-mail to Users')); ?> +<form name="mail" method="post" action="<?php echo conf('web_path'); ?>/admin/mail.php" enctype="multipart/form-data"> <table> <tr> <td><?php echo _('Mail to'); ?>:</td> @@ -108,13 +108,11 @@ </td> </tr> - <tr> - <td> </td> - <td> +</table> +<div class="formValidation"> <input type="hidden" name="action" value="send_mail" /> <input class="button" type="submit" value="<?php echo _('Send Mail'); ?>" /> - </td> - </tr> -</table> -<?php show_box_bottom(); ?> +</div> </form> +<?php show_box_bottom(); ?> + diff --git a/templates/show_manage_democratic.inc.php b/templates/show_manage_democratic.inc.php index 9cdcdd28..c490d856 100644 --- a/templates/show_manage_democratic.inc.php +++ b/templates/show_manage_democratic.inc.php @@ -51,6 +51,6 @@ show_box_top(_('Manage Democratic Playlists')); ?> <?php } ?> </table> <div> -<span class="text-action"><a href="<?php echo Config::get('web_path'); ?>/democratic.php?action=show_create"><?php echo _('Create New Playlist'); ?></a></span> +<a class="button" href="<?php echo Config::get('web_path'); ?>/democratic.php?action=show_create"><?php echo _('Create New Playlist'); ?></a> </div> <?php show_box_bottom(); ?> diff --git a/templates/show_playlist_edit.inc.php b/templates/show_playlist_edit.inc.php index 1ff9b1ad..7580d7af 100644 --- a/templates/show_playlist_edit.inc.php +++ b/templates/show_playlist_edit.inc.php @@ -23,8 +23,8 @@ $web_path = conf('web_path'); ?> -<form method="post" action="<?php echo $web_path; ?>/playlist.php" enctype="multipart/form-data"> <?php show_box_top(_('Editing Playlist')); ?> +<form method="post" action="<?php echo $web_path; ?>/playlist.php" enctype="multipart/form-data"> <table> <tr> <td><?php echo _('Name'); ?>:</td> @@ -40,14 +40,11 @@ $web_path = conf('web_path'); <input type="radio" name="type" value="private" <?php echo $selected_private; ?>/><?php echo _('Private'); ?><br /> </td> </tr> -<tr> - <td> </td> - <td> +</table> +<div class="formValidation"> <input type="hidden" name="playlist_id" value="<?php echo $playlist->id; ?>" /> <input type="hidden" name="action" value="update_playlist" /> <input type="submit" value="<?php echo _('Update'); ?>" /> - </td> -</tr> -</table> -<?php show_box_bottom(); ?> +</div> </form> +<?php show_box_bottom(); ?> diff --git a/templates/show_preference_admin.inc.php b/templates/show_preference_admin.inc.php index 01cae624..737cadf4 100644 --- a/templates/show_preference_admin.inc.php +++ b/templates/show_preference_admin.inc.php @@ -45,16 +45,14 @@ </td> </tr> <?php } ?> -<tr> - <td colspan="2"> - <input type="hidden" name="action" value="set_preferences" /> - <input type="submit" value="<?php echo _('Update'); ?>" /> - </td> -</tr> <tr class="th-bottom"> <th class="cel_preference"><?php echo _('Preference'); ?></th> <th class="cel_level"><?php echo _('Level'); ?></th> </tr> </table> +<div class="formValidation"> + <input type="hidden" name="action" value="set_preferences" /> + <input type="submit" value="<?php echo _('Update'); ?>" /> +</div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_preference_box.inc.php b/templates/show_preference_box.inc.php index b1964841..c70f48d0 100644 --- a/templates/show_preference_box.inc.php +++ b/templates/show_preference_box.inc.php @@ -26,7 +26,7 @@ if (($GLOBALS['user']->has_access(100) OR !Config::get('use_auth')) AND $_REQUES $is_admin = true; } ?> -<div class="header2"><?php echo $preferences['title']; ?></div> +<h4><?php echo $preferences['title']; ?></h4> <table class="tabledata" cellpadding="0" cellspacing="0"> <colgroup> <col id="col_preference" /> diff --git a/templates/show_preferences.inc.php b/templates/show_preferences.inc.php index aabb5ca4..af331ab4 100644 --- a/templates/show_preferences.inc.php +++ b/templates/show_preferences.inc.php @@ -25,19 +25,21 @@ */ ?> -<?php show_box_top(_('Editing') . ' ' . $fullname . ' ' . _('preferences')); ?> +<?php show_box_top(_('Editing') . ' ' . $fullname . ' ' . _('preferences'),'box box_preferences'); ?> <form method="post" name="preferences" action="<?php echo Config::get('web_path'); ?>/preferences.php?action=update_preferences" enctype="multipart/form-data"> <?php if ($_REQUEST['tab'] != 'account' && $_REQUEST['tab'] != 'modules') { show_preference_box($preferences[$_REQUEST['tab']]); ?> +<div class="formValidation"> <input class="button" type="submit" value="<?php echo _('Update Preferences'); ?>" /> <input type="hidden" name="tab" value="<?php echo scrub_out($_REQUEST['tab']); ?>" /> <input type="hidden" name="method" value="<?php echo scrub_out($_REQUEST['action']); ?>" /> <?php if ($GLOBALS['user']->has_access('100')) { ?> <input type="hidden" name="user_id" value="<?php echo scrub_out($_REQUEST['user_id']); ?>" /> <?php } ?> +</div> <?php } // end if not account if ($_REQUEST['tab'] == 'account') { diff --git a/templates/show_random.inc.php b/templates/show_random.inc.php index 64415570..b0500643 100644 --- a/templates/show_random.inc.php +++ b/templates/show_random.inc.php @@ -19,8 +19,8 @@ */ ?> -<form id="random" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/random.php?action=get_advanced"> <?php show_box_top(_('Play Random Selection')); ?> +<form id="random" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/random.php?action=get_advanced"> <table class="table-data" cellspacing="0" cellpadding="3"> <tr> <td><?php echo _('Item count'); ?></td> @@ -74,14 +74,12 @@ </select> </td> </tr> -<tr> - <td colspan="4"> - <input type="submit" value="<?php echo _('Enqueue'); ?>" /> - </td> -</tr> </table> -<?php show_box_bottom(); ?> +<div class="formValidation"> + <input type="submit" value="<?php echo _('Enqueue'); ?>" /> +</div> </form> +<?php show_box_bottom(); ?> <div id="browse"> <?php if (is_array($object_ids)) { diff --git a/templates/show_search.inc.php b/templates/show_search.inc.php index d69574d9..7aaca49b 100644 --- a/templates/show_search.inc.php +++ b/templates/show_search.inc.php @@ -126,14 +126,10 @@ </select> </td> </tr> -<tr class="<?php echo flip_class(); ?>"> - <td> </td> - <td> +</table> +<div class="formValidation"> <input class="button" type="submit" value="<?php echo _('Search'); ?>" /> <input type="hidden" name="action" value="search" /> - </td> - <td colspan="2"> </td> -</tr> -</table> +</div> </form> <?php show_box_bottom(); ?> diff --git a/themes/classic/images/bg_login_1.jpg b/themes/classic/images/bg_login.jpg Binary files differindex ee10fe66..ee10fe66 100644 --- a/themes/classic/images/bg_login_1.jpg +++ b/themes/classic/images/bg_login.jpg diff --git a/themes/classic/images/bg_login_0.jpg b/themes/classic/images/bg_login_0.jpg Binary files differdeleted file mode 100644 index ea53491c..00000000 --- a/themes/classic/images/bg_login_0.jpg +++ /dev/null diff --git a/themes/classic/templates/default.css b/themes/classic/templates/default.css index dbfe4287..74457687 100644 --- a/themes/classic/templates/default.css +++ b/themes/classic/templates/default.css @@ -73,6 +73,16 @@ input { body { behavior:url("templates/csshover2.htc"); }
/************************************************/
+/* Float Clearer */
+/************************************************/
+/* float clearing for IE6 */
+* html .clearfix{ height: 1%; overflow: visible; }
+/* float clearing for IE7 */
+/**+html .clearfix{ min-height: 1%; }*/
+/* float clearing for everyone else */
+.clearfix:after{ clear: both; content: "."; display: block; height: 0; visibility: hidden; }
+
+/************************************************/
/* XSPF Player */
/************************************************/
.xspf_player {
@@ -81,6 +91,11 @@ body { behavior:url("templates/csshover2.htc"); } }
/************************************************/
+/* Main Container */
+/************************************************/
+#maincontainer{}
+
+/************************************************/
/* Header */
/************************************************/
#header {
@@ -103,6 +118,13 @@ body { behavior:url("templates/csshover2.htc"); } }
/************************************************/
+/* Content block */
+/************************************************/
+#content {
+ margin: 20px 135px 20px 135px;
+}
+
+/************************************************/
/* Footer */
/************************************************/
#footer {
@@ -115,7 +137,7 @@ body { behavior:url("templates/csshover2.htc"); } /************************************************/
/* Buttons */
/************************************************/
-.button, input[type=button], input[type=submit], .text-action a {
+.button, input[type=button], input[type=submit] {
border: 1px solid #f0f0f0;
border-color: #f0f0f0 #a0a0a0 #a0a0a0 #f0f0f0;
background: #d0d0d0;
@@ -125,7 +147,7 @@ body { behavior:url("templates/csshover2.htc"); } text-decoration:none;
cursor: pointer;
}
-a.button{padding:1px}
+a.button{padding:1px 3px;}
/************************************************/
/* Sidebar */
@@ -458,10 +480,18 @@ a.button{padding:1px} }
* html .box-right-bottom {right: expression(-this.parentNode.offsetWidth%2+"px");} /* Fixes an IE6 rounding error */
+
+/* Specific to Info Boxes */
+.info-box .album_art {float:left;margin-right:10px;}
+#information_actions { margin-left:5px; font-size:0.7em; }
+#information_actions h3 { font-size:1.2em; margin:0.2em; }
+
/* Specific boxes */
.box_newest_albums {}
.box_newest_artists {clear:none;}
.box_newest_genres {clear:none;}
+.box_preferences h4 {color:#000;font:bold 14px Verdana, Helvetica, sans-serif;padding:0.8em 0;}
+
/************************************************/
/* Tables (songs lists...) */
@@ -471,10 +501,9 @@ a.button{padding:1px} vertical-align: top;
text-align:center;
}
-.odd, .odd td {
- font-size: 12px;
- border-bottom:1px dotted #c0c0c0;
-}
+
+/* table rows */
+.odd, .odd td,
.even, .even td {
font-size: 12px;
border-bottom:1px dotted #c0c0c0;
@@ -482,35 +511,35 @@ a.button{padding:1px} .even:hover, .odd:hover {
background:#99ccff;
}
+
+/* Misc */
.border { background: #000; }
+.tabledata input, .tabledata select{ margin:2px 0;}
/* specific cells */
.cel_cover{padding:6px;}
.cel_select, .cel_action, .cel_date, .cel_applytoall, .cel_level {text-align:center;}
+/* specific cells : users login state */
+.user_online{background:#0f0;}
+.user_offline{background:#7f0000;}
+.user_disabled{background:#ccc;}
-/* specific boxes */
+/* specific tables */
#recently_played .th-bottom {display:none;}
+.box_preferences .th-bottom {display:none;}
-/************************************************/
-/* Content block */
-/************************************************/
-#content {
- margin: 20px 135px 20px 135px;
-}
/************************************************/
/* Albums of the moment */
/************************************************/
-.random_album
-{
+.random_album{
position:relative;
float:left;
padding:8px;
width:80px;
}
-.random_album .play_album
-{
+.random_album .play_album{
display:none;
}
@@ -550,156 +579,87 @@ a.button{padding:1px} /* List Header */
/************************************************/
.list-header{margin:7px 0; padding:0 4em; text-align:center; font-size: 0.8em;position:relative;}
-.list-header .prev{/*float:left;*/ position:absolute; top:0; left:0;}
-.list-header .next{/*float:right;*/ position:absolute; top:0; right:0;}
+.list-header .prev{position:absolute; top:0; left:0;}
+.list-header .next{position:absolute; top:0; right:0;}
.list-header .selected{background: #e0e0e0;}
.list-header .page-nb{padding:1px;border: 1px solid #ccc;text-decoration: none;}
.list-header .page-nb:hover{background: #d0d0d0;}
/************************************************/
-/* Text Action */
+/* Errors */
/************************************************/
-.text-action, .text-action li {
- list-style: none;
- margin:5px 0;
- padding-left:0px;
-}
-.text-action div {
- text-decoration: underline;
- cursor: pointer;
- display:block;
+.error {
+ color:#903;
}
-.text-action #pt_active {
- background: #000;
- color: #fff;
- border:1px solid #ddd;
+
+.fatalerror {
+ display:table-cell;
+ padding:3px;
+ color:#903;
+ font-weight:bold;
+ font-size:1.2em;
}
/************************************************/
-/* Styles for Header */
-/*(for ampache admin : installation, update...) */
+/* LocalPlay */
/************************************************/
-div#Header{
- height:80px;
- margin-bottom:3px;
-}
-#Header h1 {
- width: 439px;
- height: 84px;
- float: left;
- border:0;
- background: transparent url(../images/bg_login_0.jpg) no-repeat top left;
-}
-#Header h1 span {
- display:none
-}
-#Header h2 {
- float: right;
- margin-top: 75px;
- width: 200px;
- height: 18px;
- background: transparent url(001/h2.gif) no-repeat top left;
-}
-#Header h2 span {
- font-size: 10px;
- margin-left: 10px;
+.lp_box_ctrl, .lp_box_vol {
+ text-align: center; /*for compatibility, may be controlled by themers now*/
}
/************************************************/
/* Styles for Login template */
/************************************************/
-#container{
+#loginPage #maincontainer{
margin:100px auto 0 auto;
width:437px;
font-size:12px;
text-align:center;
}
-#container h1{
- background:url(../images/bg_login_0.jpg) no-repeat;
- height:81px;
- margin-bottom:8px;
-}
-#container h1 span{
- display:none;
-}
-#container div.fatalerror {
- display:block;
- height:auto;
- padding:5px;
- margin:10px;
- background:none;
+#loginPage #header{
+ padding:0;
}
-#container div{
- background:url(../images/bg_login_1.jpg) no-repeat;
- height:285px;
+
+#loginPage #loginbox{
+ background:url(../images/bg_login.jpg) no-repeat;
+ height:292px;
}
-#loginp_0{
- color:#333;
- margin-top:0;
- padding-top:60px;
+#loginPage h2{
+ color:#333;
+ padding-top:60px;
+ font-weight: normal;
}
-.loginp_1{
+.loginfield{
text-align:right;
padding-right:100px;
+ margin: 1em 0;
}
-.loginp_1 label{
- font-weight:bold;
-}
-.loginp_1 input{
- border:1px solid #999;
+.loginfield input.text_input{
+ width:12em;
+ border:1px solid #999;
}
-input.text_input{
-width:12em;
+.loginfield label{
+ font-weight:bold;
}
-.loginp_1 input.check_input{
-margin-right:5em;
+.loginfield #rememberme{
+ margin-right:5em;
+ background:none;
}
-
-/************************************************/
-/* TV Page Related Styles */
-/************************************************/
-#tv_np{
- float:right;
-}
-#tv_left{
- float:left;
- clear:right;
-}
-#tv_playlist{
- clear:both;
+#loginPage div.fatalerror {
+ padding:5px;
+ margin:10px;
}
-
/************************************************/
-/* User Online/Offline style, used in users.php */
+/* Misc */
/************************************************/
-td.user_online{
- background:#0f0;
-}
-td.user_offline {
- background:#7f0000;
-}
-td.user_disabled {
- background:#ccc;
+.formValidation{
+ margin-top:1em;
+ text-align:center;
}
-
-/************************************************/
-/* Additional Information Boxes */
-/************************************************/
-#information_actions {
- margin-left:5px;
- font-size:0.7em;
-}
-#information_actions ul { list-style:none; }
-#information_actions h3 { font-size:1.2em;margin:0.2em; }
-
-
-/************************************************/
-/* Misc */
-/************************************************/
.text-box, .confirmation-box {
display:table-cell;
padding:5px 5px 0 5px;
@@ -719,44 +679,3 @@ td.user_disabled { display: none;
text-indent:-9999em;
}
-
-#mpdpl td {
- padding:0 2px 0 2px;
- text-align:left;
-}
-.header1 {
- color:#000;
- font:bold 18px Verdana, Helvetica, sans-serif;
-}
-.header2 {
- color:#000;
- font:bold 14px Verdana, Helvetica, sans-serif;
-}
-.error {
- color:#903;
-}
-.fatalerror {
- display:table-cell;
- padding:3px;
- color:#903;
- font-weight:bold;
- font-size:1.2em;
-}
-.disabled {
- text-decoration:line-through;
-}
-#maincontainer{}
-.tabledata input, .tabledata select{ margin:2px 0;}
-.display {}
-
-
-.lp_box_ctrl {
- text-align: center; /*for compatibility, may be controlled by themers now*/
-/* padding-top: 5px; */
-}
-.lp_box_vol {
- text-align: center; /*for compatibility, may be controlled by themers now*/
-/* padding-left: 7px; */
-}
-
-.info-box .album_art {float:left;margin-right:10px;}
diff --git a/themes/greysme/images/box_bottom.png b/themes/greysme/images/box_bottom.png Binary files differnew file mode 100644 index 00000000..13e379fc --- /dev/null +++ b/themes/greysme/images/box_bottom.png diff --git a/themes/greysme/images/box_top.png b/themes/greysme/images/box_top.png Binary files differnew file mode 100644 index 00000000..9d60b94b --- /dev/null +++ b/themes/greysme/images/box_top.png diff --git a/themes/greysme/images/punaise-bl.gif b/themes/greysme/images/punaise-bl.gif Binary files differindex dd6b5804..18bd716e 100644 --- a/themes/greysme/images/punaise-bl.gif +++ b/themes/greysme/images/punaise-bl.gif diff --git a/themes/greysme/images/punaise-br.gif b/themes/greysme/images/punaise-br.gif Binary files differindex 97b47e50..e86e1c16 100644 --- a/themes/greysme/images/punaise-br.gif +++ b/themes/greysme/images/punaise-br.gif diff --git a/themes/greysme/images/punaise-tl.gif b/themes/greysme/images/punaise-tl.gif Binary files differindex 58e19e9c..4cc0d7a4 100644 --- a/themes/greysme/images/punaise-tl.gif +++ b/themes/greysme/images/punaise-tl.gif diff --git a/themes/greysme/templates/default.css b/themes/greysme/templates/default.css index 5c3ff090..ee3a02d0 100644 --- a/themes/greysme/templates/default.css +++ b/themes/greysme/templates/default.css @@ -63,7 +63,6 @@ body{ }
ol { list-style-type: decimal-leading-zero; }
-li { list-style-position: inside; }
p { color: #e9ad51; }
a { color: #74718a; text-decoration: none; }
@@ -90,6 +89,16 @@ textarea { background-color: #111; color: #e9ad51; } body { behavior:url("templates/csshover2.htc"); }
/************************************************/
+/* Float Clearer */
+/************************************************/
+/* float clearing for IE6 */
+* html .clearfix{ height: 1%; overflow: visible; }
+/* float clearing for IE7 */
+/* *+html .clearfix{ min-height: 1%; }*/
+/* float clearing for everyone else */
+.clearfix:after{ clear: both; content: "."; display: block; height: 0; visibility: hidden; }
+
+/************************************************/
/* XSPF Player */
/************************************************/
.xspf_player {
@@ -98,15 +107,20 @@ body { behavior:url("templates/csshover2.htc"); } }
/************************************************/
+/* Main Container */
+/************************************************/
+#maincontainer{}
+
+/************************************************/
/* Header */
/************************************************/
#header { padding: 0 0; }
-#headerbox { font-size: 0.9em; text-align: right; color: #e9ad51; position: absolute; top: 20px; right: 0; padding: 3px; }
+#headerbox { font-size: 0.9em; text-align: right; color: #e9ad51; position: absolute; top: 15px; right: 0; padding: 3px; }
#headerbox b { font-weight: normal }
#headerbox a { color: #e9ad51;}
#headerlogo { text-align: center; background: url(../images/ampache_back.gif) 0 0 repeat-x;}
#headerlogo a { }
-#headerbox .box_headerbox {background:transparent;border:none;}
+#headerbox .box-content {background:transparent;border:none;}
#headerbox .box-top{display:none;}
#headerbox .box-bottom{display:none;}
@@ -116,6 +130,13 @@ body { behavior:url("templates/csshover2.htc"); } }
/************************************************/
+/* Content block */
+/************************************************/
+#content {
+ margin:10px 14em 10px 13.5em;
+}
+
+/************************************************/
/* Footer */
/************************************************/
#footer {
@@ -132,7 +153,7 @@ body { behavior:url("templates/csshover2.htc"); } /* Buttons */
/************************************************/
-.button, input[type=button], input[type=submit], .text-action a {
+.button, input[type=button], input[type=submit] {
background:#8b3e38 url(../images/button_back2.png) 0 100% repeat-x !important;
background:#8b3e38;
color:#e9ad51;
@@ -141,14 +162,13 @@ body { behavior:url("templates/csshover2.htc"); } border:0;
cursor:pointer;
}
-.button:hover, input[type=button]:hover, input[type=submit]:hover, div.text-action a:hover {
+.button:hover, input[type=button]:hover, input[type=submit]:hover {
background:#74718a url(../images/button_back2.png) 0 100% repeat-x !important;
background:#74718a;
}
a.button { padding:1px .5em; }
-input[type=checkbox] {border:0;background:none;}
-.text-action span { display:block; }
+input[type=checkbox] { border:0;background:none; }
/************************************************/
/* Sidebar */
@@ -261,7 +281,9 @@ input[type=checkbox] {border:0;background:none;} .alphabet {
background:transparent; /* fix ie bug */
margin: 0.3em auto;
+ font-size: 0.9em;
}
+
.alphabet span.link {
cursor: pointer;
margin: 0;
@@ -419,13 +441,12 @@ input[type=checkbox] {border:0;background:none;} .box-title {
display:block;
color:#8b3e38;
- padding:3px 3px 0 18px;
- background: url(../images/puce.gif) 0 50% no-repeat;
+ padding:3px 13px 0 28px;
+ background: #000 url(../images/puce.gif) 10px 50% no-repeat;
font-size: 1.1em;
font-variant:small-caps;
border-bottom:1px solid #8b3e38;
letter-spacing:0.1em;
- margin: 0 10px;
}
.box-title:first-letter{font-style:italic;}
@@ -436,11 +457,9 @@ input[type=checkbox] {border:0;background:none;} /* Enclosing Boxes Styles */
.box, .info-box {
margin-top: 7px;
- margin-right: 5px;
- background: #050505 url(../images/back-box.gif) 0 0 no-repeat;
+ margin-right: 11px;
+ /*background: url(../images/back-box.gif) 0 0 no-repeat;*/
font-size : 0.9em;
- border: 1px solid #8b3e38;
- border-width: 1px 1px 0 0;
float:left;
clear:left;
height:1%; /* IE6 : Holly Hack comes to rescue once again */
@@ -452,49 +471,60 @@ input[type=checkbox] {border:0;background:none;} background: url(../images/right.gif) top right repeat-y;
}
.box-content {
- padding:8px 12px;
+ padding:12px 12px;
+ background:#000;
}
.box-top {
position:relative;
+ background:transparent url(../images/box_top.png) 0 100% repeat-x !important;
+ background:#000;
}
.box-left-top {
- background: url(../images/punaise-tl.gif) no-repeat;
- height:16px;
- width:16px;
- position:relative;left:-4px;top:-4px;
+ /*background: url(../images/punaise-tl.gif) no-repeat;*/
+ height:15px;
+ width:17px;
+ position:relative;left:/*-8px*/ 30%;top:-3px;
}
.box-right-top {
- background: url(../images/curl.gif) no-repeat;
- height:16px;
- width:20px;
- position:absolute;right:0;top:0;
+ /*background: url(../images/curl.gif) no-repeat;*/
+ background: url(../images/punaise-tl.gif) no-repeat;
+ height:15px;
+ width:17px;
+ position:absolute;left:30%;top:-3px;
}
* html .box-right-top {right: expression(-this.parentNode.offsetWidth%2+"px");} /* Fixes an IE6 rounding error */
.box-bottom {
position:relative;clear:both;
+ background:transparent url(../images/box_bottom.png) 0 0 repeat-x !important;
+ background:#000;
}
.box-left-bottom {
background: url(../images/punaise-bl.gif) no-repeat;
- height:18px;
- width:16px;
- position:relative;left:-6px;top:5px;
+ height:15px;
+ width:17px;
+ position:relative;left:-7px;top:-3px;
}
.box-right-bottom {
background: url(../images/punaise-br.gif) no-repeat;
- height:18px;
- width:20px;
- position:absolute;right:-6px;top:5px;
+ height:15px;
+ width:17px;
+ position:absolute;right:-7px;top:-3px;
}
* html .box-right-bottom {right: expression(-this.parentNode.offsetWidth%2+"px");} /* Fixes an IE6 rounding error */
+
+/* Specific to Info Boxes */
+.info-box .album_art {float:left;margin-right:10px;}
+.info-box th {color:#8b3e38;}
+#information_actions { }
+#information_actions h3 { color:#8b3e38; font-size:1.2em; margin:0.2em; }
+
/* Specific boxes */
.box_newest_albums {}
.box_newest_artists {clear:none;}
.box_newest_genres {clear:none;}
-
-.info-box th {color:#8b3e38;}
-
+.box_preferences h4 {color: #8b3e38;font-size: 1.1em;text-align:center;font-weight: bold;border-bottom:1px solid #8b3e38;padding:1em;}
/************************************************/
/* Tables (songs lists...) */
@@ -507,8 +537,9 @@ input[type=checkbox] {border:0;background:none;} color:#8b3e38;
font-variant:small-caps;
font-weight:normal;
- border-right:1px solid #000;
+ border-right:3px solid #000;
text-align:center;
+ line-height:2em;
}
.tabledata th a {
color:#8b3e38;
@@ -522,55 +553,55 @@ input[type=checkbox] {border:0;background:none;} background-image:url(../images/sort_on.gif);
}
-.tabledata td a{display:block;}
-.tabledata td.cel_add a, .tabledata td.cel_action a{display:inline;}
-
+/* table rows */
.odd, .even { background: url(../images/list_back.png) 0 50% repeat-x !important; background-image: none;}
.odd { background-color: #111 !important;}
.even { }
.odd:hover, .even:hover { background-color: #2b293d !important;}
-.odd td a img, .even td a img {opacity:0.7;}
-.odd td a img:hover, .even td a img:hover {opacity:1;}
-
-.discnb { font-style: italic; font-size:0.8em; }
-
+/* Misc */
.border { background: #000; }
+.tabledata input[type=text], .tabledata select{ margin:1px 0; }
+.discnb { font-style: italic; font-size:0.8em; }
/* specific cells */
.cel_cover{padding:6px;}
.cel_select, .cel_action, .cel_date, .cel_applytoall, .cel_level {text-align:center;}
-
td.cel_track {text-align:right;}
+/* specific cells : users login state */
+.user_online{background:#0f0;}
+.user_offline{background:#7f0000;}
+.user_disabled{background:#ccc;}
+/* specific cells : enlarge links */
+.tabledata td a{display:block;}
+.tabledata td.cel_add a, .tabledata td.cel_action a{display:inline;}
+/* specific cells : image links */
+.odd td a img, .even td a img {opacity:0.7;}
+.odd td a img:hover, .even td a img:hover {opacity:1;}
-/* specific boxes */
+/* specific tables */
#recently_played .th-bottom {display:none;}
-
-/************************************************/
-/* Content block */
-/************************************************/
-#content {
- margin:10px 14em 10px 13.5em;
-}
-
+.box_preferences .th-bottom {display:none;}
/************************************************/
/* Albums of the moment */
/************************************************/
-.random_album
-{
+.random_album{
position:relative;
float:left;
padding:8px;
}
-.random_album .play_album
-{
+.random_album .play_album{
position:absolute;
top:10px;
right:0;
}
+#random_selection .box-content{
+ float:left;
+}
+
/************************************************/
/* Now Playing */
/************************************************/
@@ -598,209 +629,96 @@ td.cel_track {text-align:right;} padding-left:10px;
}
+#now_playing .box-content{
+background:#000;
+ float:left;
+}
+
/************************************************/
/* List Header */
/************************************************/
.list-header{margin:7px 0; padding:0 4em; text-align:center; font-size: 0.9em;position:relative;}
-.list-header .prev{/*float:left;*/ position:absolute; top:0; left:0;}
-.list-header .next{/*float:right;*/ position:absolute; top:0; right:0;}
+.list-header .prev{position:absolute; top:0; left:0;}
+.list-header .next{position:absolute; top:0; right:0;}
.list-header .selected{background:#e9ad51;color:#111;}
.list-header .page-nb{padding:1px;border: 1px solid #111;}
.list-header a:hover{background: transparent; border-color:#e9ad51;}
-
/************************************************/
-/* Text Action */
+/* Errors */
/************************************************/
-
-.text-action {
- border-top:1px dotted #8b3e38;
-}
-.text-action, .text-action li {
- margin: 10px 0 5px 0;
- list-style: none;
- padding: 1px 0 0 0;
- text-wrap: none;
-}
-
-/* See input.button class */
-/*
-.text-action a, .text-action span {
- background: #111;
- border: 1px solid #000;
- padding-left: 2px;
- padding-right: 2px;
- text-decoration: none;
- text-wrap: none;
-}
-*/
-
-.text-action #pt_active {
- background: #000;
- color: #fff;
- border: 1px solid #ddd;
- text-wrap: none;
-}
-
-
-/************************************************/
-/* Tabs (for preferences) */
-/************************************************/
-
-#tablist {
- padding: 4px 0;
- margin: 12px 0 0 0;
-}
-
-#tablist li {
- list-style: none;
- display: inline;
-}
-
-#tablist li a {
- padding: 0 0.5em;
- margin-left: 3px;
- color: #000;
- background: #8b3e38 url(../images/button_back.png) 0 100% repeat-x !important;
- background: #8b3e38;
-
+.error {
+ color: #990033;
}
-#tablist li a:hover {
- border-top: 2px solid #e9ad51;
- color: #e9ad51;
+.fatalerror {
+ padding: 3px;
+ display: table-cell;
+ color: #990033;
+ font-weight:bold;
+ border:2px solid #990033;
}
-#tablist li a#current {
- padding: 5px 0.5em;
- color: #8b3e38;
- background: #111;
- background: #111 !important;
- border:none;
-}
/************************************************/
-/* Styles for Header */
-/*(for ampache admin : installation, update...) */
+/* LocalPlay */
/************************************************/
-
-div#Header {
- height: 80px;
- margin-bottom: 3px;
- padding: 0px;
+.lp_box_ctrl, .lp_box_vol {
+ text-align: center; /*for compatibility, may be controlled by themers now*/
}
-#Header h1 {
- background: transparent url(../themes/classic/images/bg_login_0.jpg) no-repeat top left;
- border: 0;
- width: 439px;
- height: 84px;
- float: left;
-}
-
-#Header h1 span {
- display:none
-}
-
-#Header h2 {
- background: transparent url(001/h2.gif) no-repeat top left;
- margin-top: 75px;
- width: 200px;
- height: 18px;
- float: right;
-}
-
-#Header h2 span {
- font-size: 10px;
- margin-left: 10px;
-}
-
-/************************************************/
-/* User Online/Offline style, used in users.php */
-/************************************************/
-td.user_online{
- background:#0f0;
-}
-td.user_offline {
- background:#7f0000;
-}
-td.user_disabled {
- background:#ccc;
-}
/************************************************/
/* Styles for Login template */
/************************************************/
-
-#container {
+#loginPage #maincontainer {
margin: 100px auto 0px auto;
text-align:center;
}
-#container h1 {
- background:url(../images/ampache_back.gif) 0 0 repeat-x;
-}
-#container h1 span {
- background: url(../images/ampache.gif) 50% 0 no-repeat;
- height: 120px;
- margin-bottom: 8px;
- display:block;
- text-indent:-9000px;
-}
-#container div {
- width:340px;
- margin:auto;
-}
-#loginp_0 {
+#loginPage h2{
color:#111;
font-size:0.8em;
font-style:italic;
+ font-weight:normal;
margin: 0 0 2em 0;
}
-.loginp_1 {
+#loginPage #loginbox{
+ width:340px;
+ margin:auto;
+}
+.loginfield{
text-align:right;
padding-right:100px;
+ margin: 1px 0;
}
-.loginp_1 span {
- font-weight:bold;
-}
-.loginp_1 input {
- border:1px solid #74718a;
+.loginfield input.text_input{
+ width:12em;
+ border:1px solid #74718a;
}
-input.text_input {
- width:12em;
-}
-.loginp_1 input.check_input {
- margin-left:5px;
+
+#loginPage div.fatalerror {
+ padding:5px;
+ margin:10px;
}
+
/************************************************/
/* Misc */
/************************************************/
-.text-box {
- display: table-cell;
- padding:5px;
- margin:0 0 10px 0;
- background-color: #111;
+.formValidation{
+ margin-top:1em;
+ text-align:center;
}
-.confirmation-box {
- padding: 5px 5px 0 5px;
- margin-bottom: 10px;
+.text-box, .confirmation-box {
display: table-cell;
+ padding:5px;
+ margin:0 0 10px 0;
background-color: #111;
- border: 2px solid #000;
-}
-
-.alphabet {
- margin: 10px;
- font-size: 0.9em;
- font-weight: normal;
}
-.display {}
-
#ajax-loading {
position: absolute;
top:106px;
@@ -813,56 +731,3 @@ input.text_input { display: none;
}
-#mpdpl td {
- padding: 0 2px 0 2px;
- text-align: left;
-}
-
-.tabledata input, .tabledata select{ margin:0 0 2px 0;}
-
-.header1 {
- color: #8b3e38;
- background: #111 url(../images/button_back.png) 0 100% repeat-x !important;
- background: #111;
- font-size: 1.4em;
- font-variant:small-caps;
- display:block;
- padding:2px 5px;
-}
-.header2 {
- color: #8b3e38;
- font-size: 1.1em;
- text-align:center;
- font-weight: bold;
- border-bottom:1px solid #8b3e38;
- padding:1em;
-}
-
-.error {
- color: #990033;
-}
-
-.fatalerror {
- padding: 3px;
- display: table-cell;
- color: #990033;
- font-weight:bold;
- border:2px solid #990033;
-}
-
-#container div.fatalerror {
- background:none;
- height:auto;
- padding:5px;
- margin:10px;
- display:block;
-}
-
-.disabled { text-decoration: line-through; }
-
-
-#maincontainer{}
-
-.info-box .album_art {float:left;margin-right:10px;}
-#information_actions ul { list-style:none; }
-#information_actions h3 { color:#8b3e38; font-size:1.2em; margin:0.2em; }
|
