phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] admin/inc class.uicategories.inc.php


From: Dave Hall
Subject: [Phpgroupware-cvs] admin/inc class.uicategories.inc.php
Date: Tue, 18 Apr 2006 13:50:11 +0000

CVSROOT:        /cvsroot/phpgroupware
Module name:    admin
Branch:         
Changes by:     Dave Hall <address@hidden>      06/04/18 13:50:11

Modified files:
        inc            : class.uicategories.inc.php 

Log message:
        more fixes

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/admin/inc/class.uicategories.inc.php.diff?tr1=1.44&tr2=1.45&r1=text&r2=text

Patches:
Index: admin/inc/class.uicategories.inc.php
diff -u admin/inc/class.uicategories.inc.php:1.44 
admin/inc/class.uicategories.inc.php:1.45
--- admin/inc/class.uicategories.inc.php:1.44   Tue Apr 18 11:35:11 2006
+++ admin/inc/class.uicategories.inc.php        Tue Apr 18 13:50:10 2006
@@ -9,7 +9,7 @@
        *  Free Software Foundation; either version 2 of the License, or (at 
your  *
        *  option) any later version.                                           
   *
        
\**************************************************************************/
-       /* $Id: class.uicategories.inc.php,v 1.44 2006/04/18 11:35:11 skwashd 
Exp $ */
+       /* $Id: class.uicategories.inc.php,v 1.45 2006/04/18 13:50:10 skwashd 
Exp $ */
        /* $Source: 
/cvsroot/phpgroupware/admin/inc/class.uicategories.inc.php,v $ */
 
        class uicategories
@@ -205,19 +205,19 @@
 
                                $content[] = array
                                (
-                                       'name'                                  
        => $cat_name . $appendix,
-                                       'descr'                                 
        => $descr,
-                                       'date'                                  
        => $note['date'],
-                                       'main'                                  
        => $main,
-                                       'add_sub_url'                           
=> $add_sub_url,
-                                       'edit_url'                              
        => $edit_url,
-                                       'delete_url'                            
=> $delete_url,
+                                       'name'                          => 
$cat_name . $appendix,
+                                       'descr'                         => 
$descr,
+                                       'date'                          => 
$note['date'],
+                                       'main'                          => 
$main,
+                                       'add_sub_url'                   => 
$add_sub_url,
+                                       'edit_url'                      => 
$edit_url,
+                                       'delete_url'                    => 
$delete_url,
                                        'lang_add_sub_statustext'       => 
lang('add a subcategory'),
                                        'lang_edit_statustext'          => 
lang('edit this category'),
                                        'lang_delete_statustext'        => 
lang('delete this category'),
-                                       'lang_add_sub'                          
=> lang('add sub'),
-                                       'lang_edit'                             
        => $lang_edit,
-                                       'lang_delete'                           
=> $lang_delete
+                                       'lang_add_sub'                  => 
lang('add sub'),
+                                       'lang_edit'                     => 
$lang_edit,
+                                       'lang_delete'                   => 
$lang_delete
                                );
                        }
 
@@ -259,8 +259,8 @@
                function edit()
                {
                        $global_cats    = 
get_var('global_cats',array('POST','GET'));
-                       $parent                 = 
get_var('parent',array('GET'));
-                       $values                 = 
get_var('values',array('POST'));
+                       $parent         = get_var('parent',array('GET'));
+                       $values         = get_var('values',array('POST'));
 
                        $link_data = array
                        (
@@ -327,23 +327,23 @@
                        $data = array
                        (
                                'img_color_selector'            => 
$GLOBALS['phpgw']->common->image('phpgwapi', 'color_selector'),
-                               'lang_name'                                     
=> lang('name'),
-                               'lang_color'                            => 
lang('color'),
+                               'lang_name'                     => lang('name'),
+                               'lang_color'                    => 
lang('color'),
                                'lang_color_selector'           => lang('color 
selector'),
-                               'lang_descr'                            => 
lang('description'),
-                               'lang_parent'                           => 
lang('parent category'),
-                               'old_parent'                            => 
$cats['parent'],
-                               'lang_save'                                     
=> lang('save'),
-                               'lang_apply'                            => 
lang('apply'),
-                               'lang_cancel'                           => 
lang('cancel'),
-                               'value_name'                            => 
$GLOBALS['phpgw']->strip_html($cats['name']),
-                               'value_descr'                           => 
$GLOBALS['phpgw']->strip_html($cats['descr']),
-                               'message'                                       
=> $message,
+                               'lang_descr'                    => 
lang('description'),
+                               'lang_parent'                   => lang('parent 
category'),
+                               'old_parent'                    => 
$cats['parent'],
+                               'lang_save'                     => lang('save'),
+                               'lang_apply'                    => 
lang('apply'),
+                               'lang_cancel'                   => 
lang('cancel'),
+                               'value_name'                    => 
$GLOBALS['phpgw']->strip_html($cats[0]['name']),
+                               'value_descr'                   => 
$GLOBALS['phpgw']->strip_html($cats[0]['description']),
+                               'message'                       => $message,
                                'lang_content_statustext'       => lang('enter 
a description for the category'),
                                'lang_cancel_statustext'        => lang('leave 
the category untouched and return back to the list'),
                                'lang_save_statustext'          => lang('save 
the category and return back to the list'),
                                'lang_apply_statustext'         => lang('save 
the category'),
-                               'cat_select'                            => 
$this->bo->cats->formatted_xslt_list(array('select_name' => 'values[parent]', 
'selected' => $parent,'self' => $this->cat_id,'globals' => $global_cats))
+                               'cat_select'                    => 
$this->bo->cats->formatted_xslt_list(array('select_name' => 'values[parent]', 
'selected' => $parent,'self' => $this->cat_id,'globals' => $global_cats))
                        );
 
                        $link_data['menuaction'] = 'admin.uicategories.edit';




reply via email to

[Prev in Thread] Current Thread [Next in Thread]