[pkg-kolab] r355 - in trunk/kolab-webadmin/debian: . patches

[Noel Koethe]

Author: noel
Date: 2006-03-16 13:00:06 +0000 (Thu, 16 Mar 2006)
New Revision: 355

Added:
   trunk/kolab-webadmin/debian/distdeleted.tpl
   trunk/kolab-webadmin/debian/patches/30-admin_distributionlist_list.dpatch
   trunk/kolab-webadmin/debian/sfdeleted.tpl
Modified:
   trunk/kolab-webadmin/debian/changelog
   trunk/kolab-webadmin/debian/patches/00list
   trunk/kolab-webadmin/debian/rules
Log:
add missing templates and fix admin distributionlist file

Modified: trunk/kolab-webadmin/debian/changelog
===================================================================
--- trunk/kolab-webadmin/debian/changelog	2006-03-04 22:58:31 UTC (rev 354)
+++ trunk/kolab-webadmin/debian/changelog	2006-03-16 13:00:06 UTC (rev 355)
@@ -1,8 +1,9 @@
-kolab-webadmin (0.4.0-3) UNRELEASED; urgency=low
+kolab-webadmin (0.4.0-3) experimental; urgency=low
 
-  * 
+  * add missing .tpl files
+  * add 30-admin_distributionlist_list.patch
 
- -- Noèl Köthe <noel at debian.org>  Mon, 20 Feb 2006 12:36:00 +0100
+ -- Noèl Köthe <noel at debian.org>  Thu, 16 Mar 2006 13:44:47 +0100
 
 kolab-webadmin (0.4.0-2) experimental; urgency=low
 

Added: trunk/kolab-webadmin/debian/distdeleted.tpl
===================================================================
--- trunk/kolab-webadmin/debian/distdeleted.tpl	2006-03-04 22:58:31 UTC (rev 354)
+++ trunk/kolab-webadmin/debian/distdeleted.tpl	2006-03-16 13:00:06 UTC (rev 355)
@@ -0,0 +1,12 @@
+{* Smarty Template *}
+{*
+  Local variables:
+  buffer-file-coding-system: utf-8
+  End:
+*}
+<h1>{$heading}</h1>
+
+<div content="contentsimple">
+<p>{tr msg="The distribution list with DN"} {$dn|escape} {tr msg="has been deleted"}</p>
+<p><a href="index.php">{tr msg="Back to list of distribution lists"}</a></p>
+</div>

Modified: trunk/kolab-webadmin/debian/patches/00list
===================================================================
--- trunk/kolab-webadmin/debian/patches/00list	2006-03-04 22:58:31 UTC (rev 354)
+++ trunk/kolab-webadmin/debian/patches/00list	2006-03-16 13:00:06 UTC (rev 355)
@@ -1,2 +1,3 @@
 10-fix-require
 20-service_index
+30-admin_distributionlist_list

Added: trunk/kolab-webadmin/debian/patches/30-admin_distributionlist_list.dpatch
===================================================================
--- trunk/kolab-webadmin/debian/patches/30-admin_distributionlist_list.dpatch	2006-03-04 22:58:31 UTC (rev 354)
+++ trunk/kolab-webadmin/debian/patches/30-admin_distributionlist_list.dpatch	2006-03-16 13:00:06 UTC (rev 355)
@@ -0,0 +1,36 @@
+#!/bin/sh -e
+## 30-admin_distributionlist_list.patch by Tobias König <tobias.koenig at credativ.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: admin_distributionlist_list
+
+if [ $# -lt 1 ]; then
+echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+      -patch) patch $patch_opts -p1 < $0;;
+      -unpatch) patch $patch_opts -p1 -R < $0;;
+      *)
+      echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+      exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+--- list.php.orig	2006-02-02 14:10:08.000000000 +0100
++++ kolab-webadmin-0.4.0/www/admin/distributionlist/list.php	2006-02-02 14:10:23.000000000 +0100
+@@ -309,7 +309,7 @@ if( !$errors ) {
+ 	  if( $ldap->deleteGroupOfNames($dn) ) {
+ 		$messages[] = _('Distribution List ').$_REQUEST['cn']._(' deleted');
+ 		$heading = _('Entry Deleted');
+-		$contenttemplate = 'sfdeleted.tpl';
++		$contenttemplate = 'distdeleted.tpl';
+ 	  } else {
+ 		array_push($errors, _("LDAP Error: could delete $dn: ").ldap_error($link));		
+ 	  }


Property changes on: trunk/kolab-webadmin/debian/patches/30-admin_distributionlist_list.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/kolab-webadmin/debian/rules
===================================================================
--- trunk/kolab-webadmin/debian/rules	2006-03-04 22:58:31 UTC (rev 354)
+++ trunk/kolab-webadmin/debian/rules	2006-03-16 13:00:06 UTC (rev 355)
@@ -50,6 +50,8 @@
 	dh_installdirs
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/kolab-webadmin
 	install -D -m 644 debian/session_vars.php $(CURDIR)/debian/kolab-webadmin/etc/kolab-webadmin/session_vars.php
+	install -D -m 644 debian/distdeleted.tpl debian/kolab-webadmin/usr/share/kolab-webadmin/admin/templates/distdeleted.tpl
+	install -D -m 644 debian/sfdeleted.tpl debian/kolab-webadmin/usr/share/kolab-webadmin/admin/templates/sfdeleted.tpl
 
 
 # Build architecture-independent files here.

Added: trunk/kolab-webadmin/debian/sfdeleted.tpl
===================================================================
--- trunk/kolab-webadmin/debian/sfdeleted.tpl	2006-03-04 22:58:31 UTC (rev 354)
+++ trunk/kolab-webadmin/debian/sfdeleted.tpl	2006-03-16 13:00:06 UTC (rev 355)
@@ -0,0 +1,12 @@
+{* Smarty Template *}
+{*
+  Local variables:
+  buffer-file-coding-system: utf-8
+  End:
+*}
+<h1>{$heading}</h1>
+
+<div content="contentsimple">
+<p>{tr msg="The shared folder with DN"} {$dn|escape} {tr msg="has been deleted"}</p>
+<p><a href="index.php">{tr msg="Back to list of shared folders"}</a></p>
+</div>