[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] admin/inc class.uiapplications.inc.php
From: |
Sigurd Nes |
Subject: |
[Phpgroupware-cvs] admin/inc class.uiapplications.inc.php |
Date: |
Mon, 27 Nov 2006 08:39:41 +0000 |
CVSROOT: /sources/phpgroupware
Module name: admin
Changes by: Sigurd Nes <sigurdne> 06/11/27 08:39:41
Modified files:
inc : class.uiapplications.inc.php
Log message:
notice
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/admin/inc/class.uiapplications.inc.php?cvsroot=phpgroupware&r1=1.14&r2=1.15
Patches:
Index: class.uiapplications.inc.php
===================================================================
RCS file: /sources/phpgroupware/admin/inc/class.uiapplications.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- class.uiapplications.inc.php 8 Jul 2006 13:37:35 -0000 1.14
+++ class.uiapplications.inc.php 27 Nov 2006 08:39:41 -0000 1.15
@@ -9,7 +9,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.uiapplications.inc.php,v 1.14 2006/07/08 13:37:35 skwashd Exp
$ */
+ /* $Id: class.uiapplications.inc.php,v 1.15 2006/11/27 08:39:41 sigurdne Exp
$ */
class uiapplications
{
@@ -37,13 +37,14 @@
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
+ $GLOBALS['phpgw']->template->set_root(PHPGW_APP_TPL);
$GLOBALS['phpgw']->template->set_file(array('applications' =>
'applications.tpl'));
$GLOBALS['phpgw']->template->set_block('applications','list','list');
$GLOBALS['phpgw']->template->set_block('applications','row','row');
- $start = $_POST['start'];
- $sort = $_GET['sort'];
- $order = $_GET['order'];
+ $start = get_var('start',array('POST'));
+ $sort = get_var('sort',array('GET'));
+ $order = get_var('order',array('GET'));
$offset =
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
$apps = $this->bo->get_list();
@@ -105,13 +106,14 @@
$GLOBALS['phpgw']->template->set_var('lang_delete',lang('Delete'));
$GLOBALS['phpgw']->template->set_var('lang_enabled',lang('Enabled'));
-
$GLOBALS['phpgw']->template->set_var('new_action',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.add'));
+
$GLOBALS['phpgw']->template->set_var('new_action',$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'admin.uiapplications.add')));
$GLOBALS['phpgw']->template->set_var('lang_note',lang('(To install new
applications use<br><a href="setup/" target="setup">Setup</a> [Manage
Applications] !!!)'));
$GLOBALS['phpgw']->template->set_var('lang_add',lang('add'));
+ $tr_color = '';
foreach ( $applications as $key => $app )
{
- $tr_color =
$this->nextmatchs->alternate_row_color($tr_color);
+ $tr_color =
$this->nextmatchs->alternate_row_class($tr_color);
if($app['title'])
{
@@ -129,8 +131,8 @@
$GLOBALS['phpgw']->template->set_var('tr_color',$tr_color);
$GLOBALS['phpgw']->template->set_var('name',$name);
- $GLOBALS['phpgw']->template->set_var('edit','<a
href="' .
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.edit&app_name='
. urlencode($app['name'])) . '"> ' . lang('Edit') . ' </a>');
-
$GLOBALS['phpgw']->template->set_var('delete','<a href="' .
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.delete&app_name='
. urlencode($app['name'])) . '"> ' . lang('Delete') . ' </a>');
+ $GLOBALS['phpgw']->template->set_var('edit','<a
href="' .
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'admin.uiapplications.edit','app_name'=>urlencode($app['name'])))
. '"> ' . lang('Edit') . ' </a>');
+
$GLOBALS['phpgw']->template->set_var('delete','<a href="' .
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'admin.uiapplications.delete','app_name'=>urlencode($app['name'])))
. '"> ' . lang('Delete') . ' </a>');
if ($app['status'])
{
@@ -150,7 +152,7 @@
function display_row($label, $value)
{
-
$GLOBALS['phpgw']->template->set_var('tr_color',$this->nextmatchs->alternate_row_color());
+
$GLOBALS['phpgw']->template->set_var('tr_color',$this->nextmatchs->alternate_row_class());
$GLOBALS['phpgw']->template->set_var('label',$label);
$GLOBALS['phpgw']->template->set_var('value',$value);
$GLOBALS['phpgw']->template->parse('rows','row',True);
@@ -212,7 +214,7 @@
$GLOBALS['phpgw']->template->set_var('lang_header',lang('Add new application'));
$GLOBALS['phpgw']->template->set_var('hidden_vars','');
-
$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.add'));
+
$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'admin.uiapplications.add')));
$this->display_row(lang('application name'),'<input
name="n_app_name" value="' . $n_app_name . '">');
@@ -286,7 +288,7 @@
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
- if ($totalerrors)
+ if (isset($totalerrors) && $totalerrors)
{
$GLOBALS['phpgw']->template->set_var('error','<p><center>' .
$GLOBALS['phpgw']->common->error_list($error) . '</center><br>');
}
@@ -298,7 +300,7 @@
$GLOBALS['phpgw']->template->set_var('lang_header',lang('Edit application'));
$GLOBALS['phpgw']->template->set_var('hidden_vars','<input type="hidden"
name="old_app_name" value="' . $old_app_name . '">');
-
$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.edit'));
+
$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'admin.uiapplications.edit')));
$this->display_row(lang('application name'),'<input
name="n_app_name" value="' . $n_app_name . '">');
@@ -306,9 +308,9 @@
$GLOBALS['phpgw']->template->set_var('lang_submit_button',lang('edit'));
$selected[$n_app_status] = ' selected';
- $status_html = '<option value="0"' . $selected[0] . '>'
. lang('Disabled') . '</option>'
- . '<option value="1"' . $selected[1] . '>' .
lang('Enabled') . '</option>'
- . '<option value="2"' . $selected[2] . '>' .
lang('Enabled - Hidden from navbar') . '</option>';
+ $status_html = '<option value="0"' .
(isset($selected[0])?$selected[0]:'') . '>' . lang('Disabled') . '</option>'
+ . '<option value="1"' .
(isset($selected[1])?$selected[1]:'') . '>' . lang('Enabled') . '</option>'
+ . '<option value="2"' .
(isset($selected[2])?$selected[2]:'') . '>' . lang('Enabled - Hidden from
navbar') . '</option>';
$this->display_row(lang("Status"),'<select
name="n_app_status">' . $status_html . '</select>');
$this->display_row(lang("Select which location this app
should appear on the navbar, lowest (left) to highest (right)"),'<input
name="app_order" value="' . $app_order . '">');
@@ -340,8 +342,8 @@
echo parse_navbar();
$GLOBALS['phpgw']->template->set_var('messages',lang('Are you sure you want to
delete this application ?'));
- $GLOBALS['phpgw']->template->set_var('no','<a href="' .
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.get_list')
. '">' . lang('No') . '</a>');
- $GLOBALS['phpgw']->template->set_var('yes','<a href="'
.
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiapplications.delete&app_name='
. urlencode($app_name) . "&confirm=True") . '">' . lang('Yes') . '</a>');
+ $GLOBALS['phpgw']->template->set_var('no','<a href="' .
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'admin.uiapplications.get_list'))
. '">' . lang('No') . '</a>');
+ $GLOBALS['phpgw']->template->set_var('yes','<a href="'
.
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'admin.uiapplications.delete','app_name'=>
urlencode($app_name), 'confirm'=>'True')) . '">' . lang('Yes') . '</a>');
$GLOBALS['phpgw']->template->pparse('out','body');
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] admin/inc class.uiapplications.inc.php,
Sigurd Nes <=