From: hickert Date: Tue, 7 Sep 2010 06:53:05 +0000 (+0000) Subject: Updated filter editor X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e1f8a7aefe88918ee1f5b4b185ce6298e06f6d22;p=gosa.git Updated filter editor git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@19536 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-plugins/groupware/personal/groupware/class_filterEditor.inc b/gosa-plugins/groupware/personal/groupware/class_filterEditor.inc index 9d940f3b2..a34d92d4e 100644 --- a/gosa-plugins/groupware/personal/groupware/class_filterEditor.inc +++ b/gosa-plugins/groupware/personal/groupware/class_filterEditor.inc @@ -8,7 +8,9 @@ class filterEditor extends plugin $this->parent = &$parent; $this->filter = $filter; - $this->types = array('OR' => _("or"), 'AND' => _("and")); + $this->types = array( + 'OR' => _("At least one of the following conditions has to match"), + 'AND' => _("All conditions have to match")); $this->actions = array( "MOVE" => _("move mail to"), "COPY" => _("copy mail to"), @@ -60,7 +62,8 @@ class filterEditor extends plugin $cnt = count($filter['CONDITIONS']); $str = "

"._("Filter conditions")."

"; - $str .= _("Condition type")." \n"; foreach($this->types as $type => $desc){ $checked = ($type == $filter['TYPE'])? ' selected ' : ''; $str.= "\n"; @@ -69,29 +72,29 @@ class filterEditor extends plugin $str.= ""; - $str .= " "; + $str .= " "; if(count($filter['CONDITIONS']) >= 2){ $str .= " "; } @@ -102,20 +105,20 @@ class filterEditor extends plugin $str.= ""; - $str .= " "; + $str .= " "; if(count($filter['ACTION']) >= 2){ $str .= " "; } diff --git a/gosa-plugins/groupware/personal/groupware/filterEditor.tpl b/gosa-plugins/groupware/personal/groupware/filterEditor.tpl index 9853e2c4e..5afc16047 100644 --- a/gosa-plugins/groupware/personal/groupware/filterEditor.tpl +++ b/gosa-plugins/groupware/personal/groupware/filterEditor.tpl @@ -3,11 +3,11 @@ - + - +
: