summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/footer.inc.php1
-rw-r--r--templates/header.inc.php4
-rw-r--r--templates/rightbar.inc.php57
-rw-r--r--templates/show_box_bottom.inc.php16
-rw-r--r--templates/show_box_top.inc.php29
-rw-r--r--templates/show_index.inc.php6
-rw-r--r--templates/show_local_catalog_info.inc.php2
-rw-r--r--templates/sidebar.inc.php2
-rw-r--r--templates/sidebar_admin.inc.php6
-rw-r--r--templates/sidebar_home.inc.php6
10 files changed, 62 insertions, 67 deletions
diff --git a/templates/footer.inc.php b/templates/footer.inc.php
index 66afe41d..bb4f0035 100644
--- a/templates/footer.inc.php
+++ b/templates/footer.inc.php
@@ -20,6 +20,7 @@
*/
?>
+<div style="clear:both;"></div>
</div> <!-- end id="content"-->
<!-- I really hate IE
</td></tr></table> -->
diff --git a/templates/header.inc.php b/templates/header.inc.php
index e4a95048..32009c36 100644
--- a/templates/header.inc.php
+++ b/templates/header.inc.php
@@ -65,7 +65,7 @@ if (Config::get('use_rss')) { ?>
</a>
</div><!--End topbarleft -->
<div id="topbarright">
- <?php show_box_top(); ?>
+ <?php show_box_top('','box box_topbarright'); ?>
<b><?php echo _('You are currently logged in as') . " " . $GLOBALS['user']->fullname; ?></b>
<?php require_once Config::get('prefix') . '/templates/show_search_bar.inc.php'; ?>
<?php show_box_bottom(); ?>
@@ -76,7 +76,7 @@ if (Config::get('use_rss')) { ?>
</div><!-- End sidebar -->
<div id="rightbar"><!-- This is the rightbar -->
<?php require_once Config::get('prefix') . '/templates/rightbar.inc.php'; ?>
- </div>
+ </div><!-- End rightbar -->
<!-- I hate IE...
<table class="smeg-ie" width="100%"><tr><td> -->
<!-- Tiny little iframe, used to cheat the system -->
diff --git a/templates/rightbar.inc.php b/templates/rightbar.inc.php
index 82cbebac..ae6dd2e6 100644
--- a/templates/rightbar.inc.php
+++ b/templates/rightbar.inc.php
@@ -20,11 +20,10 @@
*/
?>
-<?php show_box_top(_('Active Playlist')); ?>
-<ul>
+<ul id="rb_action">
<li><a href="<?php echo Config::get('web_path'); ?>/stream.php?action=basket"><?php echo get_user_icon('all'); ?></a></li>
<li>
- <?php echo Ajax::button('?page=playlist&action=create','playlist_add',_('Save as Playlist'),'rightbar_create_playlist'); ?>
+ <?php echo Ajax::button('?page=playlist&action=create','playlist_add',_('Save as Playlist'),'rb_create_playlist'); ?>
</li>
<?php if (Access::check_function('batch_download')) { ?>
<li>
@@ -34,11 +33,27 @@
</li>
<?php } ?>
<li>
- <?php echo Ajax::button('?action=basket&type=clear_all','delete',_('Clear Playlist'),'rightbar_clear_playlist'); ?>
+ <?php echo Ajax::button('?action=basket&type=clear_all','delete',_('Clear Playlist'),'rb_clear_playlist'); ?>
+ </li>
+ <li id="rb_add">
+ <?php echo get_user_icon('add',_('Add Dynamic Items')); ?>
+ <ul id="rb_action_additems">
+ <li>
+ <?php echo Ajax::text('?action=basket&type=dynamic&random_type=default',_('Pure Random'),'rb_add_pure_random'); ?>
+ </li>
+ <li>
+ <?php echo Ajax::text('?action=basket&type=dynamic&random_type=artist',_('Related Artist'),'rb_add_related_artist'); ?>
+ </li>
+ <li>
+ <?php echo Ajax::text('?action=basket&type=dynamic&random_type=album',_('Related Album'),'rb_add_related_album'); ?>
+ </li>
+ <li>
+ <?php echo Ajax::text('?action=basket&type=dynamic&random_type=genre',_('Related Genre'),'rb_add_related_genre'); ?>
+ </li>
+ </ul>
</li>
</ul>
-<div id="current_playlist">
-<table cellpadding="0" cellspacing="0">
+<ul id="rb_current_playlist">
<?php
//FIXME :: this feels kludgy
$objects = $GLOBALS['user']->playlist->get_items();
@@ -52,34 +67,16 @@
$object->f_link = Random::get_type_name($object_data['1']);
}
?>
-<tr class="<?php echo flip_class(); ?>">
- <td>
- <?php echo $object->f_link; ?>
- </td>
- <td>
- <?php echo Ajax::button('?action=current_playlist&type=delete&id=' . $uid,'delete',_('Delete'),'rightbar_delete_' . $uid); ?>
- </td>
-</tr>
+<li class="<?php echo flip_class(); ?>" >
+ <?php echo $object->f_link; ?>
+ <?php echo Ajax::button('?action=current_playlist&type=delete&id=' . $uid,'delete',_('Delete'),'rightbar_delete_' . $uid,'','delitem'); ?>
+</li>
<?php } if (!count($objects)) { ?>
- <tr><td class="error"><?php echo _('Not Enough Data'); ?></td></tr>
+ <li class="error"><?php echo _('Not Enough Data'); ?></li>
<?php } ?>
-</table>
-</div>
-<div id="rightbar-bottom">
-<h4><?php echo _('Add Dynamic Items'); ?></h4>
-<span><?php echo Ajax::button('?action=basket&type=dynamic&random_type=default','add',_('Add'),'rightbar_pure_random'); ?>
-<?php echo _('Pure Random'); ?></span>
-
-<span><?php echo Ajax::button('?action=basket&type=dynamic&random_type=artist','add',_('Add'),'rightbar_related_artist'); ?>
-<?php echo _('Related Artist'); ?></span>
+</ul>
-<span><?php echo Ajax::button('?action=basket&type=dynamic&random_type=album','add',_('Add'),'rightbar_related_album'); ?>
-<?php echo _('Related Album'); ?></span>
-<span><?php echo Ajax::button('?action=basket&type=dynamic&random_type=genre','add',_('Add'),'rightbar_related_genre'); ?>
-<?php echo _('Related Genre'); ?></span>
-</div>
-<?php show_box_bottom(); ?>
<?php
// We do a little magic here to force a iframe reload depending on preference
diff --git a/templates/show_box_bottom.inc.php b/templates/show_box_bottom.inc.php
index f0c050f3..809f58e0 100644
--- a/templates/show_box_bottom.inc.php
+++ b/templates/show_box_bottom.inc.php
@@ -20,11 +20,11 @@
*/
?>
- </td>
-</tr>
-<tr>
- <td class="box-left-bottom"></td>
- <td class="box-bottom"></td>
- <td class="box-right-bottom"></td>
-</tr>
-</table>
+ </div>
+ <div class="box-bottom">
+ <div class="box-left-bottom"></div>
+ <div class="box-right-bottom"></div>
+ </div>
+ </div>
+</div>
+
diff --git a/templates/show_box_top.inc.php b/templates/show_box_top.inc.php
index e3e9221a..d632150e 100644
--- a/templates/show_box_top.inc.php
+++ b/templates/show_box_top.inc.php
@@ -20,20 +20,15 @@
*/
$class = $class ? $class : 'box';
?>
-<table class="<?php echo $class; ?>" cellspacing="0" cellpadding="0">
-<tr>
- <td class="box-left-top"></td>
- <td class="box-top"></td>
- <td class="box-right-top"></td>
-</tr>
-<tr>
- <td class="box-left" rowspan="2"></td>
-<?php if ($title) { ?>
- <td class="box-title"><?php echo $title; ?></td>
-<?php } else { ?>
- <td></td>
-<?php } ?>
- <td class="box-right" rowspan="2"></td>
-</tr>
-<tr>
- <td class="box-content" style="padding-top:3px;">
+
+<div class="<?php echo $class; ?>">
+ <div class="box-inside">
+ <div class="box-top">
+ <div class="box-left-top"></div>
+ <div class="box-right-top"></div>
+ </div>
+ <?php if ($title) { ?>
+ <h3 class="box-title"><?php echo $title; ?></h3>
+ <?php } ?>
+ <div class="box-content">
+
diff --git a/templates/show_index.inc.php b/templates/show_index.inc.php
index 86a99bbd..39a95c5b 100644
--- a/templates/show_index.inc.php
+++ b/templates/show_index.inc.php
@@ -47,17 +47,17 @@ if (isset($_REQUEST['xspf']) && isset ($_REQUEST['play_info'])){
<?php
$objects = Stats::get_newest('album');
$headers = array('f_link'=>_('Newest Albums'));
- show_box_top('','info-box');
+ show_box_top('','info-box box_newest_albums');
require Config::get('prefix') . '/templates/show_objects.inc.php';
show_box_bottom();
$objects = Stats::get_newest('artist');
$headers = array('f_name_link'=>_('Newest Artists'));
- show_box_top('','info-box');
+ show_box_top('','info-box box_newest_artists');
require Config::get('prefix') . '/templates/show_objects.inc.php';
show_box_bottom();
$objects = Stats::get_newest('genre');
$headers = array('f_link'=>_('Newest Genres'));
- show_box_top('','info-box');
+ show_box_top('','info-box box_newest_genres');
require Config::get('prefix') . '/templates/show_objects.inc.php';
show_box_bottom();
?>
diff --git a/templates/show_local_catalog_info.inc.php b/templates/show_local_catalog_info.inc.php
index fcc55e37..01548bcd 100644
--- a/templates/show_local_catalog_info.inc.php
+++ b/templates/show_local_catalog_info.inc.php
@@ -22,7 +22,7 @@
?>
<?php show_box_top(_('Catalog Statistics')); ?>
-<table cellspacing="1" cellpadding="3" width="100%" border="0">
+<table cellspacing="1" cellpadding="3" border="0">
<tr class="table-header">
<td><?php echo _('Connected Users'); ?></td>
<td><?php echo _('Total Users'); ?></td>
diff --git a/templates/sidebar.inc.php b/templates/sidebar.inc.php
index f7aff7c4..bc76657e 100644
--- a/templates/sidebar.inc.php
+++ b/templates/sidebar.inc.php
@@ -62,7 +62,7 @@ $ajax_url = Config::get('ajax_url');
</li>
-->
<li id="sb_tab_logout" class="sb1">
- <a href="<?php echo Config::get('web_path'); ?>/logout.php">
+ <a href="<?php echo Config::get('web_path'); ?>/logout.php" id="sidebar_logout" >
<?php echo get_user_icon('logout',_('Logout')); ?>
</a>
</li>
diff --git a/templates/sidebar_admin.inc.php b/templates/sidebar_admin.inc.php
index c2348aec..6592c5e0 100644
--- a/templates/sidebar_admin.inc.php
+++ b/templates/sidebar_admin.inc.php
@@ -1,7 +1,9 @@
<ul class="sb2" id="sb_admin">
<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>
- <div class="sb3"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_catalogs"><?php echo _('Show Catalogs'); ?></a></div>
+ <ul class="sb3" id="sb_admin_catalogs">
+ <li id="sb_admin_catalogs_Add"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_add_catalog"><?php echo _('Add a Catalog'); ?></a></li>
+ <li id="sb_admin_catalogs_Show"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_catalogs"><?php echo _('Show Catalogs'); ?></a></li>
+ </ul>
</li>
<li><h4><?php echo _('User Tools'); ?></h4>
diff --git a/templates/sidebar_home.inc.php b/templates/sidebar_home.inc.php
index 0c711f95..a04ffe43 100644
--- a/templates/sidebar_home.inc.php
+++ b/templates/sidebar_home.inc.php
@@ -8,9 +8,9 @@
</li>
<li><h4><?php echo _('Random'); ?></h4>
<ul class="sb3" id="sb_home_random">
- <li id="sb_home_random_album"><?php echo Ajax::text('?page=random&action=album',_('Album'),'sb_home_random_album'); ?></li>
- <li id="sb_home_random_artist"><?php echo Ajax::text('?page=random&action=artist',_('Artist'),'sb_home_random_artist'); ?></li>
- <li id="sb_home_random_playlist"><?php echo Ajax::text('?page=random&action=playlist',_('Playlist'),'sb_home_random_playlist'); ?></li>
+ <li id="sb_home_random_album"><?php echo Ajax::text('?page=random&action=album',_('Album'),'home_random_album'); ?></li>
+ <li id="sb_home_random_artist"><?php echo Ajax::text('?page=random&action=artist',_('Artist'),'home_random_artist'); ?></li>
+ <li id="sb_home_random_playlist"><?php echo Ajax::text('?page=random&action=playlist',_('Playlist'),'home_random_playlist'); ?></li>
<li id="sb_home_random_advanced"><a href="<?php echo $web_path; ?>/random.php?action=advanced"><?php echo _('Advanced'); ?></a></li>
</ul>
</ul>
generated by cgit (git 2.34.1) at 2025-08-13 15:46:50 +0000