From ba22f56f649059a9f112c08da26a1b94e71e52d5 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 5 Jan 2010 08:12:44 +0000
Subject: [PATCH] Updated blocklist

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15030 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../gofax/gofax/blocklists/blocklist-list.xml |  4 ++--
 .../gofax/gofax/blocklists/remove.tpl         | 21 +++++++------------
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/gosa-plugins/gofax/gofax/blocklists/blocklist-list.xml b/gosa-plugins/gofax/gofax/blocklists/blocklist-list.xml
index ce76faca4..4ab45d925 100644
--- a/gosa-plugins/gofax/gofax/blocklists/blocklist-list.xml
+++ b/gosa-plugins/gofax/gofax/blocklists/blocklist-list.xml
@@ -21,7 +21,7 @@
 
     <objectType>
       <label>Receive blocklist</label>
-      <objectClass>goFaxSBlock</objectClass>
+      <objectClass>goFaxRBlock</objectClass>
       <category>gofaxlist</category>
       <class>blocklistGeneric</class>
       <image>plugins/gofax/images/list_blocklist.png</image>
@@ -79,7 +79,7 @@
       <name>new</name>
       <type>entry</type>
       <image>plugins/gofax/images/list_new_blocklist.png</image>
-      <label>Macro</label>
+      <label>Blocklist</label>
      </action>
     </action>
 
diff --git a/gosa-plugins/gofax/gofax/blocklists/remove.tpl b/gosa-plugins/gofax/gofax/blocklists/remove.tpl
index 861e377ba..29adedf1b 100644
--- a/gosa-plugins/gofax/gofax/blocklists/remove.tpl
+++ b/gosa-plugins/gofax/gofax/blocklists/remove.tpl
@@ -1,24 +1,17 @@
 <div style="font-size:18px;">
- <img alt="" src="images/warning.png" align=top>&nbsp;{t}Warning{/t}
+  <img alt="" src="images/warning.png" align=top>&nbsp;{t}Warning{/t}
 </div>
 <p>
- {$info}
- {t}Please double check if your really want to do this since there is no way for GOsa to get your data back.{/t}
+  {$info}
+  {t}Please double check if you really want to do this since there is no way for GOsa to get your data back.{/t}
 </p>
 
 <p>
- {t}So - if you're sure - press 'Delete' to continue or 'Cancel' to abort.{/t}
+  {t}So - if you're sure - press 'Delete' to continue or 'Cancel' to abort.{/t}
 </p>
 
 <p class="plugbottom">
-	{if $multiple}
-		<input type=submit name="delete_multiple_blocklist_confirm" value="{msgPool type=delButton}">
-		&nbsp;
-		<input type=submit name="delete_multiple_blocklist_cancel" value="{msgPool type=cancelButton}">
-	{else}
-		<input type=submit name="delete_blocklist_confirm" value="{msgPool type=delButton}">
-		&nbsp;
-		<input type=submit name="delete_blocklist_cancel" value="{msgPool type=cancelButton}">
-	{/if}
+  <input type=submit name="delete_confirmed" value="{msgPool type=delButton}">
+  &nbsp;
+  <input type=submit name="delete_cancel" value="{msgPool type=cancelButton}">
 </p>
-
-- 
2.30.2