summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-07-05 06:05:18 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-07-05 06:05:18 +0000
commitedf482ff3d21c84d99f25b84884563a8781fa7ae (patch)
tree5518f19975dde4b63e87ad7a1d00ec9015911d7c /templates
parentd24fe88905baf183892ed9fd757e698e56309904 (diff)
downloadampache-edf482ff3d21c84d99f25b84884563a8781fa7ae.tar.gz
ampache-edf482ff3d21c84d99f25b84884563a8781fa7ae.tar.bz2
ampache-edf482ff3d21c84d99f25b84884563a8781fa7ae.zip
moved back to a GPL flash player for 3.4 codebase, fixed some stream issues (non-m3u playlist types were failing) and tweaked the look of the /test.php page and fixed the xspf playlist generation
Diffstat (limited to 'templates')
-rw-r--r--templates/install.css2
-rw-r--r--templates/show_preferences.inc.php2
-rw-r--r--templates/show_test.inc.php2
-rw-r--r--templates/show_xspf_player.inc.php18
-rw-r--r--templates/sidebar_home.inc.php2
-rw-r--r--templates/sidebar_player.inc.php8
-rw-r--r--templates/sidebar_search.inc.php3
7 files changed, 18 insertions, 19 deletions
diff --git a/templates/install.css b/templates/install.css
index e42f1c1b..c9944ef4 100644
--- a/templates/install.css
+++ b/templates/install.css
@@ -64,7 +64,7 @@ body {
/* Table style */
td{
padding:5px;
- background-color: #D9E0E8;
+ //background-color: #D9E0E8;
font-size: smaller;
}
diff --git a/templates/show_preferences.inc.php b/templates/show_preferences.inc.php
index c2cb94e0..0ecc4984 100644
--- a/templates/show_preferences.inc.php
+++ b/templates/show_preferences.inc.php
@@ -33,7 +33,7 @@ if ($_REQUEST['tab'] != 'account' && $_REQUEST['tab'] != 'modules') {
?>
<input class="button" type="submit" value="<?php echo _('Update Preferences'); ?>" />
- <input type="hidden" name="tab" value="<?php echo scrub_out($current_tab); ?>" />
+ <input type="hidden" name="tab" value="<?php echo scrub_out($_REQUEST['tab']); ?>" />
<input type="hidden" name="method" value="<?php echo scrub_out($_REQUEST['action']); ?>" />
<input class="button" type="submit" name="action" value="<?php echo _("Cancel"); ?>" />
<?php
diff --git a/templates/show_test.inc.php b/templates/show_test.inc.php
index d7ddefe7..32d8f327 100644
--- a/templates/show_test.inc.php
+++ b/templates/show_test.inc.php
@@ -32,7 +32,7 @@
<h1><?php echo _('Ampache Debug'); ?></h1>
<p><?php echo _('You\'ve reached this page because a configuration error has occured. Debug Information below'); ?></p>
</div>
-<table border="0" cellpadding="3" cellspacing="0">
+<table align="center" border="0" cellpadding="3" cellspacing="0">
<tr>
<td><font size="+1"><?php echo _('CHECK'); ?></font></td>
<td>
diff --git a/templates/show_xspf_player.inc.php b/templates/show_xspf_player.inc.php
index 179b9c61..67cf3104 100644
--- a/templates/show_xspf_player.inc.php
+++ b/templates/show_xspf_player.inc.php
@@ -1,7 +1,7 @@
<?php
/*
- Copyright (c) 2001 - 2006 Ampache.org
+ Copyright (c) 2001 - 2007 Ampache.org
All rights reserved.
This program is free software; you can redistribute it and/or
@@ -22,8 +22,6 @@
<html>
<head><title>Ampache XSPF Player</title></head>
<body style="margin:0px; padding:0px; border:0px; background-color: #000000">
-<div id="mp3player">
-<script type="text/javascript" src="<?php echo conf('web_path'); ?>/modules/flash/swfobject.js"></script>
<script language=JavaScript>
<!--
//Disable right mouse click Script to hide the source url for the flash player it prevents ripping music a bit.
@@ -55,11 +53,15 @@ document.oncontextmenu=new Function("return false")
// -->
</script>
<script type="text/javascript">
-<!--
-var flashObj = new SWFObject ("<?php echo conf('web_path'); ?>/modules/flash/xspf_player.swf?action=play&playlist=<?php echo conf('web_path'); ?>/modules/flash/xspf_player.php<?php echo $play_info; ?>&folder=<?php echo conf('web_path'); ?>/modules/flash/&textcolor=033066&color=E6E6E6&loop=playlist&lma=yes&viewinfo=true&vol=30&display=1@. - @2@ - @", "FMP3", "350", "300", 7, "#000000", true);
-flashObj.write ("mp3player");
-// -->
-</script>
+
+<div id="mp3player">
+<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=7,0,0,0" width="400" height="170" id="xspf_player" align="middle">
+ <param name="allowScriptAccess" value="sameDomain" />
+ <param name="movie" value="xspf_player.swf" />
+ <param name="quality" value="high" />
+ <param name="bgcolor" value="#ffffff" />
+ <embed src="<?php echo Config::get('web_path'); ?>/modules/flash/xspf_player.swf?autoplay=true&playlist_url=<?php echo Config::get('web_path'); ?>/modules/flash/xspf_player.php<?php echo $play_info; ?>" quality="high" bgcolor="#ffffff" width="400" height="170" name="xspf_player" align="middle" allowScriptAccess="sameDomain" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />
+</object>
</div>
</body>
diff --git a/templates/sidebar_home.inc.php b/templates/sidebar_home.inc.php
index aae0a5c0..135b1d8a 100644
--- a/templates/sidebar_home.inc.php
+++ b/templates/sidebar_home.inc.php
@@ -2,6 +2,7 @@
<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>
<hr />
+<!-- RANDOM, Hidden for now cause its broken
<h4><?php echo _('Search'); ?></h4>
<div id="sidebar_subsearch">
<form name="sub_search" method="post" action="<?php echo $web_path; ?>/search.php" enctype="multipart/form-data" style="Display:inline">
@@ -14,7 +15,6 @@
</form>
</div>
<hr />
-<!-- RANDOM, Hidden for now cause its broken
<h4><?php echo _('Random'); ?></h4>
<form name="sub_random" method="post" enctype="multipart/form-data" action="<?php echo $web_path; ?>/song.php?action=random&amp;method=stream" style="Display:inline">
<select name="random" style="width:80px;">
diff --git a/templates/sidebar_player.inc.php b/templates/sidebar_player.inc.php
index e5e2867b..ae40952c 100644
--- a/templates/sidebar_player.inc.php
+++ b/templates/sidebar_player.inc.php
@@ -1,8 +1,2 @@
-<h4><?php echo _('Browse By'); ?></h4>
-<select name="type">
- <option value="song"><?php echo _('Song Title'); ?></option>
- <option value="album"><?php echo _('Albums'); ?></option>
- <option value="artist"><?php echo _('Artist'); ?></option>
- <option value="genre"><?php echo _('Genre'); ?></option>
-</select>
+DISABLED
<hr />
diff --git a/templates/sidebar_search.inc.php b/templates/sidebar_search.inc.php
index 6f9c7831..45db9548 100644
--- a/templates/sidebar_search.inc.php
+++ b/templates/sidebar_search.inc.php
@@ -1,4 +1,5 @@
<h4><?php echo _('Search'); ?></h4>
+<!--
<form method="post" action="#" id="search_side" name="search_side">
<input type="textbox" name="string" value="" size="8" />
<hr />
@@ -6,4 +7,6 @@
<input type="checkbox" name="all" value="1" /> <?php echo _('Titles'); ?><br />
<input type="checkbox" name="year" value="1" /> <?php echo _('Year'); ?><br />
</form>
+-->
+DISABLED
<hr />
generated by cgit (git 2.34.1) at 2025-08-13 15:46:16 +0000