Menu
▾
▴
[eGroupWare-cvs] r21724 - in /trunk/jinn: inc/ plugins/object_events_plugins/ templatesSavant2/default/
|
From: <mi...@us...> - 2006-06-06 15:58:21
|
Author: mipmip Date: Tue Jun 6 15:59:36 2006 New Revision: 21724 URL: http://egroupware.org/viewvc?rev=3D21724&view=3Drev Log: -cleaned up object event configuration -improved walk list button layout -initual start of the Run-On-Records event Added: trunk/jinn/templatesSavant2/default/runonrecord_buttons.tpl.php Modified: trunk/jinn/inc/class.boadmin.inc.php trunk/jinn/inc/class.bojinn.inc.php trunk/jinn/inc/class.bouser.inc.php trunk/jinn/inc/class.factory_plugins_object_events.inc.php trunk/jinn/inc/class.uiadmin.inc.php trunk/jinn/inc/class.uiu_edit_record.inc.php trunk/jinn/inc/class.uiuser.inc.php trunk/jinn/plugins/object_events_plugins/plugin.setfieldvalue.php trunk/jinn/templatesSavant2/default/frm_conf_object_events.tpl.php trunk/jinn/templatesSavant2/default/frm_edit_record.tpl.php trunk/jinn/templatesSavant2/default/list_records.tpl.php trunk/jinn/templatesSavant2/default/walk_buttons.tpl.php Modified: trunk/jinn/inc/class.boadmin.inc.php URL: http://egroupware.org/viewvc/trunk/jinn/inc/class.boadmin.inc.php?rev= =3D21724&r1=3D21723&r2=3D21724&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/jinn/inc/class.boadmin.inc.php (original) +++ trunk/jinn/inc/class.boadmin.inc.php Tue Jun 6 15:59:36 2006 @@ -205,7 +205,8 @@ * @access public * @return void */ - function save_object_events_conf() + //todo post via argument + function save_object_events_conf($obj_id,$edit) { if(!$_GET[object_id] && !$_GET[edit]) { @@ -214,6 +215,16 @@ =20 if(is_array($_POST)) { + // make array with conf values + $plg_post_arr=3D$this->filter_array_with_prefix($_POST,'EPL',true); + $plg_post_arr=3D$this->strip_prefix_from_keys($plg_post_arr,'EPL'); + $plg_post_arr['event']=3D$_POST['event'];=20 + $plg_post_arr['plugin']=3D$_POST['plugin']; + + //_debug_array($plg_post_arr); + //_debug_array($_POST); + //die(); + $dirty =3D false; =20 //get the already stored configurations @@ -239,13 +250,14 @@ } =20 //if a new plugin was configured, add it to the store - if($_POST[event] !=3D '' && $_POST[plugin] !=3D '') + if($plg_post_arr['event'] !=3D '' && $plg_post_arr['plugin'] !=3D '') { if(!is_array($stored_configs)) $stored_configs =3D array(); $conf=3Darray ( - 'name'=3D>$_POST[plugin], - 'conf'=3D>$_POST + 'name'=3D>$plg_post_arr['plugin'], + 'conf'=3D>$plg_post_arr, + 'eventlabel'=3D>$_POST['eventlabel'], ); $stored_configs[] =3D $conf; $dirty=3Dtrue; @@ -255,15 +267,18 @@ { if(is_array($stored_configs))=20 { - $_POST[event] =3D $stored_configs[$_GET[edit]][conf][event]; - $_POST[plugin] =3D $stored_configs[$_GET[edit]][conf][plugin]; + //todo test + //$_POST[event] =3D $stored_configs[$_GET[edit]][conf][event]; + //$_POST[plugin] =3D $stored_configs[$_GET[edit]][conf][plugin]; =20 //replace the existing config with this one if(!is_array($stored_configs)) $stored_configs =3D array(); $conf=3Darray ( - 'name'=3D>$_POST[plugin], - 'conf'=3D>$_POST + 'name'=3D>$plg_post_arr['plugin'], + 'conf'=3D>$plg_post_arr, + 'eventlabel'=3D>$_POST['eventlabel'], + 'iconfile'=3D>$_POST['iconfile'] ); $stored_configs[$_GET[edit]] =3D $conf; $dirty=3Dtrue; @@ -290,12 +305,15 @@ } } =20 + //fixme give correct status + return true; + =20 //fixme: this gives a strange error: //$this->common->exit_and_open_screen('menuaction=3Djinn.uiadmin.object= _events_config&close_me=3Dtrue&object_id=3D'.$_GET[object_id]); =20 //VERY dirty hack to solve this problem: =20 - echo('<input class=3D"egwbutton" type=3D"button" onClick=3D"self.close= ()" value=3D"'.lang('close').'"/>'); + //echo('<input class=3D"egwbutton" type=3D"button" onClick=3D"self.clo= se()" value=3D"'.lang('close').'"/>'); //obviously this needs to be fixed. Then also the above _debug_arrays c= an be removed. =20 } Modified: trunk/jinn/inc/class.bojinn.inc.php URL: http://egroupware.org/viewvc/trunk/jinn/inc/class.bojinn.inc.php?rev= =3D21724&r1=3D21723&r2=3D21724&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/jinn/inc/class.bojinn.inc.php (original) +++ trunk/jinn/inc/class.bojinn.inc.php Tue Jun 6 15:59:36 2006 @@ -328,6 +328,7 @@ * @param boolean $keep_keys when true it keeps the keys else numeric ke= ys are used * @param boolean $inverse if true the only elements that not match the = prefix are returned * @return array filtered array + * @fixme inverse seem to work focked up!!! check trhough all the jinn c= ode */ function filter_array_with_prefix($array,$prefix,$keep_keys=3Dfalse,$in= verse=3Dfalse) { Modified: trunk/jinn/inc/class.bouser.inc.php URL: http://egroupware.org/viewvc/trunk/jinn/inc/class.bouser.inc.php?rev= =3D21724&r1=3D21723&r2=3D21724&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/jinn/inc/class.bouser.inc.php (original) +++ trunk/jinn/inc/class.bouser.inc.php Tue Jun 6 15:59:36 2006 @@ -85,10 +85,13 @@ } =20 $this->plug =3D CreateObject('jinn.factory_plugins_db_fields'); - $this->plug->local_bo =3D &$this; - + $this->plug->local_bo =3D &$this; //FIXME remove + + + // move to bojinn $this->object_events_plugin_manager =3D CreateObject('jinn.factory_plug= ins_object_events'); =09 - $this->object_events_plugin_manager->local_bo =3D &$this; + $this->object_events_plugin_manager->local_bo =3D &$this; //FIXME remove + =20 /* this is for the sidebox */ /* fixme remove these two lines */ Modified: trunk/jinn/inc/class.factory_plugins_object_events.inc.php URL: http://egroupware.org/viewvc/trunk/jinn/inc/class.factory_plugins_obje= ct_events.inc.php?rev=3D21724&r1=3D21723&r2=3D21724&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/jinn/inc/class.factory_plugins_object_events.inc.php (original) +++ trunk/jinn/inc/class.factory_plugins_object_events.inc.php Tue Jun 6 1= 5:59:36 2006 @@ -2,7 +2,7 @@ /**********************************************************************= ****\ JiNN - Jinn is Not Nuke, a multi-user, multi-site CMS for phpGroupWare Authors: Pim Snel, Lex Vogelaar for Lingewoud - Copyright (C)2002, 2004 Pim Snel <pi...@li...> + Copyright (C)2002, 2006 Pim Snel <pi...@li...> =20 eGroupWare - http://www.egroupware.org =20 @@ -30,6 +30,7 @@ class factory_plugins_object_events { var $local_bo; + var $event_arr=3Darray(); var $test; =20 /*! @@ -38,8 +39,19 @@ */ function factory_plugins_object_events() { + $this->set_event_arr(); $this->include_plugins(); $this->include_custom_plugins(); + } + + function set_event_arr() + { + $this->event_arr=3Darray( + 'on_update', + 'on_export', + 'on_walk_list_button', + 'run_on_record', + ); } =20 function call_event_action($post, $config) Modified: trunk/jinn/inc/class.uiadmin.inc.php URL: http://egroupware.org/viewvc/trunk/jinn/inc/class.uiadmin.inc.php?rev= =3D21724&r1=3D21723&r2=3D21724&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/jinn/inc/class.uiadmin.inc.php (original) +++ trunk/jinn/inc/class.uiadmin.inc.php Tue Jun 6 15:59:36 2006 @@ -523,12 +523,8 @@ function getEventOptions($selected) { $sel_arr[$selected]=3D'selected=3D"selected"'; - - $event_arr=3Darray( - 'on_update', - 'on_export', - 'on_walk_list_button', - ); + =20 + $event_arr=3D$this->bo->object_events_plugin_manager->event_arr; =20 $this->tplsav2->optval =3D ''; $this->tplsav2->optselected =3D ''; @@ -1151,18 +1147,32 @@ * @todo: rewrite config array in the register of the plugins * @todo: rewrite plugins so that it are classes * @todo: better flow + * @todo: implement names + * @todo: implement icons + * @todo: implement applyrecord event / single record event?=20 + * @todo: implement human input in plugin=20 */ function object_events_config() { + if($_POST['submitted']) + { + $save_status =3D $this->bo->save_object_events_conf($_GET[object_id],$_= GET[edit]); + + //unset($_GET[edit]); + //unset($_POST[plugin]); + } + $theme_css =3D $GLOBALS['phpgw_info']['server']['webserver_url'] .=20 '/phpgwapi/templates/idots/css/'.$GLOBALS['phpgw_info']['user']['prefer= ences']['common']['theme'].'.css'; =20 + $this->tplsav2->startlink=3D$GLOBALS['phpgw']->link('/index.php','menua= ction=3Djinn.uiadmin.object_events_config&object_id=3D'.$_GET[object_id]); $this->tplsav2->assign('theme_css',$theme_css); $GLOBALS['phpgw_info']['flags']['noheader']=3DTrue; $GLOBALS['phpgw_info']['flags']['nonavbar']=3DTrue; $GLOBALS['phpgw_info']['flags']['noappheader']=3DTrue; $GLOBALS['phpgw_info']['flags']['noappfooter']=3DTrue; $GLOBALS['phpgw_info']['flags']['nofooter']=3DTrue; + $this->msg_box(); =20 $object_arr=3D$this->bo->so->get_object_values($_GET[object_id]); =20 @@ -1191,13 +1201,15 @@ } } =20 + //new? if($_GET[edit]=3D=3D'') - { - $this->tplsav2->set_var('action',$GLOBALS['phpgw']->link('/index.php','= menuaction=3Djinn.boadmin.save_object_events_conf&object_id=3D'.$_GET[objec= t_id])); + //if($xxxx) + { + $this->tplsav2->set_var('action',$GLOBALS['phpgw']->link('/index.php','= menuaction=3Djinn.uiadmin.object_events_config&object_id=3D'.$_GET[object_i= d])); =20 $this->tplsav2->set_var('event_options', $this->getEventOptions($_POST[= event])); =20 $this->tplsav2->set_var('plugin_options', $this->getPluginOptions($_POS= T[event], $_POST[plugin])); =20 - $this->tplsav2->set_var('option_selected', 'document.events_config.acti= on=3D\''.$GLOBALS['phpgw']->link('/index.php','menuaction=3Djinn.uiadmin.ob= ject_events_config&object_id=3D'.$_GET[object_id]).'\'; submit();'); + $this->tplsav2->set_var('option_selected', 'document.frm.action=3D\''.$= GLOBALS['phpgw']->link('/index.php','menuaction=3Djinn.uiadmin.object_event= s_config&object_id=3D'.$_GET[object_id]).'\'; document.frm.submit();'); =20 if($_POST[plugin] !=3D '') { @@ -1209,18 +1221,37 @@ } else { - $this->tplsav2->set_var('action',$GLOBALS['phpgw']->link('/index.php','= menuaction=3Djinn.boadmin.save_object_events_conf&object_id=3D'.$_GET[objec= t_id].'&edit=3D'.$_GET[edit])); + $this->tplsav2->set_var('event_options', $this->getEventOptions($_POST[= event])); =20 + $this->tplsav2->set_var('plugin_options', $this->getPluginOptions($_POS= T[event], $_POST[plugin])); =20 + $this->tplsav2->set_var('option_selected', 'document.frm.action=3D\''.$= GLOBALS['phpgw']->link('/index.php','menuaction=3Djinn.uiadmin.object_event= s_config&object_id=3D'.$_GET[object_id]).'\'; document.frm.submit();'); + +/* if($_POST[plugin] !=3D '') + { + $this->tplsav2->set_var('plug_name',$this->bo->object_events_plugins= [$_POST[plugin]]['title']); + + $cfg=3D$this->bo->object_events_plugins[$_POST[plugin]]['config']; + $cfg_help=3D$this->bo->object_events_plugins[$_POST[plugin]]['config= _help']; + } +*/ + $this->tplsav2->set_var('action',$GLOBALS['phpgw']->link('/index.php','= menuaction=3Djinn.uiadmin.object_events_config&object_id=3D'.$_GET[object_i= d].'&edit=3D'.$_GET[edit])); =20 if(is_array($stored_configs)) { $edit_conf =3D $stored_configs[$_GET[edit]]; } - - $this->tplsav2->set_var('plug_name',$this->bo->object_events_plugins[$e= dit_conf[name]]['title']); +// _debug_array($edit_conf); + $this->tplsav2->plugin=3D$edit_conf['name']; + $this->tplsav2->event=3D$edit_conf['conf']['event']; + + $this->tplsav2->set_var('plug_name',$this->bo->object_events_plugins[$e= dit_conf['name']]['title']); + + $this->tplsav2->complete_conf_arr=3D$edit_conf; =20 $cfg=3D$this->bo->object_events_plugins[$edit_conf[name]]['config']; $cfg_help=3D$this->bo->object_events_plugins[$edit_conf[name]]['config_= help']; } + + //_debug_array($cfg); =20 if(is_array($cfg)) { Modified: trunk/jinn/inc/class.uiu_edit_record.inc.php URL: http://egroupware.org/viewvc/trunk/jinn/inc/class.uiu_edit_record.inc.= php?rev=3D21724&r1=3D21723&r2=3D21724&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/jinn/inc/class.uiu_edit_record.inc.php (original) +++ trunk/jinn/inc/class.uiu_edit_record.inc.php Tue Jun 6 15:59:36 2006 @@ -124,6 +124,7 @@ $this->bo->exit_and_open_screen($this->japielink.'jinn.uiuser.index'); } =20 + =20 $this->test_object(); } =20 @@ -253,9 +254,9 @@ */ function read_record() { - $this->readonly=3Dtrue; $this->tplsav2->readonly=3Dtrue; + $this->tplsav2->viewrecord=3Dtrue; $this->tplsav2->edit_record_link=3D$GLOBALS[phpgw]->link('/index.php','= menuaction=3D'.$this->japielink.'jinn.uiu_edit_record.edit_record&where_str= ing=3D'.$this->bo->where_string_encoded); =20 $this->edit_record();=20 @@ -298,6 +299,9 @@ */ function edit_record() { + =20 + $this->tplsav2->runonrecordbuttons=3D$this->getRunOnRecordEventButtons(= ); + =20 if($_POST[submitted]) { if($_POST[num_records] && $_POST[changerecnumbers]=3D=3D'true') @@ -1359,6 +1363,35 @@ } =09 } =20 + function getRunOnRecordEventButtons() + { +// _debug_array($_SERVER); +/* if($this->viewrecord) + { + $returnlink=3D'viewrecord'; + } + */ + // Get Walk Events + $stored_configs =3D unserialize(base64_decode($this->bo->site_object['e= vents_config'])); + if(is_array($stored_configs)) + { + //_debug_array($stored_configs); + foreach($stored_configs as $key =3D> $conf_arr) + { +// echo $key; + =20 + if($conf_arr['conf']['event']=3D=3D'run_on_record') + { + $conf_arr['runonrecordevent_link']=3D$GLOBALS['phpgw']->link('/index= .php','menuaction=3Djinn.uiuser.runonrecord&plgkey=3D'.$key); + $this->tplsav2->runonrecordbuttons_arr[]=3D$conf_arr; + } + } + } + + $buttonrow=3D$this->tplsav2->fetch('runonrecord_buttons.tpl.php'); + return $buttonrow; + } + } =20 ?> Modified: trunk/jinn/inc/class.uiuser.inc.php URL: http://egroupware.org/viewvc/trunk/jinn/inc/class.uiuser.inc.php?rev= =3D21724&r1=3D21723&r2=3D21724&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/jinn/inc/class.uiuser.inc.php (original) +++ trunk/jinn/inc/class.uiuser.inc.php Tue Jun 6 15:59:36 2006 @@ -35,7 +35,8 @@ 'config_objects' =3D> True, 'img_popup' =3D> True, 'popwalkevent' =3D> True, - 'do_loop_walk_events' =3D> True + 'do_loop_walk_events' =3D> True, + 'runonrecord' =3D> True ); =20 =20 @@ -173,6 +174,13 @@ } =20 =20 + } + + function runonrecord() + { + //run event on current record + //redirect to correct screen + echo "hallo"; } =20 function popwalkevent() Modified: trunk/jinn/plugins/object_events_plugins/plugin.setfieldvalue.php URL: http://egroupware.org/viewvc/trunk/jinn/plugins/object_events_plugins/= plugin.setfieldvalue.php?rev=3D21724&r1=3D21723&r2=3D21724&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/jinn/plugins/object_events_plugins/plugin.setfieldvalue.php (orig= inal) +++ trunk/jinn/plugins/object_events_plugins/plugin.setfieldvalue.php Tue J= un 6 15:59:36 2006 @@ -33,6 +33,7 @@ ( 'on_update', 'on_export', + 'run_on_record', 'on_walk_list_button' ); =20 Modified: trunk/jinn/templatesSavant2/default/frm_conf_object_events.tpl.php URL: http://egroupware.org/viewvc/trunk/jinn/templatesSavant2/default/frm_c= onf_object_events.tpl.php?rev=3D21724&r1=3D21723&r2=3D21724&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/jinn/templatesSavant2/default/frm_conf_object_events.tpl.php (ori= ginal) +++ trunk/jinn/templatesSavant2/default/frm_conf_object_events.tpl.php Tue = Jun 6 15:59:36 2006 @@ -3,7 +3,6 @@ <html xml:lang=3D"<?=3D$this->lang?>" xmlns=3D"http://www.w3.org/1999/xhtm= l"> <head> <title><?=3Dlang('Event Plugin Configuration')?></title> - <meta http-equiv=3D"content-type" content=3D"text/html; charset=3D<?=3D= $this->charset?>" /> <meta name=3D"keywords" content=3D"eGroupWare" /> <meta name=3D"description" content=3D"eGroupware" /> @@ -17,16 +16,17 @@ </head> <body <?=3D$this->close?>> =20 - <form method=3D"post" name=3D"events_config" action=3D<?=3D$this->actio= n?>> + <form method=3D"post" name=3D"frm" action=3D<?=3D$this->action?>> <div id=3D"divMain"> <div id=3D"divAppboxHeader"><?=3Dlang('Event Plugin Configuration')?></= div> <div id=3D"divAppbox"> - =20 - <?php if($_GET[edit]=3D=3D''):?> + + <?php if($_GET[edit]=3D=3D''):?> + <?php //if(!$xxxx):?> =20 <?php if(count($this->stored_events_arr)>0):?> <h2><?=3Dlang('Stored Events')?></h2> - <table> + <table > <thead> <tr> <th> @@ -67,12 +67,45 @@ </table> <?php endif?> =20 - <?php if(is_array($this->cfg_arr)):?> + <?php if($_POST['plugin'] || $_GET['edit']!=3D''):?> =20 <h2><?=3Dlang('Plugin Configuration')?> - <?=3D$this->plug_name?></h= 2> + <?php if(!$_POST['plugin']):?> + <input type=3D"hidden" name=3D"plugin" value=3D"<?=3D$this->plugin?>= " /> + <?php endif?> + <?php if(!$_POST['event']):?> + <input type=3D"hidden" name=3D"event" value=3D"<?=3D$this->event?>" = /> + <?php endif?> =20 <table style=3D"border-spacing:15px;"> - <?php foreach($this->cfg_arr as $cfg):?> + <tr> + <td style=3D"vertical-align:top;width:170px;"> + <strong><?=3Dlang('Event label');?></strong> + <br/> + <?=3Dlang('Name of this event setup which will appear in buttons, ic= ons')?> + </td> + <td style=3D"vertical-align:top;"> + <input type=3D"text" name=3D"eventlabel" value=3D"<?=3D$this->comple= te_conf_arr['eventlabel']?>" /> + </td> + </tr> + <tr style=3D""> + <td style=3D"vertical-align:top;width:170px;"> + <strong><?=3Dlang('Icon');?></strong> + <br/> + <?=3Dlang('Icon used by some event types.')?> + </td> + <td style=3D"vertical-align:top;"> + <input type=3D"file" name=3D"iconupload" value=3D"<?=3D$this->label?= >" /> + <input type=3D"hidden" name=3D"iconfile" value=3D"<?=3D$this->iconfi= le?>"/> + </td> + </tr> + <tr> + <td colspan=3D"2" style=3D"border-bottom:solid 1px #bbbbbb"> + + </td> + </tr> + <?php if(is_array($this->cfg_arr)):?> + <?php foreach($this->cfg_arr as $cfg):?> <tr> <td style=3D"vertical-align:top;width:170px;"> <strong><?=3D$cfg['label']?></strong> @@ -82,28 +115,29 @@ <td style=3D"vertical-align:top;"> <?php if($cfg['type']=3D=3D'radio'):?> <?php foreach($cfg['value'] as $radio):?> - <input name=3D"<?=3D$cfg['name']?>" type=3D"radio" value=3D"<?=3D$ra= dio?>" /><?=3D$radio?><br/> + <input name=3D"EPL<?=3D$cfg['name']?>" type=3D"radio" value=3D"<?=3D= $radio?>" /><?=3D$radio?><br/> <?php endforeach?> <?php elseif($cfg['type']=3D=3D'text'):?> - <input name=3D"<?=3D$cfg['name']?>" type=3D"text" value=3D"<?=3D$cfg= ['value']?>"> + <input name=3D"EPL<?=3D$cfg['name']?>" type=3D"text" value=3D"<?=3D$= cfg['value']?>"> <?php elseif($cfg['type']=3D=3D'area'):?> - <textarea name=3D"<?=3D$cfg['name']?>" rows=3D"5" cols=3D"50"><?=3D$= cfg['value']?></textarea> + <textarea name=3D"EPL<?=3D$cfg['name']?>" rows=3D"5" cols=3D"50"><?= =3D$cfg['value']?></textarea> <?php elseif($cfg['type']=3D=3D'select'):?> - <select name=3D"<?=3D$cfg['name']?>"> + <select name=3D"EPL<?=3D$cfg['name']?>"> <?php foreach($cfg['value'] as $option):?> <option value=3D"<?=3D$option?>"><?=3D$option?></option> <?php endforeach?> </select> </td> <?php endif?> + </tr> <?php endforeach?> - </tr> + <?php endif?> </table> <?php endif?> <br/> - <input class=3D"egwbutton" type=3D"submit" value=3D"<?=3Dlang('subm= it')?>"> + <input class=3D"egwbutton" type=3D"submit" name=3D"submitted" value= =3D"<?=3Dlang('submit')?>"> <input class=3D"egwbutton" type=3D"button" value=3D"<?=3Dlang('clos= e')?>" onClick=3D"self.close()"> - <input class=3D"egwbutton" type=3D"button" value=3D"<?=3Dlang('back= ')?>" onclick=3D"history.back()"> + <input class=3D"egwbutton" type=3D"button" value=3D"<?=3Dlang('back= ')?>" onclick=3D"location.href=3D'<?=3D$this->startlink?>'"> <br/> </div> </div> Modified: trunk/jinn/templatesSavant2/default/frm_edit_record.tpl.php URL: http://egroupware.org/viewvc/trunk/jinn/templatesSavant2/default/frm_e= dit_record.tpl.php?rev=3D21724&r1=3D21723&r2=3D21724&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/jinn/templatesSavant2/default/frm_edit_record.tpl.php (original) +++ trunk/jinn/templatesSavant2/default/frm_edit_record.tpl.php Tue Jun 6 = 15:59:36 2006 @@ -557,6 +557,8 @@ =20 <!-- ############################# edit record buttons ################= ############## --> <?php if(!$this->edit_object):?> + =20 + <div style=3D"clear:both;height:20px;"></div> =20 <?php if($this->readonly):?> @@ -578,6 +580,8 @@ <?php if(!$this->japie):?> <div style=3D"float:right;width:auto;"><input type=3D"button" onclick= =3D"openhelp()" name=3D"reopen" class=3D"egwbutton" value=3D"<?=3Dlang('Hel= p')?>"></div> <?php endif?> + =20 + <?=3D$this->runonrecordbuttons?> =20 <div style=3D"clear:both;height:10px;"></div> <!-- ############################# edit record buttons ################= ############## --> Modified: trunk/jinn/templatesSavant2/default/list_records.tpl.php URL: http://egroupware.org/viewvc/trunk/jinn/templatesSavant2/default/list_= records.tpl.php?rev=3D21724&r1=3D21723&r2=3D21724&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/jinn/templatesSavant2/default/list_records.tpl.php (original) +++ trunk/jinn/templatesSavant2/default/list_records.tpl.php Tue Jun 6 15:= 59:36 2006 @@ -64,7 +64,6 @@ <?php endif?> <!-- END SEARCH & FILTERS BLOCK --> =20 -<?=3D$this->walklistblock?> <?=3D$this->reportblock?> =20 <!-- BEGIN header_end --> @@ -83,6 +82,7 @@ </style> <br/> <input type=3D"button" value=3D"<?=3Dlang('Add new Record') ?>" onClick=3D= "location.href=3D'<?=3D$this->newrec_link ?>'" style=3D"width:150px;"/> +<?=3D$this->walklistblock?> <div class=3D"jinnListBlock"> <table border=3D"0" style=3D"border-spacing:1px;" align=3D"center" widt= h=3D"100%" > <tr> Added: trunk/jinn/templatesSavant2/default/runonrecord_buttons.tpl.php URL: http://egroupware.org/viewvc/trunk/jinn/templatesSavant2/default/runon= record_buttons.tpl.php?rev=3D21724&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/jinn/templatesSavant2/default/runonrecord_buttons.tpl.php (added) +++ trunk/jinn/templatesSavant2/default/runonrecord_buttons.tpl.php Tue Jun= 6 15:59:36 2006 @@ -1,0 +1,7 @@ +<!--<div style=3D"margin:5px 0px 5px 0px;">--> + <?php if(is_array($this->runonrecordbuttons_arr)):?> + <?php foreach($this->runonrecordbuttons_arr as $runonrecordbutton):?> + <input style=3D"background-color:#abd3ab" type=3D"button" name=3D"<?=3D= ($runonrecordbutton['eventlabel']?$runonrecordbutton['eventlabel']:$runonre= cordbutton['name'])?>" value=3D"<?=3D($runonrecordbutton['eventlabel']?$run= onrecordbutton['eventlabel']:$runonrecordbutton['name'])?>" onclick=3D"loca= tion.href=3D'<?=3D$runonrecordbutton['runonrecordevent_link']?>'" /> + <?php endforeach?> + <?php endif?> + <!--</div>--> Modified: trunk/jinn/templatesSavant2/default/walk_buttons.tpl.php URL: http://egroupware.org/viewvc/trunk/jinn/templatesSavant2/default/walk_= buttons.tpl.php?rev=3D21724&r1=3D21723&r2=3D21724&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/jinn/templatesSavant2/default/walk_buttons.tpl.php (original) +++ trunk/jinn/templatesSavant2/default/walk_buttons.tpl.php Tue Jun 6 15:= 59:36 2006 @@ -1,7 +1,7 @@ -<div style=3D"margin:5px 0px 5px 0px;"> +<!--<div style=3D"margin:5px 0px 5px 0px;">--> <?php if(is_array($this->walkbuttons_arr)):?> <?php foreach($this->walkbuttons_arr as $walkbutton):?> - <input type=3D"button" name=3D"<?=3D$walkbutton['name']?>" value=3D"<?= =3D$walkbutton['name']?>" onclick=3D"parent.window.open('<?=3D$this->walkev= ent_link?>&selvalues=3D' +returnSelectedCheckbox() , 'genobjoptions', 'widt= h=3D580,height=3D500,location=3Dno,menubar=3Dno,directories=3Dno,toolbar=3D= no,scrollbars=3Dyes,resizable=3Dyes,status=3Dno')" /> + <input style=3D"background-color:#abd3ab" type=3D"button" name=3D"<?=3D= ($walkbutton['eventlabel']?$walkbutton['eventlabel']:$walkbutton['name'])?>= " value=3D"<?=3D($walkbutton['eventlabel']?$walkbutton['eventlabel']:$walkb= utton['name'])?>" onclick=3D"parent.window.open('<?=3D$this->walkevent_link= ?>&selvalues=3D' +returnSelectedCheckbox() , 'genobjoptions', 'width=3D580,= height=3D500,location=3Dno,menubar=3Dno,directories=3Dno,toolbar=3Dno,scrol= lbars=3Dyes,resizable=3Dyes,status=3Dno')" /> <?php endforeach?> <?php endif?> -</div> + <!--</div>--> |