summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorElias Probst <mail@eliasprobst.eu>2010-12-08 08:48:49 -0400
committerKarl Vollmer <vollmer@ampache.org>2010-12-08 08:48:49 -0400
commit36294e3529eada2de8ed51c5b135ab5376e16700 (patch)
treebfdb0b5db7f081dc6b65a0324e1ff7428e4a0369 /templates
parente0f8bbc6385bc83fcbb68d93ee0509a1aa0e6b89 (diff)
downloadampache-36294e3529eada2de8ed51c5b135ab5376e16700.tar.gz
ampache-36294e3529eada2de8ed51c5b135ab5376e16700.tar.bz2
ampache-36294e3529eada2de8ed51c5b135ab5376e16700.zip
Merge following commit.
commit 8022d791a41729492a55c98b48c43b293d3ad6dd Author: Elias Probst <mail@eliasprobst.eu> Date: Wed Dec 8 03:38:30 2010 +0100 Provide the capability to show an general error in some more templates.
Diffstat (limited to 'templates')
-rw-r--r--templates/show_add_access.inc.php1
-rw-r--r--templates/show_add_access_current.inc.php1
-rw-r--r--templates/show_add_access_local.inc.php1
-rw-r--r--templates/show_add_access_rpc.inc.php1
4 files changed, 4 insertions, 0 deletions
diff --git a/templates/show_add_access.inc.php b/templates/show_add_access.inc.php
index e3bd9362..a9ab4cb1 100644
--- a/templates/show_add_access.inc.php
+++ b/templates/show_add_access.inc.php
@@ -21,6 +21,7 @@
*/
?>
<?php show_box_top(_('Advanced Add')); ?>
+<?php Error::display('general'); ?>
<form name="update_catalog" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/access.php?action=add_host&method=advanced">
<table class="tabledata" cellpadding="5" cellspacing="0">
<tr>
diff --git a/templates/show_add_access_current.inc.php b/templates/show_add_access_current.inc.php
index ec3f8f79..8333953a 100644
--- a/templates/show_add_access_current.inc.php
+++ b/templates/show_add_access_current.inc.php
@@ -21,6 +21,7 @@
*/
?>
<?php show_box_top(_('Add Current Host')); ?>
+<?php Error::display('general'); ?>
<form name="update_catalog" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/access.php?action=add_host&method=current">
<table class="tabledata" cellpadding="5" cellspacing="0">
<tr>
diff --git a/templates/show_add_access_local.inc.php b/templates/show_add_access_local.inc.php
index 2e509731..04b4ad2a 100644
--- a/templates/show_add_access_local.inc.php
+++ b/templates/show_add_access_local.inc.php
@@ -21,6 +21,7 @@
*/
?>
<?php show_box_top(_('Add Local Network Definition')); ?>
+<?php Error::display('general'); ?>
<form name="update_catalog" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/access.php?action=add_host&method=local">
<table class="tabledata" cellpadding="5" cellspacing="0">
<tr>
diff --git a/templates/show_add_access_rpc.inc.php b/templates/show_add_access_rpc.inc.php
index 3f2c07b0..e1076f97 100644
--- a/templates/show_add_access_rpc.inc.php
+++ b/templates/show_add_access_rpc.inc.php
@@ -21,6 +21,7 @@
*/
?>
<?php show_box_top(_('Add API / RPC Host')); ?>
+<?php Error::display('general'); ?>
<form name="update_catalog" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/access.php?action=add_host&method=rpc">
<table class="tabledata" cellpadding="5" cellspacing="0">
<tr>