diff --git a/infolog/inc/class.infolog_bo.inc.php b/infolog/inc/class.infolog_bo.inc.php index a784156127..bc2a840223 100644 --- a/infolog/inc/class.infolog_bo.inc.php +++ b/infolog/inc/class.infolog_bo.inc.php @@ -1394,7 +1394,7 @@ class infolog_bo $infos[$row['info_id']] = array( 'status' => $row['info_type'] != 'phone' && $row['info_status'] == 'ongoing' ? $row['info_percent'].'%' : 'infolog/'.$this->status[$row['info_type']][$row['info_status']], - 'class' => $row['info_id_parent'] ? 'rowHasParent' : null, + 'class' => $row['info_id_parent'] ? 'infolog_rowHasParent' : null, ); if (common::image('infolog', $icon=$row['info_type'].'_element') || common::image('infolog', $icon=$row['info_type'])) @@ -1404,7 +1404,7 @@ class infolog_bo } foreach($this->anzSubs(array_keys($infos)) as $info_id => $subs) { - if ($subs) $infos[$info_id]['class'] .= ' rowHasSubs'; + if ($subs) $infos[$info_id]['class'] .= ' infolog_rowHasSubs'; } } return $infos; diff --git a/infolog/inc/class.infolog_customfields.inc.php b/infolog/inc/class.infolog_customfields.inc.php index c3c8f81ed9..4b9c8eb720 100644 --- a/infolog/inc/class.infolog_customfields.inc.php +++ b/infolog/inc/class.infolog_customfields.inc.php @@ -46,7 +46,7 @@ class infolog_customfields function __construct( ) { $this->bo = new infolog_bo(); - $this->tmpl = new etemplate(); + $this->tmpl = new etemplate_new(); $this->types = &$this->bo->enums['type']; $this->status = &$this->bo->status; $this->config_data = config::read('infolog'); diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php index fe54be7a09..78066034ca 100644 --- a/infolog/inc/class.infolog_ui.inc.php +++ b/infolog/inc/class.infolog_ui.inc.php @@ -166,7 +166,7 @@ class infolog_ui $info['sub_class'] = $this->bo->enums['priority'][$info['info_priority']] . ($done ? '_done' : ''); if (!$done && $info['info_enddate'] < $this->bo->user_time_now) { - $info['end_class'] = 'overdue'; + $info['end_class'] = 'infolog_overdue'; } if (!isset($info['info_anz_subs'])) $info['info_anz_subs'] = $this->bo->anzSubs($id); $this->bo->link_id2from($info,$action,$action_id); // unset from for $action:$action_id @@ -206,8 +206,8 @@ class infolog_ui { $info['class'] .= 'rowNoSubs '; } - if ($info['info_id_parent']) $info['class'] .= 'rowHasParent '; - if ($info['info_anz_subs'] > 0) $info['class'] .= 'rowHasSubs '; + if ($info['info_id_parent']) $info['class'] .= 'infolog_rowHasParent '; + if ($info['info_anz_subs'] > 0) $info['class'] .= 'infolog_rowHasSubs '; $readonlys["view[$id]"] = $info['info_anz_subs'] < 1; $readonlys['view[0]'] = True; // no parent @@ -958,7 +958,7 @@ class infolog_ui 'icon' => 'egw_action/arrow_left', 'group' => $group, 'hint' => 'View all subs of this entry', - 'enableClass' => 'rowHasSubs', + 'enableClass' => 'infolog_rowHasSubs', ), 'parent' => array( 'caption' => 'View parent', @@ -966,7 +966,7 @@ class infolog_ui 'group' => $group, 'hideOnDisabled' => true, 'hint' => 'View the parent of this entry and all his subs', - 'enableClass' => 'rowHasParent' + 'enableClass' => 'infolog_rowHasParent' ), 'add' => array( 'caption' => 'Add', diff --git a/infolog/js/app.js b/infolog/js/app.js index 897719f5bb..072210a5c8 100644 --- a/infolog/js/app.js +++ b/infolog/js/app.js @@ -126,6 +126,33 @@ app.infolog = AppJS.extend( egw.css(".et2_box.infoDes","display:" + (show ? "block;" : "none;")); }, + confirm_delete_2: function (_action, _senders) + { + var children = false; + var child_button = jQuery('#delete_sub').get(0) || jQuery('[id*="delete_sub"]').get(0); + if(child_button) + { + for(var i = 0; i < _senders.length; i++) + { + if ($j(_senders[i].iface.node).hasClass('infolog_rowHasSubs')) + { + children = true; + break; + } + } + child_button.style.display = children ? 'block' : 'none'; + } + var callbackDeleteDialog = function (button_id) + { + if (button_id == et2_dialog.YES_BUTTON ) + { + + } + } + var confirmDeleteDialog = et2_dialog.show_dialog(callbackDeleteDialog, egw.lang("Do you really want to DELETE this Rule"),egw.lang("Delete"), {},et2_dialog.BUTTONS_YES_NO_CANCEL, et2_dialog.WARNING_MESSAGE); + + }, + /** * Confirm delete * If entry has children, asks if you want to delete children too @@ -141,7 +168,7 @@ app.infolog = AppJS.extend( { for(var i = 0; i < _senders.length; i++) { - if ($j(_senders[i].iface.node).hasClass('rowHasSubs')) + if ($j(_senders[i].iface.node).hasClass('infolog_rowHasSubs')) { children = true; break; diff --git a/infolog/templates/default/app.css b/infolog/templates/default/app.css index 3bb2e15d1d..7d0e74e769 100644 --- a/infolog/templates/default/app.css +++ b/infolog/templates/default/app.css @@ -1,34 +1,33 @@ /* $Id$ */ -.headertext { color: black; font-size: 120%; } -.lpadding5 { padding-left: 5px; } -.redItalic { color: red; font-style: italic; } +.infolog_headertext { color: black; font-size: 120%; } +.infolog_lpadding5 { padding-left: 5px; } .low,.low_done,.normal,.normal_done,.high,.high_done,.urgent,.urgent_done { font-weight: bold; } .low,.low_done { color:#606060; } .normal,.normal_done { color:black } -.high { color:#cc0000; } +.high { color:#cc0000; } .high_done { color:#800000; } -.urgent { color:#ff00ff; } +.urgent { color:#ff00ff; } .urgent_done { color:#800080; } -.overdue { color:#cc0000; font-weight:bold; } +.infolog_overdue { color:#cc0000; font-weight:bold; } .private { font-style:italic; } -.planned { font-style:italic; } -table.fullWidth { width: 100%; } -td.infoId:before { content:"#" } -.fixedHeight { height: 12px; } +.infolog_planned { font-style:italic; } +table.infolog_fullWidth { width: 100%; } +td.infolog_infoId:before { content:"#" } +.infolog_fixedHeight { height: 12px; } .noWrap { white-space: nowrap; } -.user_filter select { width: 100px; } +.infolog_user_filter select { width: 100px; } .inputFullWidth input { width: 100%; } -.image16 img { height: 16px; } -tr.rowHasSubs > td:first-child { +.infolog_image16 img { height: 16px; } +tr.infolog_rowHasSubs > td:first-child { background-image: url(../../../phpgwapi/templates/default/images/egw_action/arrow_left.png); background-repeat: no-repeat; background-position: 0px 11px; } -tr.rowHasParent > td:first-child { +tr.infolog_rowHasParent > td:first-child { background-image: url(../../../phpgwapi/templates/default/images/egw_action/arrow_up.png); background-repeat: no-repeat; background-position: 0px 11px; } tr.row_on > td:first-child, tr.row_off > td:first-child { - padding-left: 10px; + padding-left: 10px; } diff --git a/infolog/templates/default/customfields.xet b/infolog/templates/default/customfields.xet index fbd6744a36..cf75b0cb24 100644 --- a/infolog/templates/default/customfields.xet +++ b/infolog/templates/default/customfields.xet @@ -118,7 +118,7 @@ - + @@ -137,4 +137,4 @@ .error_msg { color: red; font-style: italics; } - \ No newline at end of file + diff --git a/infolog/templates/default/delete.xet b/infolog/templates/default/delete.xet index e22a39b7f2..08ae4a0d14 100644 --- a/infolog/templates/default/delete.xet +++ b/infolog/templates/default/delete.xet @@ -45,7 +45,7 @@ - + @@ -63,20 +63,20 @@