summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2006-09-24 03:47:50 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2006-09-24 03:47:50 +0000
commitded54786a5d1f24d21b2ffe1ec9d2d2b664a8c54 (patch)
tree7222c273945a5c86f9057488e205d57969cbbefa
parentae70bce26c2f39da93c85a082602d58dcf13652e (diff)
downloadampache-ded54786a5d1f24d21b2ffe1ec9d2d2b664a8c54.tar.gz
ampache-ded54786a5d1f24d21b2ffe1ec9d2d2b664a8c54.tar.bz2
ampache-ded54786a5d1f24d21b2ffe1ec9d2d2b664a8c54.zip
last of the things that I can find for now
-rw-r--r--admin/catalog.php2
-rw-r--r--templates/show_add_catalog.inc.php (renamed from templates/add_catalog.inc)11
-rw-r--r--templates/show_preferences.inc2
3 files changed, 5 insertions, 10 deletions
diff --git a/admin/catalog.php b/admin/catalog.php
index 1327e188..87b5d383 100644
--- a/admin/catalog.php
+++ b/admin/catalog.php
@@ -240,7 +240,7 @@ switch ($_REQUEST['action']) {
show_confirmation($title,$body,$url);
break;
case 'show_add_catalog':
- include(conf('prefix') . '/templates/add_catalog.inc');
+ include(conf('prefix') . '/templates/show_add_catalog.inc.php');
break;
case 'clear_now_playing':
if (conf('demo_mode')) { break; }
diff --git a/templates/add_catalog.inc b/templates/show_add_catalog.inc.php
index 498eaa81..bdd7c97a 100644
--- a/templates/add_catalog.inc
+++ b/templates/show_add_catalog.inc.php
@@ -26,11 +26,10 @@ $default_sort = "%a/%A";
?>
-<p class="header2"><?php echo _("Add a Catalog"); ?></p>
+<?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>
-<div class="text-box">
<form name="update_catalog" method="post" action="<?php echo conf('web_path'); ?>/admin/catalog.php" enctype="multipart/form-data">
<table class="tabledata" cellpadding="0" border="0" cellspacing="0">
<tr>
@@ -64,11 +63,6 @@ $default_sort = "%a/%A";
</tr>
<tr>
- <td><?php echo _("ID3 Set Command"); ?>: </td>
- <td><input size="60" type="text" name="id3set_command" value="<?php echo $default_id3; ?>" /></td>
-</tr>
-
-<tr>
<td><?php echo _("Filename Pattern"); ?>: </td>
<td><input size="60" type="text" name="rename_pattern" value="<?php echo $default_rename; ?>" /></td>
</tr>
@@ -114,5 +108,4 @@ $default_sort = "%a/%A";
</table>
</form>
-</div>
-
+<?php show_box_bottom(); ?>
diff --git a/templates/show_preferences.inc b/templates/show_preferences.inc
index fab54b53..b9bf1e53 100644
--- a/templates/show_preferences.inc
+++ b/templates/show_preferences.inc
@@ -47,6 +47,7 @@ if (($GLOBALS['user']->has_access(100)) AND ($user_id == '-1' AND conf('use_auth
$show_apply_to_all = true;
}
?>
+<?php show_box_top(); ?>
<span class="header1">
<?php echo _("Editing"); ?> <?php echo $fullname; ?> <?php echo _('preferences'); ?>
<?php if ($GLOBALS['user']->has_access(100)) { ?>
@@ -97,3 +98,4 @@ if ($current_tab != 'account') {
?>
</form>
</div>
+<?php show_box_bottom(); ?>