diff options
| -rw-r--r-- | templates/sidebar_admin.inc.php | 18 | ||||
| -rw-r--r-- | templates/sidebar_browse.inc.php | 16 | ||||
| -rw-r--r-- | templates/sidebar_home.inc.php | 12 | ||||
| -rw-r--r-- | templates/sidebar_preferences.inc.php | 24 | ||||
| -rw-r--r-- | themes/classic/templates/default.css | 86 |
5 files changed, 81 insertions, 75 deletions
diff --git a/templates/sidebar_admin.inc.php b/templates/sidebar_admin.inc.php index 4ad00af1..c93ca1e0 100644 --- a/templates/sidebar_admin.inc.php +++ b/templates/sidebar_admin.inc.php @@ -1,11 +1,13 @@ <h4><?php echo _('Catalogs'); ?></h4> <span><a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_add_catalog"><?php echo _('Add a Catalog'); ?></a></span> <hr /> +<ul id="sb_Catalogs"> <?php $catalogs = Catalog::get_catalog_ids(); foreach ($catalogs as $catalog_id) { $catalog = new Catalog($catalog_id); ?> +<li> <strong><a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_customize_catalog"><?php echo $catalog->name; ?></a></strong> <a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=show_delete_catalog&catalog_id=<?php echo $catalog->id; ?>"> <?php echo get_user_icon('delete',_('Delete Catalog')); ?> @@ -14,16 +16,22 @@ <a href="<?php echo $web_path; ?>/admin/catalog.php?action=add_to_catalog&catalogs[]=<?php echo $catalog->id; ?>"><?php echo _('Add'); ?></a> | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=update_catalog&catalogs[]=<?php echo $catalog->id; ?>"><?php echo _('Verify'); ?></a> | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=clean_catalog&catalogs[]=<?php echo $catalog->id; ?>"><?php echo _('Clean'); ?></a> +</li> <?php } // end foreach catalogs ?> +</ul> <hr /> <h4><?php echo _('User Tools'); ?></h4> -<span><a href="<?php echo $web_path; ?>/admin/users.php?action=show_add_user"><?php echo _('Add User'); ?></a></span> -<span><a href="<?php echo $web_path; ?>/admin/users.php"><?php echo _('Browse Users'); ?></a></span> +<ul id="sb_UserTools"> +<li id="sb_UT_AddUser"><a href="<?php echo $web_path; ?>/admin/users.php?action=show_add_user"><?php echo _('Add User'); ?></a></li> +<li id="sb_UT_BrowseUsers"><a href="<?php echo $web_path; ?>/admin/users.php"><?php echo _('Browse Users'); ?></a></li> +</ul> <hr /> <h4><?php echo _('Other Tools'); ?></h4> -<span><a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_now_playing"><?php echo _('Clear Now Playing'); ?></a></span> -<span><a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_stats"><?php echo _('Clear Catalog Stats'); ?></a></span> -<span><a href="<?php echo $web_path; ?>/admin/catalog.php?action=gather_album_art"><?php echo _('Gather Album Art'); ?></a></span> +<ul id="sb_OtherTools"> +<li id="sb_OT_ClearNowPlaying"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_now_playing"><?php echo _('Clear Now Playing'); ?></a></li> +<li id="sb_OT_ClearCatStats"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_stats"><?php echo _('Clear Catalog Stats'); ?></a></li> +<li id="sb_OT_GatherArt"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=gather_album_art"><?php echo _('Gather Album Art'); ?></a></li> +</ul> <hr /> diff --git a/templates/sidebar_browse.inc.php b/templates/sidebar_browse.inc.php index 01bedb4c..82c7902a 100644 --- a/templates/sidebar_browse.inc.php +++ b/templates/sidebar_browse.inc.php @@ -5,11 +5,13 @@ $text = scrub_in($_REQUEST['action']) . '_ac'; ${$text} = ' selected="selected"'; ?> -<span><a href="<?php echo $web_path; ?>/browse.php?action=song"><?php echo _('Song Title'); ?></a></span> -<span><a href="<?php echo $web_path; ?>/browse.php?action=album"><?php echo _('Albums'); ?></a></span> -<span><a href="<?php echo $web_path; ?>/browse.php?action=artist"><?php echo _('Artist'); ?></a></span> -<span><a href="<?php echo $web_path; ?>/browse.php?action=genre"><?php echo _('Genre'); ?></a></span> -<span><a href="<?php echo $web_path; ?>/browse.php?action=live_stream"><?php echo _('Radio Stations'); ?></a></span> +<ul id="sb_BrowseBy"> +<li id="sb_BB_SongTitle"><a href="<?php echo $web_path; ?>/browse.php?action=song"><?php echo _('Song Title'); ?></a></li> +<li id="sb_BB_Album"><a href="<?php echo $web_path; ?>/browse.php?action=album"><?php echo _('Albums'); ?></a></li> +<li id="sb_BB_Artist"><a href="<?php echo $web_path; ?>/browse.php?action=artist"><?php echo _('Artist'); ?></a></li> +<li id="sb_BB_Genre"><a href="<?php echo $web_path; ?>/browse.php?action=genre"><?php echo _('Genre'); ?></a></li> +<li id="sb_BB_RadioStation"><a href="<?php echo $web_path; ?>/browse.php?action=live_stream"><?php echo _('Radio Stations'); ?></a></li> +</ul> <hr /> <h4><?php echo _('Filters'); ?></h4> <?php show_alphabet_list($_REQUEST['alpha_match'],$_REQUEST['action']); ?> @@ -22,6 +24,6 @@ <input type="checkbox" onclick="ajaxPut('<?php echo $ajax_info; ?>?action=browse&key=rated&value=1');return true;" value="1" /> <?php echo _('Rated'); ?><br /> --> -<input type="checkbox" onclick="ajaxPut('<?php echo $ajax_info; ?>?action=browse&key=unplayed&value=1');return true;" value="1" /> - <?php echo _('Unplayed'); ?><br /> +<input id="unplayedCB" type="checkbox" onclick="ajaxPut('<?php echo $ajax_info; ?>?action=browse&key=unplayed&value=1');return true;" value="1" /> + <label id="unplayedLabel" for="unplayedCB"><?php echo _('Unplayed'); ?></label><br /> <hr /> diff --git a/templates/sidebar_home.inc.php b/templates/sidebar_home.inc.php index 24b0f0c0..338b5cb2 100644 --- a/templates/sidebar_home.inc.php +++ b/templates/sidebar_home.inc.php @@ -1,9 +1,11 @@ <h4><?php echo _('Information'); ?></h4> -<span><a href="<?php echo $web_path; ?>/index.php"><?php echo _('Currently Playing'); ?></a></span> -<span><a href="<?php echo $web_path; ?>/stats.php"><?php echo _('Statistics'); ?></a></span> -<span><a href="<?php echo $web_path; ?>/radio.php?action=show_create"><?php echo _('Add Radio Station'); ?></a></span> +<ul id="sb_Information"> +<li id="sb_Info_CurrentlyPlaying"><a href="<?php echo $web_path; ?>/index.php"><?php echo _('Currently Playing'); ?></a></li> +<li id="sb_Info_Statistics"><a href="<?php echo $web_path; ?>/stats.php"><?php echo _('Statistics'); ?></a></li> +<li id="sb_Info_AddStationRadio"><a href="<?php echo $web_path; ?>/radio.php?action=show_create"><?php echo _('Add Radio Station'); ?></a></li> +</ul> <hr /> -<div id="sidebar_subsearch"> +<div id="sb_Subsearch"> <form name="search" method="post" action="<?php echo $web_path; ?>/search.php" enctype="multipart/form-data" style="Display:inline"> <input type="text" name="search_string" value="" size="5" /> <input class="smallbutton" type="submit" value="<?php echo _('Search'); ?>" /> @@ -45,7 +47,7 @@ <hr /> --> */ ?> <h4><?php echo _('Playlists'); ?></h4> -<span><a href="<?php echo $web_path; ?>/playlist.php?action=show_all"><?php echo _('View All'); ?></a></span> +<a id="sb_ViewAll" href="<?php echo $web_path; ?>/playlist.php?action=show_all"><?php echo _('View All'); ?></a> <hr /> <div style="left-padding:5px;"> <?php diff --git a/templates/sidebar_preferences.inc.php b/templates/sidebar_preferences.inc.php index 8b254776..774e5b8a 100644 --- a/templates/sidebar_preferences.inc.php +++ b/templates/sidebar_preferences.inc.php @@ -1,16 +1,20 @@ <h4><?php echo _('Sections'); ?></h4> -<span><a href="<?php echo $web_path; ?>/preferences.php?tab=interface"><?php echo _('Interface'); ?></a></span> -<span><a href="<?php echo $web_path; ?>/preferences.php?tab=playlist"><?php echo _('Playlist'); ?></a></span> -<span><a href="<?php echo $web_path; ?>/preferences.php?tab=streaming"><?php echo _('Streaming'); ?></a></span> -<span><a href="<?php echo $web_path; ?>/preferences.php?tab=options"><?php echo _('Options'); ?></a></span> -<span><a href="<?php echo $web_path; ?>/preferences.php?tab=account"><?php echo _('Account'); ?></a></span> +<ul id="sb_Preferences"> +<li id="sb_Pref_Interface"><a href="<?php echo $web_path; ?>/preferences.php?tab=interface"><?php echo _('Interface'); ?></a></li> +<li id="sb_Pref_Playlist"><a href="<?php echo $web_path; ?>/preferences.php?tab=playlist"><?php echo _('Playlist'); ?></a></li> +<li id="sb_Pref_Streaming"><a href="<?php echo $web_path; ?>/preferences.php?tab=streaming"><?php echo _('Streaming'); ?></a></li> +<li id="sb_Pref_Options"><a href="<?php echo $web_path; ?>/preferences.php?tab=options"><?php echo _('Options'); ?></a></li> +<li id="sb_Pref_Account"><a href="<?php echo $web_path; ?>/preferences.php?tab=account"><?php echo _('Account'); ?></a></li> +</ul> <hr /> <?php if ($GLOBALS['user']->has_access('100')) { ?> <h4><?php echo _('Server Config'); ?></h4> -<span><a href="<?php echo $web_path; ?>/preferences.php?action=admin&tab=interface"><?php echo _('Interface'); ?></a></span> -<span><a href="<?php echo $web_path; ?>/preferences.php?action=admin&tab=playlist"><?php echo _('Playlist'); ?></a></span> -<span><a href="<?php echo $web_path; ?>/preferences.php?action=admin&tab=streaming"><?php echo _('Streaming'); ?></a></span> -<span><a href="<?php echo $web_path; ?>/preferences.php?action=admin&tab=options"><?php echo _('Options'); ?></a></span> -<span><a href="<?php echo $web_path; ?>/preferences.php?action=admin&tab=system"><?php echo _('System'); ?></a></span> +<ul id="sb_ServerConfig"> +<li id="sb_SC_Interface"><a href="<?php echo $web_path; ?>/preferences.php?action=admin&tab=interface"><?php echo _('Interface'); ?></a></li> +<li id="sb_SC_Playlist"><a href="<?php echo $web_path; ?>/preferences.php?action=admin&tab=playlist"><?php echo _('Playlist'); ?></a></li> +<li id="sb_SC_Streaming"><a href="<?php echo $web_path; ?>/preferences.php?action=admin&tab=streaming"><?php echo _('Streaming'); ?></a></li> +<li id="sb_SC_Options"><a href="<?php echo $web_path; ?>/preferences.php?action=admin&tab=options"><?php echo _('Options'); ?></a></li> +<li id="sb_SC_System"><a href="<?php echo $web_path; ?>/preferences.php?action=admin&tab=system"><?php echo _('System'); ?></a></li> +</ul> <hr /> <?php } ?> diff --git a/themes/classic/templates/default.css b/themes/classic/templates/default.css index e0924543..b3f074d9 100644 --- a/themes/classic/templates/default.css +++ b/themes/classic/templates/default.css @@ -198,53 +198,50 @@ h3#content_title span { position:absolute; left:0px; top:87px; - width:133px; + width:133px; } #sidebar select { width: 95%; } +#sidebar ul { + list-style:none; +} +#sidebar a { + text-decoration:none; +} +/* #sidebar span { display:block; text-decoration:none; margin-left:5px; margin-right:5px; -} -#sidebar a { - text-decoration:none; -} +} */ + + #sidebar span:hover { background: #fff; } + #sidebar span.link { display:inline; text-decoration:none; color: #000; + margin: 0 5px; font-family: monospace, Courier, Georgia; } -#sidebar li { - float: left; - clear: both; - display: inline; /* IE6 Patch */ - position: relative; - width: 13em; - width: /**/11.5em; /* Only IE5.5 can't see this */ - border: 1px solid #8b8b8b; - border-right: 4px solid #b4b4b4; - background:#fff; -} - /* For sidebar tabs */ #sidebar-tabs li { - clear: none; - width: auto; + float: left; padding:2px; - border: 1px solid #ffffff; -} + border: 1px solid #fff; + background:#fff; + +} #sidebar-tabs li.active { background-color:#c0c0c0; border:1px solid #c0c0c0; @@ -252,37 +249,30 @@ h3#content_title span { #sidebar-page { clear: left; background-color:#c0c0c0; - padding-left:5px; + padding: 0 5px 0 8px; font-size: 0.8em; } +#sidebar-page h4{ + margin-left:-4px; +} +#sidebar-page ul { +} +#sidebar-page a{ + display:block; +} +#sidebar-page a:hover{ + background:#fff; +} +/* SIDEBAR : Home */ +/* SIDEBAR : Browse */ +/* SIDEBAR : Search */ +/* SIDEBAR : Preferences */ +/* SIDEBAR : Admin */ +#sb_Catalogs a{ + display:inline; +} -/* Menu Elements Display (icons, visibility...) */ -#sidebar_home a { } -#sidebar_admin a { } -#sidebar_prefs a { } -#sidebar_browse a { } -#sidebar_plists a { } -#sidebar_stats a { } -#sidebar_search a { } -#sidebar #sidebar_subsearch { } -#sidebar_random a { } -#sidebar_form { } -#sidebar_localplay a { } -#sidebar_localplay_ctrl { } -#sidebar_logout a { } - -#sidebar_admin_users a { } -#sidebar_admin_mail_users a { } -#sidebar_admin_catalog a { } -#sidebar_admin_config a { } -#sidebar_admin_access_list a { } - -#sidebar_browse_albums a { } -#sidebar_browse_artists a { } -#sidebar_browse_genre a { } -#sidebar_browse_song_title a { } -#sidebar_browse_lists a { } /************************************************/ |