summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--templates/footer.inc.php4
-rw-r--r--templates/header.inc.php4
-rw-r--r--templates/show_album.inc.php4
-rw-r--r--templates/show_objects.inc.php2
-rw-r--r--templates/show_random_albums.inc.php21
-rw-r--r--themes/classic/templates/default.css44
6 files changed, 48 insertions, 31 deletions
diff --git a/templates/footer.inc.php b/templates/footer.inc.php
index 2b306aa5..66afe41d 100644
--- a/templates/footer.inc.php
+++ b/templates/footer.inc.php
@@ -21,8 +21,8 @@
*/
?>
</div> <!-- end id="content"-->
-<!-- I really hate IE -->
-</td></tr></table>
+<!-- I really hate IE
+</td></tr></table> -->
</div> <!-- end id="maincontainer"-->
<div id="footer">
<a href="http://www.ampache.org/index.php">Ampache v.<?php echo Config::get('version'); ?></a><br />
diff --git a/templates/header.inc.php b/templates/header.inc.php
index 844ff186..90f4782a 100644
--- a/templates/header.inc.php
+++ b/templates/header.inc.php
@@ -77,8 +77,8 @@ if (Config::get('use_rss')) { ?>
<div id="rightbar"><!-- This is the rightbar -->
<?php require_once Config::get('prefix') . '/templates/rightbar.inc.php'; ?>
</div>
-<!-- I hate IE... -->
-<table class="smeg-ie" width="100%"><tr><td>
+<!-- I hate IE...
+<table class="smeg-ie" width="100%"><tr><td> -->
<div id="content">
<?php if (Config::get('int_config_version') != Config::get('config_version') AND $GLOBALS['user']->has_access(100)) { ?>
<div class="fatalerror">
diff --git a/templates/show_album.inc.php b/templates/show_album.inc.php
index 7e10e085..203f911f 100644
--- a/templates/show_album.inc.php
+++ b/templates/show_album.inc.php
@@ -37,9 +37,9 @@ $title = scrub_out($album->name) . ' (' . $album->year . ') -- ' . $album->f_ar
?>
</div>
<div style="display:table-cell;vertical-align:top;">
- <div style="float:left; display:inline;" id="rating_<?php echo $album->id; ?>_album">
+ <!--<div style="float:left; display:inline;" id="rating_<?php echo $album->id; ?>_album">-->
<?php Rating::show($album->id,'album'); ?>
- </div>
+ <!--</div>-->
</div>
<strong><?php echo _('Actions'); ?>:</strong><br />
<div id="information_actions">
diff --git a/templates/show_objects.inc.php b/templates/show_objects.inc.php
index 0cb0d935..72e79f89 100644
--- a/templates/show_objects.inc.php
+++ b/templates/show_objects.inc.php
@@ -33,7 +33,7 @@
foreach ($objects as $object) {
$object->format();
?>
-<tr id="object_row_<?php echo $object->uid; ?>" class="<?php echo flip_class(); ?>">
+<tr id="object_row_<?php echo $object->id; ?>" class="<?php echo flip_class(); ?>">
<?php require Config::get('prefix') . '/templates/show_object_row.inc.php'; ?>
</tr>
<?php } ?>
diff --git a/templates/show_random_albums.inc.php b/templates/show_random_albums.inc.php
index a3fcd98e..e8e4749d 100644
--- a/templates/show_random_albums.inc.php
+++ b/templates/show_random_albums.inc.php
@@ -21,30 +21,31 @@
$web_path = Config::get('web_path');
?>
<?php show_box_top(_('Albums of the Moment')); ?>
-<table class="tabledata">
-<tr>
+
<?php
foreach ($albums as $album_id) {
$album = new Album($album_id);
$album->format();
$name = scrub_out('[' . $album->artist . '] ' . $album->name);
?>
- <td>
+ <div class="random_album">
<a href="<?php echo $web_path; ?>/albums.php?action=show&amp;album=<?php echo $album_id; ?>">
<?php if (Config::get('show_album_art')) { ?>
<img src="<?php echo $web_path; ?>/image.php?thumb=3&amp;id=<?php echo $album_id; ?>" width="80" height="80" border="0" alt="<?php echo $name; ?>" title="<?php echo $name; ?>" />
<?php } else { ?>
<?php echo '[' . $album->f_artist . '] ' . $album->f_name; ?>
<?php } ?>
- </a><br />
+ </a>
<?php
if(Config::get('ratings')){
- echo "<div style=\"float:left; display:inline;\" id=\"rating_" . $album->id . "_album\">";
- show_rating_static($album->id, 'album');}
- echo "</div>";
+ //echo "<div style=\"float:left; display:inline;\" id=\"rating_" . $album->id . "_album\">";
+ show_rating_static($album->id, 'album');
+ //echo "</div>";
+ }
?>
- </td>
+ <span class="play_album"><?php echo Ajax::button('?action=basket&type=album&id=' . $album->id,'add',_('Play Album'),'play_full_' . $album->id); ?></span>
+ </div>
+
<?php } ?>
-</tr>
-</table>
+
<?php show_box_bottom(); ?>
diff --git a/themes/classic/templates/default.css b/themes/classic/templates/default.css
index 77b92724..cd0bef63 100644
--- a/themes/classic/templates/default.css
+++ b/themes/classic/templates/default.css
@@ -34,6 +34,7 @@ ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,body,html,p,blockquote,fieldset,input { marg
body {
background:#d3d3d3;
font-family:Arial, Helvetica, Sans-Serif;
+ min-width:1000px;
}
p {
color: #000;
@@ -90,6 +91,7 @@ input {
/* Footer */
/************************************************/
#footer {
+ clear:both;
float:right;
margin:5px;
font-size:10px;
@@ -169,7 +171,6 @@ a.smallbutton {
/* Content block */
/************************************************/
#content {
- position: relative;
margin: 0px 220px 20px 135px;
}
h3#content_title{
@@ -185,11 +186,13 @@ h3#content_title span {
/* Rightbar */
/************************************************/
#rightbar {
- position:absolute;
- right:0px;
- top:87px;
- width:250px;
+ width:200px;
+ float:right;
}
+#rightbar table.box
+{
+ float:right;
+}
#rightbar li {
list-style:none;
float:left;
@@ -208,10 +211,8 @@ h3#content_title span {
/* Sidebar */
/************************************************/
#sidebar{
- clear:both;
- position:absolute;
- left:0px;
- top:87px;
+ float:left;
+ position:relative;
width:120px;
padding-top:28px;
background:#c0c0c0 url(../images/sidebar_top.jpg) no-repeat;
@@ -241,7 +242,6 @@ h3#content_title span {
}
#sidebar-tabs li.active img{
margin-top:4px;position:relative;z-index:2;
- /*position:absolute;left:10px;top:5px;*/
}
/* Tabs content */
@@ -287,7 +287,7 @@ h3#content_title span {
display:block;
}
#sidebar-page a:hover{
- background:#8b8b8b;
+ background:#99ccff;
color:#fff;
}
@@ -311,7 +311,7 @@ h3#content_title span {
}
.alphabet span.active{ background:#5b5b5b; color:#fff; }
.alphabet span.link:hover {
- background: #8b8b8b;
+ background: #99ccff;
color:#fff;
}
@@ -331,6 +331,21 @@ h3#content_title span {
}
+/************************************************/
+/* Albums of the moment */
+/************************************************/
+
+.random_album
+{
+ position:relative;
+ float:left;
+ padding:8px;
+}
+
+.random_album .play_album
+{
+ display:none;
+}
/************************************************/
/* Now Playing Styles */
@@ -458,11 +473,12 @@ span.five-stars:hover { width: 80px; }
/************************************************/
.box {
background: #f7f7f7;
- clear:both;
+ /*clear:left;/*both;*/
}
.info-box {
background: #f7f7f7;
- float:left;
+ /*float:left;
+ clear:left;*/
}
.box-title {
border-bottom: solid 1px #000;
generated by cgit (git 2.34.1) at 2025-08-14 00:49:25 +0000