From: hickert Date: Wed, 10 Mar 2010 09:32:26 +0000 (+0000) Subject: Updated filterClass names X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=72fb2e186b2f815f0fecdf71a6bc66ea676be72f;p=gosa.git Updated filterClass names git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16367 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-core/ihtml/themes/modern/filterEditor.tpl b/gosa-core/ihtml/themes/modern/filterEditor.tpl deleted file mode 100644 index 66c6442eb..000000000 --- a/gosa-core/ihtml/themes/modern/filterEditor.tpl +++ /dev/null @@ -1,14 +0,0 @@ -

{t}Filter editor{/t}

- -
- -{t}List of configured filters{/t} -{$list} - - -
- -
- - -
diff --git a/gosa-core/ihtml/themes/modern/filterEditorEntry.tpl b/gosa-core/ihtml/themes/modern/filterEditorEntry.tpl deleted file mode 100644 index 71f5e0fcc..000000000 --- a/gosa-core/ihtml/themes/modern/filterEditorEntry.tpl +++ /dev/null @@ -1,67 +0,0 @@ -

{t}Filter editor{/t}

- -
- - - - - - -
- - - - - - - - - -
- - - -
- - - -
- -
- - - {t}Public visible{/t} - -
- - - {t}Enabled{/t} - - 		-
- -
- - - - -
- -
- - - -
- - - -
- - -
diff --git a/gosa-core/ihtml/themes/modern/userFilter.tpl b/gosa-core/ihtml/themes/modern/userFilter.tpl new file mode 100644 index 000000000..66c6442eb --- /dev/null +++ b/gosa-core/ihtml/themes/modern/userFilter.tpl @@ -0,0 +1,14 @@ +

{t}Filter editor{/t}

+ +
+ +{t}List of configured filters{/t} +{$list} + + +
+ +
+ + +
diff --git a/gosa-core/ihtml/themes/modern/userFilterEditor.tpl b/gosa-core/ihtml/themes/modern/userFilterEditor.tpl new file mode 100644 index 000000000..2d94578cd --- /dev/null +++ b/gosa-core/ihtml/themes/modern/userFilterEditor.tpl @@ -0,0 +1,67 @@ +

{t}Filter editor{/t}

+ +
+ + + + + + +
+ + + + + + + + + +
+ + + +
+ + + +
+ +
+ + + {t}Public visible{/t} + +
+ + + {t}Enabled{/t} + + 		+
+ +
+ + + + +
+ +
+ + + +
+ + + +
+ + +
diff --git a/gosa-core/include/class_filterEditor.inc b/gosa-core/include/class_filterEditor.inc index 9c779ef24..91ae157eb 100644 --- a/gosa-core/include/class_filterEditor.inc +++ b/gosa-core/include/class_filterEditor.inc @@ -1,6 +1,6 @@ dialog instanceOf filterEditEntry){ + if(isset($_POST['saveFilterSettings']) && $this->dialog instanceOf userFilterEditor){ $this->dialog->save_object(); $msgs = $this->dialog->check(); if(count($msgs)){ @@ -136,13 +136,13 @@ class filterEditor extends plugin if($action['action'] == 'edit' && count($action['targets']) == 1){ $key= $this->filterWidget->getKey($action['targets'][0]); if(isset($this->filters[$key])){ - $this->dialog=new filterEditEntry($this->filters[$key], $this->availableCategories); + $this->dialog=new userFilterEditor($this->filters[$key], $this->availableCategories); } } // Act on new requests if(isset($_POST['addFilter'])){ - $this->dialog=new filterEditEntry(array(), $this->availableCategories); + $this->dialog=new userFilterEditor(array(), $this->availableCategories); } // Act on remove requests @@ -156,14 +156,14 @@ class filterEditor extends plugin } // Display edit dialog - if($this->dialog instanceOf filterEditEntry){ + if($this->dialog instanceOf userFilterEditor){ $this->dialog->save_object(); return($this->dialog->execute()); } $smarty = get_smarty(); $smarty->assign("list", $this->filterWidget->render()); - return($smarty->fetch(get_template_path('filterEditor.tpl', FALSE))); + return($smarty->fetch(get_template_path('userFilter.tpl', FALSE))); } diff --git a/gosa-core/include/class_filterEditorEntry.inc b/gosa-core/include/class_filterEditorEntry.inc index 7d347558b..5719106bb 100644 --- a/gosa-core/include/class_filterEditorEntry.inc +++ b/gosa-core/include/class_filterEditorEntry.inc @@ -1,6 +1,6 @@ assign('description', $this->description); $smarty->assign('selectedCategories', $this->selectedCategories); $smarty->assign('availableCategories', $this->availableCategories); - return($smarty->fetch(get_template_path('filterEditorEntry.tpl', FALSE))); + return($smarty->fetch(get_template_path('userFilterEditor.tpl', FALSE))); } @@ -79,7 +79,7 @@ class filterEditEntry extends plugin */ function save_object() { - if(isset($_POST['filterEditorEntry'])){ + if(isset($_POST['userFilterEditor'])){ // Get posted strings foreach(array('name','description','filter') as $attr){ @@ -132,7 +132,7 @@ class filterEditEntry extends plugin /*! \brief Transforms the entered values into a filter object (array) which is useable - * for the filterEditor overview dialog. + * for the userFilter overview dialog. * @return Returns transformed filter data. */ function save() diff --git a/gosa-core/include/class_management.inc b/gosa-core/include/class_management.inc index aec1431f5..4604eecbe 100644 --- a/gosa-core/include/class_management.inc +++ b/gosa-core/include/class_management.inc @@ -189,7 +189,7 @@ class management function editFilter() { $headpage = $this->getHeadpage(); - $this->dialogObject = new filterEditor($this->config,$headpage->categories); + $this->dialogObject = new userFilter($this->config,$headpage->categories); } function renderList()