From d8e16f226c45fe2599fbabed7af9573defddab90 Mon Sep 17 00:00:00 2001 From: seek3r Date: Fri, 24 May 2002 21:56:56 +0000 Subject: [PATCH] more improvements on the msgbox --- phpgwapi/inc/class.common.inc.php | 17 +++++--- phpgwapi/templates/default/common.tpl | 40 ++++-------------- .../templates/default/images/msgbox_bad.jpg | Bin 0 -> 2594 bytes .../templates/default/images/msgbox_good.jpg | Bin 0 -> 2801 bytes 4 files changed, 20 insertions(+), 37 deletions(-) create mode 100755 phpgwapi/templates/default/images/msgbox_bad.jpg create mode 100755 phpgwapi/templates/default/images/msgbox_good.jpg diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php index f43416fe8f..a83be00f02 100644 --- a/phpgwapi/inc/class.common.inc.php +++ b/phpgwapi/inc/class.common.inc.php @@ -984,8 +984,7 @@ return; } $GLOBALS['phpgw']->template->set_block('common','msgbox_start'); - $GLOBALS['phpgw']->template->set_block('common','msgbox_row_good'); - $GLOBALS['phpgw']->template->set_block('common','msgbox_row_bad'); + $GLOBALS['phpgw']->template->set_block('common','msgbox_row'); $GLOBALS['phpgw']->template->set_block('common','msgbox_end'); $GLOBALS['phpgw']->template->fp('msgbox','msgbox_start'); @@ -1009,12 +1008,15 @@ $GLOBALS['phpgw']->template->set_var('msgbox_text',$key); if ($value == True) { - $GLOBALS['phpgw']->template->fp('msgbox','msgbox_row_good',True); + $GLOBALS['phpgw']->template->set_var('msgbox_img',$this->image('phpgwapi','msgbox_good')); + $GLOBALS['phpgw']->template->set_var('msgbox_img_alt','OK'); } else { - $GLOBALS['phpgw']->template->fp('msgbox','msgbox_row_bad',True); + $GLOBALS['phpgw']->template->set_var('msgbox_img',$this->image('phpgwapi','msgbox_bad')); + $GLOBALS['phpgw']->template->set_var('msgbox_img_alt','ERROR'); } + $GLOBALS['phpgw']->template->fp('msgbox','msgbox_row',True); } } else @@ -1023,12 +1025,15 @@ $GLOBALS['phpgw']->template->set_var('msgbox_text',$text); if ($type == True) { - $GLOBALS['phpgw']->template->fp('msgbox','msgbox_row_good',True); + $GLOBALS['phpgw']->template->set_var('msgbox_img',$this->image('phpgwapi','msgbox_good')); + $GLOBALS['phpgw']->template->set_var('msgbox_img_alt','OK'); } else { - $GLOBALS['phpgw']->template->fp('msgbox','msgbox_row_bad',True); + $GLOBALS['phpgw']->template->set_var('msgbox_img',$this->image('phpgwapi','msgbox_bad')); + $GLOBALS['phpgw']->template->set_var('msgbox_img_alt','ERROR'); } + $GLOBALS['phpgw']->template->fp('msgbox','msgbox_row',True); } $GLOBALS['phpgw']->template->fp('msgbox','msgbox_end',True); diff --git a/phpgwapi/templates/default/common.tpl b/phpgwapi/templates/default/common.tpl index e9662f82b4..c5f46c6f50 100644 --- a/phpgwapi/templates/default/common.tpl +++ b/phpgwapi/templates/default/common.tpl @@ -10,57 +10,35 @@
- - - - - - - + + +
[O] {msgbox_text}
[X] {msgbox_text}
{msgbox_img_alt} {msgbox_text}
- - -
+ + +
- - - + - - - - - - - -
{border_header_text}
- - - - - - - -
{border_header_text}
+ -
- {data} +{data} diff --git a/phpgwapi/templates/default/images/msgbox_bad.jpg b/phpgwapi/templates/default/images/msgbox_bad.jpg new file mode 100755 index 0000000000000000000000000000000000000000..8d9c141188b8353420e4b0c5189cd60006ca58a5 GIT binary patch literal 2594 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 p+**qQ=8#^_aFJXn|uHO literal 0 HcmV?d00001