From dad916f6b48a0d3eb3647ffe75571deb51a6ff28 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 17 Mar 2010 16:10:04 +0000
Subject: [PATCH] Updated fax templates

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16816 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../gofax/gofax/faxaccount/generic.tpl        | 21 ++++++++----
 gosa-plugins/gofax/gofax/faxaccount/lists.tpl |  6 ++--
 .../gofax/gofax/faxaccount/locals.tpl         | 33 ++++++++++++-------
 .../gofax/gofax/faxaccount/paste_generic.tpl  |  6 ++--
 .../gofax/gofax/faxreports/contents.tpl       | 12 ++++---
 .../gofax/gofax/faxreports/detail.tpl         |  6 ++--
 6 files changed, 56 insertions(+), 28 deletions(-)

diff --git a/gosa-plugins/gofax/gofax/faxaccount/generic.tpl b/gosa-plugins/gofax/gofax/faxaccount/generic.tpl
index 4b140cc01..f76e0bd3f 100644
--- a/gosa-plugins/gofax/gofax/faxaccount/generic.tpl
+++ b/gosa-plugins/gofax/gofax/faxaccount/generic.tpl
@@ -1,8 +1,10 @@
-<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding="0" border="0">
+<table style='width:100%; ' summary="">
+
 
  <!-- Headline container -->
  <tr>
-   <td style="width:50%; vertical-align:top;">
+   <td style='width:50%; '>
+
      <h3>{t}Generic{/t}</h3>
 
      <table summary="">
@@ -47,10 +49,12 @@
      </table>
      
    </td>
-   <td style="border-left:1px solid #A0A0A0">
+   <td class='left-border'>
+
     &nbsp;
    </td>
-   <td style="vertical-align:top; width:100%">
+   <td style='width:100%'>
+
      <h3>{t}Delivery methods{/t}</h3>
 
 {render acl=$goFaxIsEnabledACL checkbox=$multiple_support checked=$use_goFaxIsEnabled}
@@ -90,9 +94,11 @@
 
 <hr>
 
-<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4 border=0>
+<table style='width:100%; ' summary="">
+
   <tr>
-    <td style="width:50%; border-right:1px solid #A0A0A0">
+    <td style='width:50%; ' class='right-border'>
+
 
 	{if !$multiple_support}
 
@@ -121,7 +127,8 @@
 {/render}
 	{/if}
    </td>
-   <td style="vertical-align:top; width:50%">
+   <td style='width:50%'>
+
       <h3>{t}Blocklists{/t}</h3>
       <table summary="" style="width:100%">
         <tr>
diff --git a/gosa-plugins/gofax/gofax/faxaccount/lists.tpl b/gosa-plugins/gofax/gofax/faxaccount/lists.tpl
index 124ff1ff5..b34786950 100644
--- a/gosa-plugins/gofax/gofax/faxaccount/lists.tpl
+++ b/gosa-plugins/gofax/gofax/faxaccount/lists.tpl
@@ -1,7 +1,9 @@
 
-<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4 border=0>
+<table style='width:100%; ' summary="">
+
  <tr>
-  <td style="vertical-align:top;width:50%;border-right:1px solid #A0A0A0"> 
+  <td style='width:50%;' class='right-border'> 
+
    <b>{t}Blocked numbers/lists{/t}</b>
    <br> 
    <select style="width:100%; height:300px;" name="block_list[]" size=15 multiple>
diff --git a/gosa-plugins/gofax/gofax/faxaccount/locals.tpl b/gosa-plugins/gofax/gofax/faxaccount/locals.tpl
index 3e84b7de6..f3470eecf 100644
--- a/gosa-plugins/gofax/gofax/faxaccount/locals.tpl
+++ b/gosa-plugins/gofax/gofax/faxaccount/locals.tpl
@@ -1,6 +1,8 @@
-<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding=4>
+<table style='width:100%; ' summary="">
+
 <tr>
-  <td style="vertical-align:top; width:600px">
+  <td style='width:600px'>
+
    <div class="contentboxh" style="height:20px;">
     <p class="contentboxh" style="font-size:12px">
      <b>{t}Select numbers to add{/t} {$hint}</b><br>
@@ -14,37 +16,46 @@
     </p>
    </div>
   </td>
-  <td style="vertical-align:top;">
+  <td>
+
    <div class="contentboxh" style="height:20px;">
-    <p class="contentboxh" style="font-size:12px"><img src="{$launchimage}" align="right" alt="[F]"><b>{t}Filters{/t}</b></p>
+    <p class="contentboxh" style="font-size:12px">{image path="{$launchimage}" align="right"}
+<b>{t}Filters{/t}</b></p>
    </div>
    <div class="contentboxb"  style="background-color:#F8F8F8">
-     <table summary="" style="width:100%;border-top:1px solid #B0B0B0; background-color:#F8F8F8">
+     <table style='width:100%;background-color:#F8F8F8' summary="">
+
       {$alphabet}
      </table>
-    <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
+    <table style='background-color:#F8F8F8' summary="">
+
 		<tr>
 			<td>
-				<img class="center" alt="" src="{$tree_image}" align="middle" title="{t}Display numbers of department{/t}">&nbsp;
+				{image path="{$tree_image}" title="{t}Display numbers of department{/t}"}&nbsp;
+
 				<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>
-    <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
+    <table style='background-color:#F8F8F8' summary="">
+
 		<tr>
 			<td width="18">
-				<img class="center" alt="" src="{$search_image}" align="middle" title="{t}Display numbers matching{/t}">
+				{image path="{$search_image}" title="{t}Display numbers matching{/t}"}
+
 			</td>
     		<td>
 				<input type='text' name='regex' maxlength='20' value='{$regex}' style="width:99%" title='{t}Regular expression for matching numbers{/t}' onChange="mainform.submit()">	</td>
 		</tr>
 	</table>
-    <table summary="" width="100%" style="border-top:1px solid #B0B0B0;background-color:#F8F8F8">
+    <table style='background-color:#F8F8F8' summary="">
+
 		<tr>
 			<td width="18">
-				<img class="center" alt="" src="{$usearch_image}" align="middle" title="{t}Display numbers of user{/t}">
+				{image path="{$usearch_image}" title="{t}Display numbers of user{/t}"}
+
 			</td>
 		    <td>
 				<input type='text' name='fuser' style="width:99%" maxlength='20' value='{$fuser}' title='{t}User name of which numbers are shown{/t}' onChange="mainform.submit()">	</td>
diff --git a/gosa-plugins/gofax/gofax/faxaccount/paste_generic.tpl b/gosa-plugins/gofax/gofax/faxaccount/paste_generic.tpl
index 000bf11c7..32e7d1b2f 100644
--- a/gosa-plugins/gofax/gofax/faxaccount/paste_generic.tpl
+++ b/gosa-plugins/gofax/gofax/faxaccount/paste_generic.tpl
@@ -1,6 +1,8 @@
-<table summary="" style="width:100%; vertical-align:top; text-align:left;" cellpadding="0" border="0">
+<table style='width:100%; ' summary="">
+
  	<tr>
-   		<td style="width:50%; vertical-align:top;">
+   		<td style='width:50%; '>
+
      		<h3>{t}Generic{/t}</h3>
      		<table summary="">
        			<tr>
diff --git a/gosa-plugins/gofax/gofax/faxreports/contents.tpl b/gosa-plugins/gofax/gofax/faxreports/contents.tpl
index e9b6a1fbb..5324d5ffb 100644
--- a/gosa-plugins/gofax/gofax/faxreports/contents.tpl
+++ b/gosa-plugins/gofax/gofax/faxreports/contents.tpl
@@ -1,9 +1,11 @@
 <div class="contentboxh">
- <p class="contentboxh"><img src="{$launchimage}" align="right" alt="[F]">{t}Filter{/t}</p>
+ <p class="contentboxh">{image path="{$launchimage}" align="right"}{t}Filter{/t}
+</p>
 </div>
 <div class="contentboxb">
  <p class="contentboxb" style="border-top:1px solid #B0B0B0; padding-top:5px;">
- <img class="center" alt="" align="middle" border=0 src="{$search_image}">&nbsp;{t}Search for{/t}
+ {image path="{$search_image}"}&nbsp;{t}Search for{/t}
+
  <input type='text' name="search_for" size=25 maxlength=60 value="{$search_for}" title="{t}Enter user name to search for{/t}" onChange="mainform.submit()">
  {t}in{/t}
  <select size="1" name="search_base" title="{t}Select subtree to base search on{/t}" onChange="mainform.submit()">
@@ -26,7 +28,8 @@
 <br>
 
 {if $search_result ne ""}
- <table summary="" style="width:100%; vertical-align:top; text-align:left; border:1px solid #B0B0B0;" cellpadding=2 cellspacing=1 border=0 rules="cols">
+ <table style='width:100%; ' summary="">
+
   <tr style="background-color: #E8E8E8; height:26px; font-weight:bold">
    <td><a href="main.php{$plug}&amp;sort=0">{t}User{/t} {$mode0}</a></td>
    <td><a href="main.php{$plug}&amp;sort=1">{t}Date{/t} {$mode1}</a></td>
@@ -38,7 +41,8 @@
   {$search_result}
  </table>
 
- <table summary="" style="width:100%; vertical-align:top; text-align:center;" cellpadding=4 cellspacing=0 border=0>
+ <table style='width:100%; text-align:center;' summary="">
+
   <tr>
    <td>{$range_selector}</td>
   </tr>
diff --git a/gosa-plugins/gofax/gofax/faxreports/detail.tpl b/gosa-plugins/gofax/gofax/faxreports/detail.tpl
index 072c94cb3..797bac846 100644
--- a/gosa-plugins/gofax/gofax/faxreports/detail.tpl
+++ b/gosa-plugins/gofax/gofax/faxreports/detail.tpl
@@ -2,7 +2,8 @@
  <tr>
   <td> 
    <a href="plugins/gofax/getfax.php?id={$detail}&amp;download=1">
-     <img  align="bottom" width="420" height="594" src="plugins/gofax/getfax.php?id={$detail}" alt="{t}FAX preview - please wait{/t}" border=1>
+     {image path="plugins/gofax/getfax.php?id={$detail}" align="bottom"}
+
    </a>
    <p style="margin-top-width:0px; text-align:center;">
     {t}Click on fax to download{/t}
@@ -11,7 +12,8 @@
   <td style="width:20px;">
     &nbsp;
   </td>
-  <td style="vertical-align:top">
+  <td>
+
     <table summary="" border=0 cellspacing=5>
      <tr>
       <td><b>{t}FAX ID{/t}</b></td>
-- 
2.30.2