[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: preferences/inc class.uiaclprefs.inc.php,1.12,1.
|
From: |
Ralf Becker <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: preferences/inc class.uiaclprefs.inc.php,1.12,1.13 class.uicategories.inc.php,1.24,1.25 |
|
Date: |
Sun, 20 Apr 2003 16:43:29 -0400 |
Update of /cvsroot/phpgroupware/preferences/inc
In directory subversions:/tmp/cvs-serv4664/inc
Modified Files:
class.uiaclprefs.inc.php class.uicategories.inc.php
Log Message:
added app_header via $GLOBALS['phpgw_info']['flags']['app_header']
Index: class.uiaclprefs.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/inc/class.uiaclprefs.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** class.uiaclprefs.inc.php 12 Mar 2003 23:30:58 -0000 1.12
--- class.uiaclprefs.inc.php 20 Apr 2003 20:43:26 -0000 1.13
***************
*** 30,34 ****
$s_groups = get_var('s_groups',Array('GET','POST'));
$s_users = get_var('s_users',Array('GET','POST'));
-
$owner = get_var('owner',Array('POST','GET'));
--- 30,33 ----
***************
*** 38,41 ****
--- 37,44 ----
$acl_app_not_passed = True;
}
+ else
+ {
+
$GLOBALS['phpgw']->translation->add_app($acl_app);
+ }
$GLOBALS['phpgw_info']['flags']['currentapp'] =
$acl_app;
***************
*** 197,200 ****
--- 200,204 ----
}
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('%1 - Preferences',$GLOBALS['phpgw_info']['apps'][$acl_app]['title']).' -
'.lang('acl').': '.$owner_name;
$GLOBALS['phpgw']->common->phpgw_header();
***************
*** 225,232 ****
$var = Array(
'errors' => '',
! 'title' =>
'<p><b>'.lang($GLOBALS['phpgw_info']['flags']['currentapp'].' preferences').' -
'.lang('acl').': '.$owner_name.'</b><hr><p>',
'action_url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uiaclprefs.index&acl_app='
. $acl_app),
'bg_color' =>
$GLOBALS['phpgw_info']['theme']['th_bg'],
! 'submit_lang' => lang('submit'),
'common_hidden_vars_form' => $common_hidden_vars
);
--- 229,236 ----
$var = Array(
'errors' => '',
! 'title' => '<br>',
'action_url' =>
$GLOBALS['phpgw']->link('/index.php','menuaction=preferences.uiaclprefs.index&acl_app='
. $acl_app),
'bg_color' =>
$GLOBALS['phpgw_info']['theme']['th_bg'],
! 'submit_lang' => lang('Save'),
'common_hidden_vars_form' => $common_hidden_vars
);
Index: class.uicategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/inc/class.uicategories.inc.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** class.uicategories.inc.php 15 Oct 2002 21:41:50 -0000 1.24
--- class.uicategories.inc.php 20 Apr 2003 20:43:26 -0000 1.25
***************
*** 111,115 ****
$edata = explode(',',$extra);
}
!
$GLOBALS['phpgw']->common->phpgw_header();
--- 111,116 ----
$edata = explode(',',$extra);
}
! $GLOBALS['phpgw_info']['flags']['app_header'] =
$GLOBALS['phpgw_info']['apps'][$cats_app]['title'].
! ' '.lang('categories
for').': '.$this->user;
$GLOBALS['phpgw']->common->phpgw_header();
***************
*** 204,207 ****
--- 205,212 ----
}
}
+ else
+ {
+
$GLOBALS['phpgw']->template->set_var('td_data','');
+ }
if ($level == 0)
***************
*** 305,313 ****
{
$this->cat_id =
$this->bo->save_cat($values);
! $message = lang('Category x has
been added !', $values['name']);
}
}
}
$GLOBALS['phpgw']->common->phpgw_header();
--- 310,320 ----
{
$this->cat_id =
$this->bo->save_cat($values);
! $message = lang('Category %1
has been added !', $values['name']);
}
}
}
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('Add %1 category for',
+
$GLOBALS['phpgw_info']['apps'][$cats_app]['title']).': '.$this->user;
$GLOBALS['phpgw']->common->phpgw_header();
***************
*** 320,324 ****
$this->set_langs();
!
$GLOBALS['phpgw']->template->set_var('title_categories',lang('Add x category
for',lang($cats_app)));
$GLOBALS['phpgw']->template->set_var('message',$message);
$GLOBALS['phpgw']->template->set_var('lang_app',lang($cats_app));
--- 327,331 ----
$this->set_langs();
!
$GLOBALS['phpgw']->template->set_var('title_categories',lang('Add %1 category
for',lang($cats_app)));
$GLOBALS['phpgw']->template->set_var('message',$message);
$GLOBALS['phpgw']->template->set_var('lang_app',lang($cats_app));
***************
*** 363,366 ****
--- 370,377 ----
}
}
+ else
+ {
+ $GLOBALS['phpgw']->template->set_var('rows','');
+ }
$link_data['menuaction'] =
'preferences.uicategories.index';
***************
*** 389,393 ****
if (!$this->cat_id)
{
! Header('Location: ' .
$GLOBALS['phpgw']->link('/index.php',$link_data));
}
--- 400,404 ----
if (!$this->cat_id)
{
!
$GLOBALS['phpgw']->link_redirect('/index.php',$link_data);
}
***************
*** 395,398 ****
--- 406,413 ----
$cat_data = get_var('cat_data',Array('POST'));
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('Edit %1 category for',
+
$GLOBALS['phpgw_info']['apps'][$cats_app]['title']).': '.$this->user;
+ $GLOBALS['phpgw']->common->phpgw_header();
+
if (get_var('submit',Array('POST')))
{
***************
*** 415,425 ****
{
$this->cat_id =
$this->bo->save_cat($values);
! $message = lang('Category x has
been updated !',$values['name']);
}
}
}
- $GLOBALS['phpgw']->common->phpgw_header();
-
$GLOBALS['phpgw']->template->set_file(array('cat_form'
=> 'category_form.tpl'));
$GLOBALS['phpgw']->template->set_block('cat_form','data_row');
--- 430,438 ----
{
$this->cat_id =
$this->bo->save_cat($values);
! $message = lang('Category %1
has been updated !',$values['name']);
}
}
}
$GLOBALS['phpgw']->template->set_file(array('cat_form'
=> 'category_form.tpl'));
$GLOBALS['phpgw']->template->set_block('cat_form','data_row');
***************
*** 432,436 ****
$cats = $this->bo->cats->return_single($this->cat_id);
!
$GLOBALS['phpgw']->template->set_var('title_categories',lang('Edit x category
for',lang($cats_app)));
$GLOBALS['phpgw']->template->set_var('message',$message);
$GLOBALS['phpgw']->template->set_var('lang_app',lang($cats_app));
--- 445,449 ----
$cats = $this->bo->cats->return_single($this->cat_id);
!
$GLOBALS['phpgw']->template->set_var('title_categories',lang('Edit %1 category
for',lang($cats_app)));
$GLOBALS['phpgw']->template->set_var('message',$message);
$GLOBALS['phpgw']->template->set_var('lang_app',lang($cats_app));
***************
*** 478,481 ****
--- 491,498 ----
}
}
+ else
+ {
+ $GLOBALS['phpgw']->template->set_var('rows','');
+ }
if ($cats[0]['owner'] == $this->account)
***************
*** 510,516 ****
);
! if (!$this->cat_id)
{
! Header('Location: ' .
$GLOBALS['phpgw']->link('/index.php',$link_data));
}
--- 527,533 ----
);
! if (!$this->cat_id || $_POST['cancel'])
{
!
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
}
***************
*** 525,533 ****
case 'move':
$this->bo->delete(array('cat_id' => $this->cat_id,'modify_subs' => True));
- Header('Location: ' .
$GLOBALS['phpgw']->link('/index.php',$link_data));
break;
case 'drop':
$this->bo->delete(array('cat_id' => $this->cat_id,'drop_subs' => True));
- Header('Location: ' .
$GLOBALS['phpgw']->link('/index.php',$link_data));
break;
default:
--- 542,548 ----
***************
*** 539,546 ****
{
$this->bo->delete(array('cat_id' =>
$this->cat_id));
- Header('Location: ' .
$GLOBALS['phpgw']->link('/index.php',$link_data));
}
}
$GLOBALS['phpgw']->common->phpgw_header();
$GLOBALS['phpgw']->template->set_file(array('category_delete' => 'delete.tpl'));
--- 554,562 ----
{
$this->bo->delete(array('cat_id' =>
$this->cat_id));
}
+
$GLOBALS['phpgw']->redirect_link('/index.php',$link_data);
}
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('Delete Categories');
$GLOBALS['phpgw']->common->phpgw_header();
$GLOBALS['phpgw']->template->set_file(array('category_delete' => 'delete.tpl'));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: preferences/inc class.uiaclprefs.inc.php,1.12,1.13 class.uicategories.inc.php,1.24,1.25,
Ralf Becker <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: phpgwapi/templates/default/css black.css,1.3,1.4 blue.css,1.3,1.4 brown.css,1.3,1.4 darkblue.css,1.3,1.4 darkgreen.css,1.3,1.4 default.css,1.1,1.2 fancy.css,1.4,1.5 greys.css,1.3,1.4 heaven.css,1.3,1.4 lightblue.css,1.3,1.4 lightbrown.css,1.3,1.4 lilac.css,1.2,1.3 mojo.css,1.3,1.4 phpgw.css,1.7,1.8 purple.css,1.3,1.4 red.css,1.3,1.4 rose.css,1.3,1.4 submarine.css,1.14,1.15 yellows.css,1.3,1.4
- Next by Date:
[Phpgroupware-cvs] CVS: preferences changepassword.php,1.40,1.41 preferences.php,1.30,1.31
- Previous by thread:
[Phpgroupware-cvs] CVS: phpgwapi/templates/default/css black.css,1.3,1.4 blue.css,1.3,1.4 brown.css,1.3,1.4 darkblue.css,1.3,1.4 darkgreen.css,1.3,1.4 default.css,1.1,1.2 fancy.css,1.4,1.5 greys.css,1.3,1.4 heaven.css,1.3,1.4 lightblue.css,1.3,1.4 lightbrown.css,1.3,1.4 lilac.css,1.2,1.3 mojo.css,1.3,1.4 phpgw.css,1.7,1.8 purple.css,1.3,1.4 red.css,1.3,1.4 rose.css,1.3,1.4 submarine.css,1.14,1.15 yellows.css,1.3,1.4
- Next by thread:
[Phpgroupware-cvs] CVS: preferences changepassword.php,1.40,1.41 preferences.php,1.30,1.31
- Index(es):