gunnar: server/kolab-webclient/mnemo/patches/mnemo-2.2.3 t_mnemo_HK_GW_ZpushAnnotations.diff, 1.2, 1.3

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolab-webclient/mnemo/patches/mnemo-2.2.3
In directory doto:/tmp/cvs-serv29677/kolab-webclient/mnemo/patches/mnemo-2.2.3

Modified Files:
	t_mnemo_HK_GW_ZpushAnnotations.diff 
Log Message:
Merged Zpush configuration frontend fixes to HEAD.

Index: t_mnemo_HK_GW_ZpushAnnotations.diff
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/mnemo/patches/mnemo-2.2.3/t_mnemo_HK_GW_ZpushAnnotations.diff,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- t_mnemo_HK_GW_ZpushAnnotations.diff	7 Jun 2010 15:44:00 -0000	1.2
+++ t_mnemo_HK_GW_ZpushAnnotations.diff	9 Jun 2010 13:36:12 -0000	1.3
@@ -8,17 +8,19 @@
 diff -Naur a/lib/Forms/EditNotepad.php b/lib/Forms/EditNotepad.php
 --- a/lib/Forms/EditNotepad.php	2010-05-10 08:25:30.000000000 +0200
 +++ b/lib/Forms/EditNotepad.php	2010-05-10 08:28:09.000000000 +0200
-@@ -40,16 +40,46 @@
+@@ -40,16 +40,47 @@
          parent::Horde_Form($vars, sprintf(_("Edit %s"), $notepad->get('name')));
  
          $this->addHidden('', 'n', 'text', true);
 -        $this->addVariable(_("Name"), 'name', 'text', true);
 +        if ($this->_notepad->get('owner') != Auth::getAuth()) {
 +            $this->addVariable(_("Name"), 'name', 'text', false, true);
++            $this->addVariable(_("Description"), 'description', 'longtext', false, true);
 +        } else {
 +            $this->addVariable(_("Name"), 'name', 'text', true);
++            $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
 +        }
-         $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
+-        $this->addVariable(_("Description"), 'description', 'longtext', false, false, null, array(4, 60));
  
          $this->setButtons(array(_("Save")));
      }