diff options
| -rw-r--r-- | lib/ui.lib.php | 16 | ||||
| -rw-r--r-- | templates/sidebar.inc.php | 2 | ||||
| -rw-r--r-- | templates/sidebar_admin.inc.php | 8 | ||||
| -rw-r--r-- | templates/sidebar_browse.inc.php | 8 | ||||
| -rw-r--r-- | templates/sidebar_home.inc.php | 2 | ||||
| -rw-r--r-- | templates/sidebar_localplay.inc.php | 2 | ||||
| -rw-r--r-- | templates/sidebar_preferences.inc.php | 6 | ||||
| -rw-r--r-- | themes/classic/templates/default.css | 126 |
8 files changed, 94 insertions, 76 deletions
diff --git a/lib/ui.lib.php b/lib/ui.lib.php index 82cd0334..d0d58ac7 100644 --- a/lib/ui.lib.php +++ b/lib/ui.lib.php @@ -127,17 +127,23 @@ function return_referer() { function show_alphabet_list () { $list = array(A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z,1,2,3,4,5,6,7,8,9,"0",_('All')); - - $style_name = "style_" . strtolower($selected); - ${$style_name} = "style=\"font-weight:bold;\""; + + $selected = $_SESSION['browse']['filter']['alpha_match']; + //$style_name = "style_" . strtolower($selected); + //${$style_name} = "style=\"font-weight:bold;\""; + echo "<div class=\"alphabet\">"; foreach ($list as $l) { $style_name = "style_" . strtolower($l); - echo "<span class=\"link\" onclick=\"ajaxPut('". Config::get('ajax_url') ."?action=browse&key=alpha_match&value=$l');return true;\">" . + $class = "link"; + if ($l==$selected) $class .=" active"; + echo "<span class=\"" . $class . "\" onclick=\"ajaxPut('". Config::get('ajax_url') ."?action=browse&key=alpha_match&value=$l');return true;\">" . $l . "</span>\n"; + /* without this, it also works and breaks line when needed only $i++; - if ($i/5 == intval($i/5)) { echo "<br />"; } + if ($i/5 == intval($i/5)) { echo "<br />"; } + */ } echo "</div>"; diff --git a/templates/sidebar.inc.php b/templates/sidebar.inc.php index 7f7f2417..f7aff7c4 100644 --- a/templates/sidebar.inc.php +++ b/templates/sidebar.inc.php @@ -61,7 +61,7 @@ $ajax_url = Config::get('ajax_url'); <!-- <li <?php echo $sidebar_player; ?> onclick="ajaxPut('<?php echo $ajax_url; ?>?action=sidebar&button=player');" > </li> --> -<li id="sb_Logout" class="sb1"> +<li id="sb_tab_logout" class="sb1"> <a href="<?php echo Config::get('web_path'); ?>/logout.php"> <?php echo get_user_icon('logout',_('Logout')); ?> </a> diff --git a/templates/sidebar_admin.inc.php b/templates/sidebar_admin.inc.php index 193776fd..e18260ad 100644 --- a/templates/sidebar_admin.inc.php +++ b/templates/sidebar_admin.inc.php @@ -1,5 +1,5 @@ <ul class="sb2" id="sb_admin"> - <li><?php echo _('Catalogs'); ?> + <li><h4><?php echo _('Catalogs'); ?></h4> <div class="sb3"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_add_catalog"><?php echo _('Add a Catalog'); ?></a></div> </li> <li> @@ -9,7 +9,7 @@ foreach ($catalogs as $catalog_id) { $catalog = new Catalog($catalog_id); ?> - <li> + <li class="sb_admin_catalogs_ctrls"> <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')); ?> @@ -23,14 +23,14 @@ </ul> </li> - <li><?php echo _('User Tools'); ?> + <li><h4><?php echo _('User Tools'); ?></h4> <ul class="sb3" id="sb_admin_ut"> <li id="sb_admin_ut_AddUser"><a href="<?php echo $web_path; ?>/admin/users.php?action=show_add_user"><?php echo _('Add User'); ?></a></li> <li id="sb_admin_ut_BrowseUsers"><a href="<?php echo $web_path; ?>/admin/users.php"><?php echo _('Browse Users'); ?></a></li> </ul> </li> - <li><?php echo _('Other Tools'); ?> + <li><h4><?php echo _('Other Tools'); ?></h4> <ul class="sb3" id="sb_admin_ot"> <li id="sb_admin_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_admin_ot_ClearCatStats"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_stats"><?php echo _('Clear Catalog Stats'); ?></a></li> diff --git a/templates/sidebar_browse.inc.php b/templates/sidebar_browse.inc.php index f040f531..608f98bc 100644 --- a/templates/sidebar_browse.inc.php +++ b/templates/sidebar_browse.inc.php @@ -1,6 +1,6 @@ <?php $ajax_info = Config::get('ajax_url'); $web_path = Config::get('web_path'); ?> <ul class="sb2" id="sb_browse"> - <li><?php echo _('Browse By'); ?> + <li><h4><?php echo _('Browse By'); ?></h4> <?php // Build the selected dealie $text = scrub_in($_REQUEST['action']) . '_ac'; @@ -15,7 +15,7 @@ <li id="sb_browse_bb_RadioStation"><a href="<?php echo $web_path; ?>/browse.php?action=live_stream"><?php echo _('Radio Stations'); ?></a></li> </ul> </li> - <li><?php echo _('Filters'); ?> + <li><h4><?php echo _('Filters'); ?></h4> <div class="sb3"> <?php show_alphabet_list($_REQUEST['alpha_match'],$_REQUEST['action']); ?> <!-- @@ -24,10 +24,10 @@ <input type="checkbox" onclick="ajaxPut('<?php echo $ajax_info; ?>?action=browse&key=rated&value=1');return true;" value="1" /> <?php echo _('Rated'); ?><br /> --> - <input id="unplayedCB" type="checkbox" <?php echo $string = Browse::get_filter('unplayed') ? 'checked="checked"' : ''; ?> /> + <input id="unplayedCB" type="checkbox" <?php echo $string = Browse::get_filter('unplayed') ? 'checked="checked"' : ''; ?>/> <label id="unplayedLabel" for="unplayedCB"><?php echo _('Unplayed'); ?></label><br /> <?php echo Ajax::observe('unplayedCB','click',Ajax::action('?page=browse&action=browse&key=unplayed&value=1','')); ?> - <input id="show_artCB" type="checkbox" <?php echo $string = Browse::get_filter('show_art') ? 'checked="checked"' : ''; ?> /> + <input id="show_artCB" type="checkbox" <?php echo $string = Browse::get_filter('show_art') ? 'checked="checked"' : ''; ?>/> <label id="show_artLabel" for="show_artCB"><?php echo _('Show Art'); ?></label><br /> <?php echo Ajax::observe('show_artCB','click',Ajax::action('?page=browse&action=browse&key=show_art&value=1','')); ?> </div> diff --git a/templates/sidebar_home.inc.php b/templates/sidebar_home.inc.php index 009cee23..4d97d6f9 100644 --- a/templates/sidebar_home.inc.php +++ b/templates/sidebar_home.inc.php @@ -1,5 +1,5 @@ <ul class="sb2" id="sb_home"> - <li><?php echo _('Information'); ?> + <li><h4><?php echo _('Information'); ?></h4> <ul class="sb3" id="sb_home_info"> <li id="sb_home_info_CurrentlyPlaying"><a href="<?php echo $web_path; ?>/index.php"><?php echo _('Currently Playing'); ?></a></li> <li id="sb_home_info_Statistics"><a href="<?php echo $web_path; ?>/stats.php"><?php echo _('Statistics'); ?></a></li> diff --git a/templates/sidebar_localplay.inc.php b/templates/sidebar_localplay.inc.php index 497a0cdd..398f4791 100644 --- a/templates/sidebar_localplay.inc.php +++ b/templates/sidebar_localplay.inc.php @@ -1,3 +1,3 @@ <ul class="sb2" id="sb_localplay"> - <li><?php echo _('Localplay'); ?></li> + <li><h4><?php echo _('Localplay'); ?></h4></li> </ul> diff --git a/templates/sidebar_preferences.inc.php b/templates/sidebar_preferences.inc.php index 6408cc70..a0074d16 100644 --- a/templates/sidebar_preferences.inc.php +++ b/templates/sidebar_preferences.inc.php @@ -1,5 +1,5 @@ <ul class="sb2" id="sb_preferences"> - <li><?php echo _('Sections'); ?> + <li><h4><?php echo _('Sections'); ?></h4> <ul class="sb3" id="sb_preferences_sections"> <li id="sb_preferences_sections_Interface"><a href="<?php echo $web_path; ?>/preferences.php?tab=interface"><?php echo _('Interface'); ?></a></li> <li id="sb_preferences_sections_Playlist"><a href="<?php echo $web_path; ?>/preferences.php?tab=playlist"><?php echo _('Playlist'); ?></a></li> @@ -9,7 +9,7 @@ </ul> </li> <?php if ($GLOBALS['user']->has_access('100')) { ?> - <li><?php echo _('Server Config'); ?> + <li><h4><?php echo _('Server Config'); ?></h4> <ul class="sb3" id="sb_preferences_sc"> <li id="sb_preferences_sc_Interface"><a href="<?php echo $web_path; ?>/preferences.php?action=admin&tab=interface"><?php echo _('Interface'); ?></a></li> <li id="sb_preferences_sc_Playlist"><a href="<?php echo $web_path; ?>/preferences.php?action=admin&tab=playlist"><?php echo _('Playlist'); ?></a></li> @@ -18,7 +18,7 @@ <li id="sb_preferences_sc_System"><a href="<?php echo $web_path; ?>/preferences.php?action=admin&tab=system"><?php echo _('System'); ?></a></li> </ul> </li> -<li><?php echo _('Modules'); ?> +<li><h4><?php echo _('Modules'); ?></h4> <ul class="sb3" id="sb_Modules"> <li id="sb_preferences_mo_localplay"><a href="<?php echo $web_path; ?>/admin/modules.php?action=show_localplay"><?php echo _('Localplay Modules'); ?></a></li> <li id="sb_preferences_mo_plugins"><a href="<?php echo $web_path; ?>/admin/modules.php?action=show_plugins"><?php echo _('Available Plugins'); ?></a></li> diff --git a/themes/classic/templates/default.css b/themes/classic/templates/default.css index f7f0ffb0..b08b4f30 100644 --- a/themes/classic/templates/default.css +++ b/themes/classic/templates/default.css @@ -207,77 +207,67 @@ h3#content_title span { position:absolute; left:0px; top:87px; - width:133px; + width:120px; + padding-top:28px; + background:#c0c0c0 url(../images/sidebar_top.jpg) no-repeat; + font-size:0.9em; } -#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 span:hover { - background: #fff; -} - +#sidebar select { width: 95%; } +#sidebar input { vertical-align:middle; background:#fff; } +#sidebar ul { list-style:none; } +#sidebar a { text-decoration:none; } -#sidebar span.link { - display:inline; - text-decoration:none; - color: #000; - margin: 0 5px; - font-family: monospace, Courier, Georgia; -} /* For sidebar tabs */ +/********************/ +#sidebar-tabs{ + border-top:1px solid #8b8b8b; +} + #sidebar-tabs li.sb1 { float: left; padding:2px; - border: 1px solid #fff; - background:#fff; + background: #c0c0c0; } #sidebar-tabs li.active { - background-color:#c0c0c0; - border:1px solid #c0c0c0; + background: #fff; +} +#sidebar-tabs li.active img{ + margin-top:12px;position:relative;z-index:2; + /*position:absolute;left:10px;top:5px;*/ } /* Tabs content */ +/****************/ #sidebar-page { position:absolute; left:0; - top:26px; - background-color:#c0c0c0; + top:52px; + background: #fff url(../images/bottom.gif) 0 100% repeat-x; + padding-bottom:0.5em; + border-right:2px solid #c0c0c0; font-size: 0.8em; - width:133px; + width:118px; } #sidebar-page ul.sb2 { - padding:5px 8px; + padding:2px 4px; } #sidebar-page ul.sb2 li{ font-weight:bold; - margin-top:0.3em; - padding-bottom: 0.3em; + margin:1em auto; + padding-bottom: 0.5em; border-bottom: 1px solid #666; } +#sidebar-page ul.sb2 h4{ padding-bottom: 0.5em; } -#sidebar-page .sb3 { - margin-left:4px; +#sidebar-page ul.sb3, #sidebar-page div.sb3 { + font-size:0.9em; + margin-left:2px; font-weight:normal; + color:#5b5b5b; } +#sidebar-page .sb3 a{ color:#5b5b5b; } #sidebar-page ul.sb3 li{ margin:0; padding:0; @@ -285,21 +275,53 @@ h3#content_title span { font-weight:normal; } * html #sidebar-page ul.sb3 li{display:inline;} /* fix ie6 */ +#sidebar-page .sb3 a{ padding:0.1em;border-bottom:1px dotted #c0c0c0;} #sidebar-page a{ display:block; } #sidebar-page a:hover{ - background:#fff; + background:#8b8b8b; + color:#fff; } + /* SIDEBAR : Home */ +/******************/ + /* SIDEBAR : Browse */ +/********************/ +.alphabet { + background:transparent; /* fix ie bug */ + font-size:0.95em; + font-weight:normal; + margin: 0.3em auto; + color:#5b5b5b; +} +.alphabet span.link { + cursor: pointer; + margin: 0; + padding:0 5px; + font-family: monospace, Courier, Georgia; +} +.alphabet span.active{ background:#5b5b5b; color:#fff; } +.alphabet span.link:hover { + background: #8b8b8b; + color:#fff; +} + /* SIDEBAR : Search */ +/********************/ + /* SIDEBAR : Preferences */ +/*************************/ /* SIDEBAR : Admin */ -#sb_admin_catalogs a{ - display:inline; +/*******************/ +#sb_admin_catalogs li.sb_admin_catalogs_ctrls img {margin:0;} +#sb_admin_catalogs li.sb_admin_catalogs_ctrls a{ + display:inline; + padding:0; + border:none; } @@ -639,16 +661,6 @@ td.user_disabled { background:#bbb; border:2px solid #000; } -.alphabet { - margin:10px; - background:transparent; /* fix ie bug */ - font-size:10px; - font-weight:normal; -} -.alphabet span { - cursor: pointer; - color: #003399; -} #mpdpl td { padding:0 2px 0 2px; |