catalog build technically works now, still working out some issues with the dynamic updating of the current state

1 files changed, 21 insertions, 27 deletions

diff --git a/templates/show_add_catalog.inc.php b/templates/show_add_catalog.inc.php
index c1f74639..16661417 100644
--- a/templates/show_add_catalog.inc.php
+++ b/templates/show_add_catalog.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,41 +22,38 @@
 
 $default_rename = "%a - %T - %t";
 $default_sort = "%a/%A";
-
 ?>
-
 <?php show_box_top(_('Add a Catalog')); ?>
-
 <p><?php echo _("In the form below enter either a local path (i.e. /data/music) or the URL to a remote Ampache installation (i.e http://theotherampache.com)"); ?></p>
-
-<form name="update_catalog" method="post" action="<?php echo conf('web_path'); ?>/admin/catalog.php" enctype="multipart/form-data">
+<?php Error::display('general'); ?>
+<form name="update_catalog" method="post" action="<?php echo Config::get('web_path'); ?>/admin/catalog.php" enctype="multipart/form-data">
 <table class="tabledata" cellpadding="0" border="0" cellspacing="0">
 <tr>
-	<td><?php echo _("Catalog Name"); ?>: </td>
+	<td><?php echo _('Catalog Name'); ?>: </td>
 	<td><input size="60" type="text" name="name" value="<?php echo $_REQUEST['name']; ?>" /></td>
 	<td style="vertical-align:top; font-family: monospace;" rowspan="6">
-		<strong><?php echo _("Auto-inserted Fields"); ?>:</strong><br />
-		%A = <?php echo _("album name"); ?><br />
-		%a = <?php echo _("artist name"); ?><br />
-		%c = <?php echo _("id3 comment"); ?><br />
-		%g = <?php echo _("genre"); ?><br />
-		%T = <?php echo _("track number (padded with leading 0)"); ?><br />
-		%t = <?php echo _("song title"); ?><br />
-		%y = <?php echo _("year"); ?><br />
-		%o = <?php echo _("other"); ?><br />
+		<strong><?php echo _('Auto-inserted Fields'); ?>:</strong><br />
+		%A = <?php echo _('album name'); ?><br />
+		%a = <?php echo _('artist name'); ?><br />
+		%c = <?php echo _('id3 comment'); ?><br />
+		%g = <?php echo _('genre'); ?><br />
+		%T = <?php echo _('track number (padded with leading 0)'); ?><br />
+		%t = <?php echo _('song title'); ?><br />
+		%y = <?php echo _('year'); ?><br />
+		%o = <?php echo _('other'); ?><br />
 	</td>
 </tr>
 
 <tr>
-	<td><?php echo _("Path"); ?>: </td>
+	<td><?php echo _('Path'); ?>: </td>
 	<td><input size="60" type="text" name="path" value="<?php echo $_REQUEST['path']; ?>" /></td>
 </tr>
 <tr>
-	<td><?php echo _("Catalog Type"); ?>: </td>
+	<td><?php echo _('Catalog Type'); ?>: </td>
 	<td>
 		<select name="type">
-			<option value="local"><?php echo _("Local"); ?></option>
-			<option value="remote"><?php echo _("Remote"); ?></option>
+			<option value="local"><?php echo _('Local'); ?></option>
+			<option value="remote"><?php echo _('Remote'); ?></option>
 		</select>
 	</td>
 </tr>
@@ -65,17 +62,17 @@ $default_sort = "%a/%A";
 	<td><input size="30" type="text" name="key" value="" /><span class="error">*<?php echo _('Required for Remote Catalogs'); ?></span></td>
 </tr>
 <tr>
-	<td><?php echo _("Filename Pattern"); ?>: </td>
+	<td><?php echo _('Filename Pattern'); ?>: </td>
 	<td><input size="60" type="text" name="rename_pattern" value="<?php echo $default_rename; ?>" /></td>
 </tr>
 
 <tr>
-	<td><?php echo _("Folder Pattern"); ?>:<br /><?php echo _("(no leading or ending '/')"); ?></td>
+	<td><?php echo _('Folder Pattern'); ?>:<br /><?php echo _("(no leading or ending '/')"); ?></td>
 	<td valign="top"><input size="60" type="text" name="sort_pattern" value="<?php echo $default_sort; ?>" /></td>
 </tr>
 
 <tr>
-	<td valign="top"><?php echo _("Gather Album Art"); ?>:</td>
+	<td valign="top"><?php echo _('Gather Album Art'); ?>:</td>
 	<td><input type="checkbox" name="gather_art" value="1" /></td>
 </tr>
 <tr>
@@ -87,12 +84,9 @@ $default_sort = "%a/%A";
 	<td>&nbsp;</td>
 	<td>
 		<input type="hidden" name="action" value="add_catalog" />
-		<input class="button" type="submit" value="<?php echo _("Add Catalog"); ?>" />&nbsp;&nbsp;
-		<input class="button" type="reset" value="<?php echo _("Reset"); ?>" />&nbsp;&nbsp;
-		<input type="button" onclick="javascript:history.go(-1)" value="<?php echo _("Cancel"); ?>" />
+		<input class="button" type="submit" value="<?php echo _('Add Catalog'); ?>" />
 	</td>
 </tr>
-
 </table>
 </form>
 <?php show_box_bottom(); ?>