From 7fdd76e3162278a32e7d13d238ff1cd8c73f8566 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 17 Mar 2010 16:17:33 +0000
Subject: [PATCH] Updated address book -Still very broken

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16819 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../addons/addressbook/address_edit.tpl       | 30 ++++++++----
 .../addons/addressbook/address_info.tpl       | 33 ++++++++-----
 .../addons/addressbook/contents.tpl           | 46 ++++++++++++-------
 .../addressbook/addons/addressbook/dial.tpl   |  6 ++-
 .../addressbook/addons/addressbook/remove.tpl |  3 +-
 5 files changed, 78 insertions(+), 40 deletions(-)

diff --git a/gosa-plugins/addressbook/addons/addressbook/address_edit.tpl b/gosa-plugins/addressbook/addons/addressbook/address_edit.tpl
index c1460614e..6e922888e 100644
--- a/gosa-plugins/addressbook/addons/addressbook/address_edit.tpl
+++ b/gosa-plugins/addressbook/addons/addressbook/address_edit.tpl
@@ -1,4 +1,5 @@
-<table summary="" style="width:100%; vertical-align:top; text-align:left; border:1px solid #B0B0B0;" cellpadding=4 cellspacing=0 border=0>
+<table style='width:100%; border:1px solid #B0B0B0;' summary="">
+
 	<tr style="background-color: #E8E8E8; height:26px;font-weight:bold;">
 		<td align=left width="100%">
 			<LABEL for="storage_base">
@@ -18,9 +19,11 @@
 		<td colspan=2>
 			<table summary="" width="100%" cellspacing=2 cellpadding=4>
 				<tr>
-					<td style="width:50%; vertical-align:top; background-color: #F0F0F0">
+					<td style='width:50%; background-color: #F0F0F0'>
+
 						<h3>
-							<img class="center" alt="" src="{$personal_image}" align=middle>
+							{image path="{$personal_image}"}
+
 								&nbsp;{t}Personal{/t}
 						</h3>
  						<table summary="" width="100%">
@@ -68,9 +71,11 @@
   							</tr>
  						</table>
 					</td>
-					<td style="width:50%; vertical-align:top;background-color:#E8E8E8">
+					<td style='width:50%; background-color:#E8E8E8'>
+
  						<h3>
-							<img class="center" alt="" src="{$home_image}" align=middle>
+							{image path="{$home_image}"}
+
 							&nbsp;{t}Private{/t}
 						</h3>
 						<table summary="" width="100%">
@@ -82,7 +87,8 @@
 								<br>
 								<br>
 								</td>
-						   		<td style="vertical-align:top;">
+						   		<td>
+
 {render acl=$homePostalAddressACL}
 									<textarea id="homePostalAddress" name="homePostalAddress" rows=1 cols=20>{$info_homePostalAddress}</textarea>
 {/render}
@@ -128,9 +134,11 @@
 					</td>
 				</tr>
 				<tr>
-					<td style="width:100%; vertical-align:top; background-color: #E4E4E4" colspan=2>
+					<td style='width:100%; background-color: #E4E4E4' colspan="2">
+
  						<h3>
-							<img class="center" alt="" src="{$company_image}" align=middle>
+							{image path="{$company_image}"}
+
 							&nbsp;{t}Organizational{/t}
 						</h3>
  						<table summary="" width="100%">
@@ -199,7 +207,8 @@
 									 	</tr>
 									</table>
 								   	</td>
-								   	<td style="vertical-align:top">
+								   	<td>
+
 									<table summary="" width="100%">
 										<tr>
 											<td>
@@ -209,7 +218,8 @@
 												<br>
 												<br>
 											</td>
-											<td style="vertical-align:top;">
+											<td>
+
 {render acl=$postalAddressACL}
 												<textarea id="postalAddress" name="postalAddress" rows=1 cols=20 >{$info_postalAddress}</textarea>
 {/render}
diff --git a/gosa-plugins/addressbook/addons/addressbook/address_info.tpl b/gosa-plugins/addressbook/addons/addressbook/address_info.tpl
index 80e7bd460..1adb9afca 100644
--- a/gosa-plugins/addressbook/addons/addressbook/address_info.tpl
+++ b/gosa-plugins/addressbook/addons/addressbook/address_info.tpl
@@ -1,4 +1,5 @@
-<table summary="" style="width:100%; vertical-align:top; text-align:left; border:1px solid #B0B0B0;" cellpadding=4 cellspacing=0 border=0>
+<table style='width:100%; border:1px solid #B0B0B0;' summary="">
+
  <tr style="background-color: #E8E8E8; height:26px;font-weight:bold;">
   <td align=left width="100%">{$storage_info}
   </td>
@@ -12,9 +13,11 @@
 
    <table summary="" width="100%" cellspacing=2 cellpadding=4>
     <tr>
-     <td style="width:50%; vertical-align:top; background-color: #F0F0F0">
+     <td style='width:50%; background-color: #F0F0F0'>
+
       <h3>
-       <img class="center" alt="" src="{$personal_image}" align=middle> 
+       {image path="{$personal_image}"} 
+
        {t}Personal{/t}
       </h3>
  
@@ -46,19 +49,23 @@
       </table>
 
      </td>
-     <td style="vertical-align:top; background-color: #E8E8E8">
+     <td style='background-color: #E8E8E8'>
+
 
       <h3>
-       <img class="center" alt="" src="{$home_image}" align=middle> 
+       {image path="{$home_image}"} 
+
        {t}Private{/t}
       </h3>
 
       <table summary="" width="100%">
         <tr>
-         <td style='vertical-align:top; width: 40%;'>
+         <td style='width: 40%;'>
+
           {t}Address{/t}
          </td>
-         <td style="vertical-align:top;">
+         <td>
+
           <i>{$info_homePostalAddress}</i>
          </td>
         </tr>
@@ -92,10 +99,12 @@
      </tr>
 
      <tr>
-      <td style="vertical-align:top; background-color: #E4E4E4" colspan=2>
+      <td style='background-color: #E4E4E4' colspan="2">
+
 
        <h3>
-        <img class="center" alt="" src="{$company_image}" align=middle> 
+        {image path="{$company_image}"} 
+
         {t}Organizational{/t}
        </h3>
 
@@ -147,14 +156,16 @@
           </table>
 
          </td>
-         <td style="vertical-align:top">
+         <td>
+
 
           <table summary="" width="100%">
            <tr>
             <td style='vertical_align:top; width:40%;'>
              {t}Address{/t}
             </td>
-            <td style="vertical-align:top;">
+            <td>
+
              <i>{$info_postalAddress}</i>
             </td>
            </tr>
diff --git a/gosa-plugins/addressbook/addons/addressbook/contents.tpl b/gosa-plugins/addressbook/addons/addressbook/contents.tpl
index 004e3d2ae..2443059a8 100644
--- a/gosa-plugins/addressbook/addons/addressbook/contents.tpl
+++ b/gosa-plugins/addressbook/addons/addressbook/contents.tpl
@@ -1,7 +1,10 @@
-<table summary="" style="table-layout:fixed; width:100%; vertical-align:top; text-align:left; table-layout:auto;" cellpadding="4" border="0">
+<table style='table-layout:fixed; width:100%; table-layout:auto;' summary="">
+
 <tr>
-  <td style="vertical-align:top;">
-   <table summary="" style="border:1px solid #B0B0B0; width:100%; vertical-align:top; text-align:left;"  cellpadding="4" cellspacing="0">
+  <td>
+
+   <table style='border:1px solid #B0B0B0; width:100%; ' summary="">
+
     <colgroup>
         <col width="32%">
         <col width="14%">
@@ -17,7 +20,8 @@
     {$search_result}
    </table>
 
-   <table summary="" style="vertical-align:top; text-align:center; width:100%;" cellpadding="4" cellspacing="0" border="0">
+   <table style='text-align:center; width:100%;' summary="">
+
     <tr>
      <td>{$range_selector}</td>
     </tr>
@@ -28,9 +32,11 @@
    {/if}
 
   </td>
-  <td style="vertical-align:top; width:270px;">
+  <td style='width:270px;'>
+
    <div class="contentboxh" style="border-bottom:1px solid #B0B0B0;">
-    <p class="contentboxh"><img src="{$infoimage}" align="right" alt="[i]">{t}Information{/t}</p>
+    <p class="contentboxh">{image path="{$infoimage}" align="right"}{t}Information{/t}
+</p>
    </div>
    <div class="contentboxb">
     <p class="contentboxb">
@@ -39,22 +45,26 @@
    </div>
    <br>
    <div class="contentboxh">
-    <p class="contentboxh" style="vertical-align:middle;"><img src="{$actionimage}" style="vertical-align:middle;" align="right" alt="[a]">{t}Actions{/t}</p>
+    <p class="contentboxh" style="vertical-align:middle;">{image path="{$actionimage}" align="right"}{t}Actions{/t}
+</p>
    </div>
    <div class="contentboxb">
     <p class="contentboxb" style="vertical-align:middle;">
 {if $internal_createable}
-     <img class="center" alt="" src="{$add_image}">&nbsp;
+     {image path="{$add_image}"}&nbsp;
+
      <a href="main.php{$plug}&amp;global=add" style="text-align:center;vertical-align:middle;">{t}Add entry{/t}</a><br>
 {/if}
 
 {if $internal eq 0}
  {if $internal_editable}
-     <img alt="" src="{$edit_image}" class="center">&nbsp;
+     {image path="{$edit_image}"}&nbsp;
+
      <a href="main.php{$plug}&amp;global=edit">{t}Edit entry{/t}</a><br>
  {/if}
  {if $internal_removeable}
-	     <img alt="" src="{$delete_image}" class="center">&nbsp;
+	     {image path="{$delete_image}"}&nbsp;
+
 	     <a href="main.php{$plug}&amp;global=remove" style="vertical-align:middle;">{t}Remove entry{/t}</a><br>
  {/if}
 {/if}
@@ -62,7 +72,8 @@
    </div>
    <br>
    <div class="contentboxh">
-    <p class="contentboxh"><img src="{$launchimage}" align="right" alt="[F]">{t}Filters{/t}</p>
+    <p class="contentboxh">{image path="{$launchimage}" align="right"}{t}Filters{/t}
+</p>
    </div>
    <div class="contentboxb">
     <table summary="" style="width:100%;border-top:1px solid #B0B0B0;">
@@ -81,10 +92,11 @@
 <table summary="" style="width:100%;border-top:1px solid #B0B0B0;">
 	<tr>
 		<td>
-			<label for="search_base"><img class="center" alt="" src="{$tree_image}" align=middle title='{t}Display results for department{/t}'></label>
+			<label for="search_base">{image path="{$tree_image}" title="{t}Display results for department{/t}"}
+</label>
 		</td>
     	<td>
-			<select name="search_base" style='width:220px' onChange="mainform.submit()" title="{t}Choose the department the search will be based on{/t}">
+			<select name="search_base" style='width:220px' onChange="mainform.submit()" title="{t}Choose the department the search will be based on{/t}" size=1>
 		      	{html_options options=$deplist selected=$depselect}
 				<option disabled>&nbsp;</option>
     		</select>
@@ -94,10 +106,11 @@
 <table summary="" style="width:100%;border-top:1px solid #B0B0B0;">
 	<tr>
 		<td>
-			<label for="object_type"><img class="center" alt="" src="{$obj_image}" align=middle title='{t}Match object{/t}'></label>
+			<label for="object_type">{image path="{$obj_image}" title="{t}Match object{/t}"}
+</label>
 		</td>
 	    <td>
-			<select id="object_type" style='width:220px' name="object_type" onChange="mainform.submit()" title="{t}Choose the object that will be searched in{/t}">
+			<select id="object_type" style='width:220px' name="object_type" onChange="mainform.submit()" title="{t}Choose the object that will be searched in{/t}" size=1>
     	   		{html_options options=$objlist selected=$object_type}
 				<option disabled>&nbsp;</option>
 	      	</select>
@@ -106,7 +119,8 @@
 </table>
 <table summary="" style="width:100%;border-top:1px solid #B0B0B0;">
 	<tr>
-		<td><label for="search_for"><img class="center" alt="" src="{$search_image}" style="text-align:center;" title='{t}Search for{/t}'></label>
+		<td><label for="search_for">{image path="{$search_image}" title="{t}Search for{/t}"}
+</label>
 		</td>
 	    <td>
 			<input id="search_for" style='width:99%' type='text' name='search_for' maxlength='20' value='{$search_for}' title='{t}Search string{/t}' onChange="mainform.submit()">
diff --git a/gosa-plugins/addressbook/addons/addressbook/dial.tpl b/gosa-plugins/addressbook/addons/addressbook/dial.tpl
index 1bb21afd6..31e38a129 100644
--- a/gosa-plugins/addressbook/addons/addressbook/dial.tpl
+++ b/gosa-plugins/addressbook/addons/addressbook/dial.tpl
@@ -1,11 +1,13 @@
-<table summary="" style="width:100%; vertical-align:top; text-align:left; border:1px solid #B0B0B0;" cellpadding=4 cellspacing=0 border=0>
+<table style='width:100%; border:1px solid #B0B0B0;' summary="">
+
 <tr style="background-color: #E8E8E8; height:26px;font-weight:bold;">
 <td align=left width="100%"><LABEL for="dial">{t}Dial connection...{/t}</LABEL></td>
 </tr>
 <tr style="background-color: white">
 <td style="text-align:center;">
  <div style="height:50px;">&nbsp;</div>
- <a style="font-size:22px"><img alt="" src="{$phone_image}" align=middle>{$dial_info}</a>
+ <a style="font-size:22px">{image path="{$phone_image}"}{$dial_info}
+</a>
  <div style="height:60px;">&nbsp;</div>
  <button type='submit' name='dial' id="dial">{t}Dial{/t}</button>&nbsp;
 <button type='submit' name='cancel'>{msgPool type=cancelButton}</button>
diff --git a/gosa-plugins/addressbook/addons/addressbook/remove.tpl b/gosa-plugins/addressbook/addons/addressbook/remove.tpl
index 9330e624a..72e841f7a 100644
--- a/gosa-plugins/addressbook/addons/addressbook/remove.tpl
+++ b/gosa-plugins/addressbook/addons/addressbook/remove.tpl
@@ -1,5 +1,6 @@
 <div style="font-size:18px;">
- <img alt="" src="images/warning.png" align=top>&nbsp;{t}Warning{/t}
+ {image path="images/warning.png" align="top"}&nbsp;{t}Warning{/t}
+
 </div>
 <p>
   {$info}
-- 
2.30.2