code clean up

4 files changed, 19 insertions, 26 deletions

diff --git a/modules/lib.php b/modules/lib.php
index a14e1d84..32ebe0bf 100644
--- a/modules/lib.php
+++ b/modules/lib.php
@@ -111,7 +111,7 @@ function show_flagged_popup($reason,$label='value', $name='flagged_type', $other
  *
  */
 
-function show_genre_pulldown ($genre, $complete, $lines= "10 MULTIPLE") {
+function show_genre_pulldown ($genre, $complete, $lines= "'10' multiple='multiple'") {
 	
 	$dbh = dbh();
 
diff --git a/randomplay.php b/randomplay.php
index 81250d3c..05a8c971 100644
--- a/randomplay.php
+++ b/randomplay.php
@@ -36,8 +36,6 @@ if (conf('refresh_interval')) {
 	show_template('javascript_refresh');
 	}
 ?>
-<b><?php echo $user->username._(", welcome to Argyle Manor - Family Room.  "); ?></b>
-
 
 <!-- Big Daddy Table -->
 <table style="padding-left:5px;padding-right:5px;padding-top:5px;padding-bottom:5px;" >
@@ -83,31 +81,31 @@ function show_random_play() {
                 <td rowspan="3" valign="top"> ' . _("From genre") . '</td>
                 <td rowspan="4">
 ';
-        show_genre_pulldown( -1, 0, "33 MULTIPLE" );
+        show_genre_pulldown( -1, 0, "'33' multiple='multiple'" );
 
         print '
                 </td></tr>
         <tr class="even">
                 <td>
                         ' . _("Favor Unplayed") . ' <br />
-                        ' . _("Full Albums") . ' <br />
-                        ' . _("Full Artist") . '
+                        ' . _("Favor Full Albums") . ' <br />
+                        ' . _("Favor Full Artist") . ' <br />
                 </td>
                 <td>
-                        <input type="checkbox" id="unplayed" name="unplayed" value="1" onclick="flipField(\'album\');flipField(\'artist\')" />$
-                        <input type="checkbox" id="album" name="full_album" value="1" onclick="flipField(\'unplayed\');flipField(\'artist\')" $
-                        <input type="checkbox" id="artist" name="full_artist" value="1" onclick="flipField(\'unplayed\');flipField(\'album\')"$
+                        <input type="checkbox" id="unplayed" name="unplayed" value="1" onclick="flipField(\'album\');flipField(\'artist\')" /><br />
+                        <input type="checkbox" id="album" name="full_album" value="1" onclick="flipField(\'unplayed\');flipField(\'artist\')" /><br />
+                        <input type="checkbox" id="artist" name="full_artist" value="1" onclick="flipField(\'unplayed\');flipField(\'album\')" /><br />
                 </td>
                 </tr>
                 <tr class="even">
-                <td nowrap> ' . _("from catalog") . '</td>
+                <td nowrap=\'nowrap\'> ' . _("from catalog") . '</td>
                 <td>
 ';
 
         show_catalog_pulldown( -1, 0);
 
         print '
-        </tr>
+        </td></tr>
         <tr>
                 <td colspan="4">
                         <input type="hidden" name="aaction" value="Play!" />
@@ -125,11 +123,6 @@ function show_random_play() {
  */
 ?>
 
-</tr>
+</td></tr>
 </table>
-
-<?php show_menu_items('Home'); ?>
-</body>
-</html>
-<script language="javascript">document.search.search_string.focus();</script>
-
+<?php show_page_footer ('Home', '', $user->prefs['display_menu']);?>
diff --git a/templates/show_random_play_bar.inc.php b/templates/show_random_play_bar.inc.php
index b0852856..28e41cec 100644
--- a/templates/show_random_play_bar.inc.php
+++ b/templates/show_random_play_bar.inc.php
@@ -28,12 +28,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
   <input type="hidden" name="action" value="m3u" />
   <table class="border" border="0" cellpadding="3" cellspacing="1" width="100%">
   <tr class="table-header">
-<td colspan="6"><?php echo _("Play Random Selection"); ?></td>
+	<td colspan="6"><?php echo _("Play Random Selection"); ?></td>
   </tr>
   <tr class="even">
-  <td>
-  <table border="0">
-<tr class="even">
+    <td>
+      <table border="0">
+  <tr class="even">
 <td>
    <select name="random">
    <option value="1">1</option>
@@ -46,8 +46,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    <option value="500">500</option>
    <option value="1000">1000</option>
    <option value="-1"><?php echo _("All"); ?></option>
-   </select> &nbsp &nbsp
-  <?php show_genre_pulldown( -1, 0, "1" ); ?>
+   </select> &nbsp; &nbsp;
+  <?php show_genre_pulldown( -1, 0, "'1'" ); ?>
    <select name="Quantifier">
    <option value="Songs"><?php echo _("Songs"); ?></option>
    <option value="Minutes"><?php echo _("Minutes"); ?></option>
@@ -60,7 +60,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
    <input type="hidden" name="aaction" value="Play!" />
    <input class="button" type="submit" name="aaction" value="<?php echo _("Enqueue"); ?>" />
 </td>
-<td><a href=<?php echo conf('web_path'); ?>/randomplay.php><?php echo _("Advanced"); ?></a></td>
+<td><a href="<?php echo conf('web_path'); ?>/randomplay.php"><?php echo _("Advanced"); ?></a></td>
   </tr>
   </table>
   </td></tr>
diff --git a/templates/show_search_bar.inc b/templates/show_search_bar.inc
index 36f4b1ca..9b2e61f6 100644
--- a/templates/show_search_bar.inc
+++ b/templates/show_search_bar.inc
@@ -75,4 +75,4 @@
 </tr>
 </table>
 </form>
-
+<script language="JavaScript" type="text/javascript"> document.search.search_string.focus(); </script>