From 93e652773259b002a27ce805af4604997b62ae0c Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 24 May 2005 13:06:16 +0000 Subject: [PATCH] some w3c changes git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@378 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../gofax/faxaccount/class_gofaxAccount.inc | 27 ++++++++++++++++++- plugins/gofax/faxaccount/generic.tpl | 16 ++++++----- plugins/gofax/faxaccount/lists.tpl | 14 +++++++--- plugins/gofax/faxaccount/locals.tpl | 6 ++--- plugins/gofax/faxaccount/main.inc | 6 ++--- plugins/personal/connectivity/main.inc | 8 +++--- plugins/personal/connectivity/proxy.tpl | 4 +-- 7 files changed, 59 insertions(+), 22 deletions(-) diff --git a/plugins/gofax/faxaccount/class_gofaxAccount.inc b/plugins/gofax/faxaccount/class_gofaxAccount.inc index 41a5f5876..83502276e 100644 --- a/plugins/gofax/faxaccount/class_gofaxAccount.inc +++ b/plugins/gofax/faxaccount/class_gofaxAccount.inc @@ -107,7 +107,7 @@ class gofaxAccount extends plugin /* Do we represent a valid account? */ if (!$this->is_account && $this->parent == NULL){ - $display= " ". + $display= "\"\" ". _("This account has no fax extensions.").""; $display.= back_to_main(); return ($display); @@ -347,11 +347,28 @@ class gofaxAccount extends plugin $smarty->assign("goFaxBlockListACL", chkacl($this->acl, "goFaxBlockList")); $smarty->assign("departments", $this->config->idepartments); $smarty->assign("list", $list); + if (isset($_POST['department'])){ $smarty->assign("department", $_POST['department']); } else { $smarty->assign("department", ""); } + + if(count($this->current_blocklist)) { + $smarty->assign("SELECT_cblocklist",true); + }else { + $smarty->assign("SELECT_cblocklist",false); + } + + if(count($list)) { + $smarty->assign("SELECT_list",true); + }else { + $smarty->assign("SELECT_list",false); + } + + + + $display.= $smarty->fetch (get_template_path('lists.tpl', TRUE, dirname(__FILE__))); return ($display); } @@ -416,6 +433,14 @@ class gofaxAccount extends plugin } else { $smarty->assign("fax_to_printer", ""); } + + if(count($this->facsimileAlternateTelephoneNumber)) { + $smarty->assign("SELECT_facsimileAlternateTelephoneNumber",true); + }else { + $smarty->assign("SELECT_facsimileAlternateTelephoneNumber",false); + } + + $display.= $smarty->fetch (get_template_path('generic.tpl', TRUE, dirname(__FILE__))); return ($display); } diff --git a/plugins/gofax/faxaccount/generic.tpl b/plugins/gofax/faxaccount/generic.tpl index 4b85204dc..340ec4afc 100644 --- a/plugins/gofax/faxaccount/generic.tpl +++ b/plugins/gofax/faxaccount/generic.tpl @@ -3,7 +3,7 @@ -

{t}Generic{/t}

+

{t}Generic{/t}

@@ -35,7 +35,7 @@  
-

{t}Delivery methods{/t}

+

{t}Delivery methods{/t}

{t}Temporary disable fax usage{/t}
@@ -65,11 +65,15 @@
-

{t}Alternate fax numbers{/t}

+

{t}Alternate fax numbers{/t}


- +     @@ -80,7 +84,7 @@
-

{t}Blocklists{/t}

+

{t}Blocklists{/t}

diff --git a/plugins/gofax/faxaccount/lists.tpl b/plugins/gofax/faxaccount/lists.tpl index eaa396185..5ac02918f 100644 --- a/plugins/gofax/faxaccount/lists.tpl +++ b/plugins/gofax/faxaccount/lists.tpl @@ -4,10 +4,14 @@ {t}Blocked numbers/lists{/t}

- +   @@ -25,7 +29,11 @@ {t}List of predefined blocklists{/t} diff --git a/plugins/gofax/faxaccount/locals.tpl b/plugins/gofax/faxaccount/locals.tpl index e3a1ace5c..3e2a8269f 100644 --- a/plugins/gofax/faxaccount/locals.tpl +++ b/plugins/gofax/faxaccount/locals.tpl @@ -25,17 +25,17 @@
{t}Blocklists for incoming fax{/t}

- +
 {t}Display numbers of department{/t}
 {t}Display numbers of department{/t}

- +
 {t}Display numbers matching{/t}
 {t}Display numbers matching{/t}

- +
 {t}Display numbers of user{/t}
 {t}Display numbers of user{/t}

{$apply} diff --git a/plugins/gofax/faxaccount/main.inc b/plugins/gofax/faxaccount/main.inc index 9cd1f67ca..3ed1eaf7e 100644 --- a/plugins/gofax/faxaccount/main.inc +++ b/plugins/gofax/faxaccount/main.inc @@ -89,11 +89,11 @@ if (!$remove_lock){ $display.= "\n"; $display.= " \n"; $display.= "\n"; - $info= " ".$ui->dn." "; + $info= " ".$ui->dn." "; } else { - $info= " ".$ui->dn." "; + $info= "\"\" ".$ui->dn." "; if (isset($editacl) && $editacl != "#none#"){ - $info.= ""._("Click the 'Edit' button below to change informations in this dialog"); + $info.= "\"\""._("Click the 'Edit' button below to change informations in this dialog"); $display.= ""; } $display.= "\n"; diff --git a/plugins/personal/connectivity/main.inc b/plugins/personal/connectivity/main.inc index d8ab9df48..a39b9eeba 100644 --- a/plugins/personal/connectivity/main.inc +++ b/plugins/personal/connectivity/main.inc @@ -109,20 +109,20 @@ if (!$remove_lock){ foreach ($connectivity->plugin_name as $name){ $in_edit_mode|= $connectivity->plugin[$name]->is_account; } + $display.= "

"; if ($in_edit_mode){ - $display.= "

"; if (isset($_SESSION['edit'])){ $display.= "\n"; $display.= " "; $display.= "\n"; - $info= " ".$ui->dn." "; } else { - $info= " ".$ui->dn." "; if ($editacl != "#none#"){ - $info.= ""._("Click the 'Edit' button below to change informations in this dialog"); $display.= "\n"; } diff --git a/plugins/personal/connectivity/proxy.tpl b/plugins/personal/connectivity/proxy.tpl index 3af7a1417..dc0d5b746 100644 --- a/plugins/personal/connectivity/proxy.tpl +++ b/plugins/personal/connectivity/proxy.tpl @@ -2,13 +2,13 @@
- +
-
{t}Filter unwanted content (i.e. pornographic or violence related){/t}
+ {t}Limit proxy access to working time{/t}
-- 2.30.2