summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bin/print_tags.php.inc16
-rw-r--r--index.php13
-rw-r--r--templates/basestyle.inc.php5
-rw-r--r--templates/show_now_playing_row.inc.php3
4 files changed, 27 insertions, 10 deletions
diff --git a/bin/print_tags.php.inc b/bin/print_tags.php.inc
index 37ba8da1..ec5fa1ad 100644
--- a/bin/print_tags.php.inc
+++ b/bin/print_tags.php.inc
@@ -22,6 +22,13 @@
$no_session = '1';
require ("../lib/init.php");
+/**
+ * Set this to true if you want it to e-mail a report
+ * to tags@ampache.org (usefull for troubleshooting
+ */
+//$send_mail = true;
+
+
$filename = usage();
echo "Reading: $filename\n";
@@ -33,6 +40,15 @@ $results['file'] = $filename;
$key = get_tag_type($results);
$ampache_results = clean_tag_info($results,$key,$filename);
+if ($send_mail) {
+ $getid3_results = print_r($info,1);
+ $amp_results = print_r($ampache_results,1);
+ $body = $getid3_results . "\n-----\n\n" . $amp_results;
+ $subject = "[Ampache] Print Tags - $filename";
+ mail('tags@ampache.org',$subject,$body);
+}
+
+
echo "Results Seen by GetID3()\n";
print_r($info);
echo "\n------------------------------------------------------------------\n";
diff --git a/index.php b/index.php
index ab0683bd..9cf0b6c7 100644
--- a/index.php
+++ b/index.php
@@ -45,15 +45,12 @@ if (conf('refresh_limit') > 5) {
}
?>
+<div id="nowplaying" style="margin-left:25px;">
+ <?php show_now_playing(); ?>
+</div> <!-- Close Now Playing Div -->
+
<!-- Big Daddy Table -->
-<table id="bigdaddy" style="padding-left:5px;padding-right:5px;padding-top:5px;padding-bottom:5px;" width="100%">
-<tr>
- <td style="padding-left:17px;" valign="top" colspan="2">
- <div id="nowplaying">
- <?php show_now_playing(); ?>
- </div> <!-- Close Now Playing Div -->
- </td>
-</tr>
+<table id="bigdaddy">
<tr>
<td valign="top">
<table border="0"><!-- Left table -->
diff --git a/templates/basestyle.inc.php b/templates/basestyle.inc.php
index b27c6bdc..0a5d4905 100644
--- a/templates/basestyle.inc.php
+++ b/templates/basestyle.inc.php
@@ -284,10 +284,15 @@
.np_row {
display:block;
background: <?php echo conf('base_color2'); ?>;
+ padding-top: 3px;
+ padding-bottom: 3px;
}
.np_cell {
display: inline;
margin: 10px;
}
+ #bigdaddy {
+ padding: 5px;
+ }
-->
</style>
diff --git a/templates/show_now_playing_row.inc.php b/templates/show_now_playing_row.inc.php
index 5a5c93f7..a02b59c6 100644
--- a/templates/show_now_playing_row.inc.php
+++ b/templates/show_now_playing_row.inc.php
@@ -37,8 +37,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
<?php if (conf('play_album_art')) { ?>
<div class="np_cell">
<a target="_blank" href="<?php echo $web_path; ?>/albumart.php?id=<?php echo $song->album; ?>&amp;type=popup" onclick="popup_art('<?php echo $web_path; ?>/albumart.php?id=<?php echo $song->album; ?>&amp;type=popup'); return false;">
- <img align="middle" border="0" src="<?php echo $web_path; ?>/albumart.php?id=<?php echo $song->album; ?>&amp;fast=1&amp;thumb=1" alt="Album Art" height="75" />
- </a>
+ <img align="middle" border="0" src="<?php echo $web_path; ?>/albumart.php?id=<?php echo $song->album; ?>&amp;fast=1&amp;thumb=1" alt="Album Art" height="75" /></a>
</div>
<?php } // end play album art ?>
</div>