some w3c changes

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@378 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/gofax/faxaccount/class_gofaxAccount.inc b/plugins/gofax/faxaccount/class_gofaxAccount.inc
index 41a5f5876863f211c32f1064f639ae2867a1be3f..83502276e091b68d73f18e122b14ba6b21665a37 100644 (file)
--- 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= "<img src=\"images/stop.png\" align=center>&nbsp;<b>".
+      $display= "<img alt=\"\" src=\"images/stop.png\" align=\"middle\">&nbsp;<b>".
         _("This account has no fax extensions.")."</b>";
       $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 4b85204dc6aafbe6e3d7f9cb4622de01ec22cd59..340ec4afc0919919b68f4dd4234acae528dd0206 100644 (file)
--- a/plugins/gofax/faxaccount/generic.tpl
+++ b/plugins/gofax/faxaccount/generic.tpl
@@ -3,7 +3,7 @@
  <!-- Headline container -->
  <tr>
    <td style="width:50%; vertical-align:top;">
-     <h2><img align="center" src="images/rightarrow.png"> {t}Generic{/t}</h2>
+     <h2><img alt="" align="middle" src="images/rightarrow.png"> {t}Generic{/t}</h2>
 
      <table>
        <tr>
@@ -35,7 +35,7 @@
     &nbsp;
    </td>
    <td style="vertical-align:top; width:100%">
-     <h2><img align="center" src="images/printer.png"> {t}Delivery methods{/t}</h2>
+     <h2><img alt="" align="middle" src="images/printer.png"> {t}Delivery methods{/t}</h2>
 
      <input type=checkbox name="goFaxIsEnabled" value="1" {$goFaxIsEnabled} {$goFaxIsEnabledACL}>
      {t}Temporary disable fax usage{/t}<br>
@@ -65,11 +65,15 @@
 <table style="width:100%; vertical-align:top; text-align:left;" cellpadding=4 border=0>
   <tr>
     <td style="width:50%;">
-    <h2><img align="center" src="images/fax_small.png"> {t}Alternate fax numbers{/t}</h2>
+    <h2><img alt="" align="middle" src="images/fax_small.png"> {t}Alternate fax numbers{/t}</h2>
      <select style="width:350px; height:100px;" name="alternate_list[]" size=15 multiple {$facsimileAlternateTelephoneNumberACL}>
-      {html_options values=$facsimileAlternateTelephoneNumber output=$facsimileAlternateTelephoneNumber}
+       {if $SELECT_facsimileAlternateTelephoneNumber==true}
+                       {html_options values=$facsimileAlternateTelephoneNumber output=$facsimileAlternateTelephoneNumber}
+               {else}
+                       <option>
+        {/if}
      </select><br>
-     <input name="forward_address" size=20 align=center maxlength=60 {$facsimileAlternateTelephoneNumberACL} value="">
+     <input name="forward_address" size=20 align="middle" maxlength=60 {$facsimileAlternateTelephoneNumberACL} value="">
      <input type=submit value="{t}Add{/t}" name="add_alternate" {$facsimileAlternateTelephoneNumberACL}>&nbsp;
      <input type=submit value="{t}Add local{/t}" name="add_local_alternate" {$facsimileAlternateTelephoneNumberACL}>&nbsp;
      <input type=submit value="{t}Delete{/t}" name="delete_alternate" {$facsimileAlternateTelephoneNumberACL}>
@@ -80,7 +84,7 @@
     </td>
     
     <td style="vertical-align:top; width:100%">
-      <h2><img align="center" src="images/false.png"> {t}Blocklists{/t}</h2>
+      <h2><img alt="" align="middle" src="images/false.png"> {t}Blocklists{/t}</h2>
       <table>
         <tr>
           <td>{t}Blocklists for incoming fax{/t}</td>

diff --git a/plugins/gofax/faxaccount/lists.tpl b/plugins/gofax/faxaccount/lists.tpl
index eaa3961852f1b1bf8568ac0084fe061cdb8fcb8c..5ac02918f2179cc73768b8a88d741d0e5020f4c7 100644 (file)
--- a/plugins/gofax/faxaccount/lists.tpl
+++ b/plugins/gofax/faxaccount/lists.tpl
@@ -4,10 +4,14 @@
    <b>{t}Blocked numbers/lists{/t}</b>
    <br> 
    <select style="width:350px; height:300px;" name="block_list[]" size=15 multiple>
-    {html_options values=$cblocklist output=$cblocklist}
+       {if $SELECT_cblocklist==true}
+           {html_options values=$cblocklist output=$cblocklist}
+       {else}
+               <option disabled>
+       {/if}
    </select>
    <br>
-   <input name="block_number" size=25 align=center maxlength=30 {$goFaxBlockListACL} value="">
+   <input name="block_number" size=25 align="middle" maxlength=30 {$goFaxBlockListACL} value="">
    <input type=submit value="{t}Add{/t}" name="add_blocklist_number" {$goFaxBlockListACL}>&nbsp;
    <input type=submit value="{t}Delete{/t}" name="delete_blocklist_number" {$goFaxBlockListACL}>
   </td>
@@ -25,7 +29,11 @@
 
    <b>{t}List of predefined blocklists{/t}</b>
    <select style="width:350px; height:250px;" name="predefined_list[]" size=15 multiple>
-    {html_options options=$list}
+    {if $SELECT_list==true}
+        {html_options values=$list}
+    {else}
+        <option>
+    {/if}
    </select>
   </td>
  </tr>

diff --git a/plugins/gofax/faxaccount/locals.tpl b/plugins/gofax/faxaccount/locals.tpl
index e3a1ace5cb9390e83977287163b05043897a235a..3e2a8269f9e59adc29e18e8dfe4a308be5779d50 100644 (file)
--- a/plugins/gofax/faxaccount/locals.tpl
+++ b/plugins/gofax/faxaccount/locals.tpl
@@ -25,17 +25,17 @@
      </table>
     </p>
     <p class="contentboxb" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
-    <table width="100%"><tr><td width="50%"><img src="{$tree_image}" align=center>&nbsp;{t}Display numbers of department{/t}</td>
+    <table width="100%"><tr><td width="50%"><img src="{$tree_image}" align="middle">&nbsp;{t}Display numbers of department{/t}</td>
     <td><select name="depselect" size=1 onChange="mainform.submit()" title="{t}Choose the department the search will be based on{/t}">
       {html_options options=$deplist selected=$depselect}
     </select></td></tr></table>
     </p>
     <p class="contentboxb" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
-    <table width="100%"><tr><td width="50%"><img src="{$search_image}" align=center>&nbsp;{t}Display numbers matching{/t}</td>
+    <table width="100%"><tr><td width="50%"><img src="{$search_image}" align="middle">&nbsp;{t}Display numbers matching{/t}</td>
     <td><input type='text' name='regex' maxlength='20' value='{$regex}' title='{t}Regular expression for matching numbers{/t}' onChange="mainform.submit()"></td></tr></table>
     </p>
     <p class="contentboxb" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
-    <table width="100%"><tr><td width="50%"><img src="{$search_image}" align=center>&nbsp;{t}Display numbers of user{/t}</td>
+    <table width="100%"><tr><td width="50%"><img src="{$search_image}" align="middle">&nbsp;{t}Display numbers of user{/t}</td>
     <td><input type='text' name='fuser' maxlength='20' value='{$fuser}' title='{t}User name of which numbers are shown{/t}' onChange="mainform.submit()"></td></tr></table>
    </p>
    {$apply}

diff --git a/plugins/gofax/faxaccount/main.inc b/plugins/gofax/faxaccount/main.inc
index 9cd1f67ca3373a09938b2af10c62932cb59fe50f..3ed1eaf7e6a2fbea469bdc814e7e0cb3dce7f70d 100644 (file)
--- a/plugins/gofax/faxaccount/main.inc
+++ b/plugins/gofax/faxaccount/main.inc
@@ -89,11 +89,11 @@ if (!$remove_lock){
                        $display.= "<input type=submit name=\"edit_finish\" value=\""._("Finish")."\">\n";
                        $display.= "&nbsp;\n";
                        $display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
-                       $info= "<img align=\"center\" src=\"".get_template_path('images/closedlock.png')."\"> ".$ui->dn."&nbsp;";
+                       $info= "<img alt='' align=\"middle\" src=\"".get_template_path('images/closedlock.png')."\"> ".$ui->dn."&nbsp;";
                } else {
-                       $info= "<img align=\"center\" src=\"".get_template_path('images/openlock.png')."\"> ".$ui->dn."&nbsp;";
+                       $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/openlock.png')."\"> ".$ui->dn."&nbsp;";
                        if (isset($editacl) && $editacl != "#none#"){
-                               $info.= "<img align=\"center\" src=\"".get_template_path('images/lamp.png')."\">"._("Click the 'Edit' button below to change informations in this dialog");
+                               $info.= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lamp.png')."\">"._("Click the 'Edit' button below to change informations in this dialog");
                                $display.= "<input type=submit name=\"edit\" value=\""._("Edit")."\">";
                        }
                        $display.= "<input type=\"hidden\" name=\"ignore\">\n";

diff --git a/plugins/personal/connectivity/main.inc b/plugins/personal/connectivity/main.inc
index d8ab9df487cdf5a825f92fd9fd34971a5e83d1aa..a39b9eeba505a166e9611670ce7b13f3f59b9242 100644 (file)
--- 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.= "<p class=\"plugbottom\">";
   if ($in_edit_mode){
-    $display.= "<p class=\"plugbottom\">";
 
     if (isset($_SESSION['edit'])){
       $display.= "<input type=submit name=\"edit_finish\" value=\""._("Finish")."\">\n";
       $display.= "&nbsp;";
       $display.= "<input type=submit name=\"edit_cancel\" value=\""._("Cancel")."\">\n";
-      $info= "<img align=\"middle\" src=\"".get_template_path('images/closedlock.png').
+      $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/closedlock.png').
              "\"> ".$ui->dn."&nbsp;";
     } else {
-      $info= "<img align=\"middle\" src=\"".get_template_path('images/openlock.png').
+      $info= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/openlock.png').
              "\"> ".$ui->dn."&nbsp;";
       if ($editacl != "#none#"){
-        $info.= "<img align=\"middle\" src=\"".get_template_path('images/lamp.png').
+        $info.= "<img alt=\"\" align=\"middle\" src=\"".get_template_path('images/lamp.png').
                 "\">"._("Click the 'Edit' button below to change informations in this dialog");
         $display.= "<input type=submit name=\"edit\" value=\""._("Edit")."\">\n";
       }

diff --git a/plugins/personal/connectivity/proxy.tpl b/plugins/personal/connectivity/proxy.tpl
index 3af7a14179119ccd1947217dd920657518632b7a..dc0d5b746a614517730d041076b85c3b89eb666e 100644 (file)
--- a/plugins/personal/connectivity/proxy.tpl
+++ b/plugins/personal/connectivity/proxy.tpl
@@ -2,13 +2,13 @@
 <table style="width:100%; vertical-align:top; text-align:left;" cellpadding=0 border=0>
  <tr>
    <td>
-    <table width=100% cellpadding=0>
+    <table width="100%" cellpadding=0>
     <tr><td>
     <input type="checkbox" name="filterF" id="filterF" value="F" {$filterF} {$gosaProxyAcctFlagsACL} {$pstate}>
     {t}Filter unwanted content (i.e. pornographic or violence related){/t}
     </td></tr>
      <tr>
-      <td width=50%>
+      <td width="50%">
     <input type="checkbox" name="filterT" id="filterT" value="T" {$filterT} {$gosaProxyAcctFlagsACL} {$pstate}>
     {t}Limit proxy access to working time{/t}
     <br>