From cbdd19732238b161d28dbb61321ecdecf111554e Mon Sep 17 00:00:00 2001
From: bgigon <bgigon@alumni.egroupware.org>
Date: Thu, 14 Oct 2004 09:07:31 +0000
Subject: [PATCH] Update from Omar Boumeddane

---
 calendar/templates/prisma/edit.tpl            |   6 +-
 calendar/templates/prisma/matrix_query.tpl    |  26 ++--
 calendar/templates/prisma/view.tpl            |   8 +-
 phpgwapi/templates/prisma/navbar.inc.php      |   5 +
 phpgwapi/templates/prisma/uiaccountsel.tpl    |  42 +++---
 .../templates/default/category_form.tpl       |  47 +++----
 preferences/templates/default/listcats.tpl    | 124 +++++++++---------
 7 files changed, 132 insertions(+), 126 deletions(-)

diff --git a/calendar/templates/prisma/edit.tpl b/calendar/templates/prisma/edit.tpl
index cd53d39ce9..dfd700a9d9 100644
--- a/calendar/templates/prisma/edit.tpl
+++ b/calendar/templates/prisma/edit.tpl
@@ -5,7 +5,7 @@
 
 <form action="{action_url}" method="post" name="app_form">
 {common_hidden}
-<table border="0" width="90%">
+<table border="0" width="98%">
  <tr>
   <td colspan="2">
    <center><font size="+1"><b>{errormsg}</b></font></center>
@@ -30,8 +30,8 @@
 <!-- END edit_entry -->
 <!-- BEGIN list -->
  <tr bgcolor="{tr_color}">
-  <td valign="top" width="35%">&nbsp;<b>{field}:</b></td>
-  <td valign="top" width="65%">{data}</td>
+  <td valign="top" width="35%" align="right">&nbsp;<b>{field}&nbsp;:&nbsp;</b></td>
+  <td valign="top" width="65%" align="left">{data}</td>
  </tr>
 <!-- END list -->
 <!-- BEGIN hr -->
diff --git a/calendar/templates/prisma/matrix_query.tpl b/calendar/templates/prisma/matrix_query.tpl
index 22d6ea7548..7002028a86 100644
--- a/calendar/templates/prisma/matrix_query.tpl
+++ b/calendar/templates/prisma/matrix_query.tpl
@@ -4,22 +4,24 @@
 <!--
 function removeSelectedOptions(id)
 {
-    openerSelectBox = document.getElementById(id);
-
-    if (openerSelectBox == null) 
-	window.close();
-
-    for (i=0; i < openerSelectBox.length; i++) 
-    {
-	if (openerSelectBox.options[i].selected) 
+    for(i=0; i<document.matrixform.participants.options.length;i++)
+    {	
+	if(document.matrixform.participants.options[i].selected==true) 
 	{
-	    openerSelectBox.removeChild(openerSelectBox[i]);
-	    //openerSelectBox.options[i--] = null	    
-        }
+	    document.matrixform.participants.options[i]=null;
+	    i--;
+	}
     }
 }
 function selectAll(id)
 {
+
+    for(i=0; i<document.matrixform.participants.options.length;i++)
+    {	
+	document.matrixform.participants.options[i].selected = true ;
+	
+    }
+/*
     openerSelectBox = document.getElementById(id);
 
     if (openerSelectBox == null) 
@@ -28,7 +30,7 @@ function selectAll(id)
     
     for (i=0; i < openerSelectBox.length; i++) 
 	openerSelectBox.options[i].selected = 1 ;
-
+*/
     document.matrixform.submit();
 }
 
diff --git a/calendar/templates/prisma/view.tpl b/calendar/templates/prisma/view.tpl
index daf75fa90c..092e185c61 100644
--- a/calendar/templates/prisma/view.tpl
+++ b/calendar/templates/prisma/view.tpl
@@ -1,8 +1,7 @@
 <!-- $Id$ -->
 
 <!-- BEGIN view_event -->
-<center>
-<table id="calendar_view_event" border="0" width="90%">
+<table id="calendar_view_event" border="0" width="98%" align="center">
 	{row}
 	<tr>
 		<td>
@@ -28,13 +27,12 @@
 		</td>
 	</tr>
 </table>
-</center>
 <!-- END view_event -->
 
 <!-- BEGIN list -->
 	<tr bgcolor="{tr_color}">
-		<td valign="top" width="30%">&nbsp;<b>{field}:</b></td>
-		<td colspan="2" valign="top" width="70%">{data}</td>
+		<td valign="top" width="30%" align="right">&nbsp;<b>{field}&nbsp;:&nbsp;</b></td>
+		<td colspan="2" valign="top" width="70%" align="left">{data}</td>
 	</tr>
 <!-- END list -->
 
diff --git a/phpgwapi/templates/prisma/navbar.inc.php b/phpgwapi/templates/prisma/navbar.inc.php
index b61a2fad9b..49129ece47 100644
--- a/phpgwapi/templates/prisma/navbar.inc.php
+++ b/phpgwapi/templates/prisma/navbar.inc.php
@@ -308,11 +308,14 @@
 			// If the application has a header include, we now include it
 			if(!@$GLOBALS['phpgw_info']['flags']['noappheader'] && @isset($_GET['menuaction']))
 			{
+			
 				list($app,$class,$method) = explode('.',$_GET['menuaction']);
+	
 				if(is_array($GLOBALS[$class]->public_functions) && $GLOBALS[$class]->public_functions['header'])
 				{
 					$GLOBALS[$class]->header();
 				}
+	
 			}
 			$GLOBALS['phpgw']->hooks->process('after_navbar');
 			return;
@@ -328,6 +331,7 @@
 
 				foreach($file as $text => $url)
 				{
+				    if ($text != 'Export' && $text != 'Import' ) 
 					sidebox_menu_item($url,$text);
 				}
 
@@ -335,6 +339,7 @@
 			}
 		}
 
+
 		function sidebox_menu_item($item_link='',$item_text='')
 		{
 			if($item_text === '_NewLine_' || $item_link === '_NewLine_')
diff --git a/phpgwapi/templates/prisma/uiaccountsel.tpl b/phpgwapi/templates/prisma/uiaccountsel.tpl
index 15ce5340e6..ff198ce1e6 100644
--- a/phpgwapi/templates/prisma/uiaccountsel.tpl
+++ b/phpgwapi/templates/prisma/uiaccountsel.tpl
@@ -1,5 +1,4 @@
 <!-- $Id$ -->
-
 <script LANGUAGE="JavaScript">
 	window.focus();
 
@@ -37,21 +36,22 @@
 		}
 	}
 
-	function removeSelectedOptions(id)
+	function removeSelectedOptions()
 	{
-		openerSelectBox = opener.document.getElementById(id);
-		if (openerSelectBox == null) window.close();
-		selectBox = document.getElementById('uiaccountsel_popup_selection');
-		for (i=0; i < selectBox.length; i++) {
-			if (selectBox.options[i].selected) {
-				for (j=0; j < openerSelectBox.length; j++) {
-					if (openerSelectBox[j].value == selectBox.options[i].value) {
-						openerSelectBox.removeChild(openerSelectBox[j]);
-					}
-				}
-				selectBox.options[i--] = null;
-			}
-		}
+	    for(i=0; i<document.uiaccountsel.participants.options.length;i++)                                   
+    	    {                                                                                                 
+	        if(document.uiaccountsel.participants.options[i].selected==true)                                
+	        {     
+		    for (j = 0 ; j < opener.document.{FormName}.{SelectName}.options.length ; j++)
+	    	    { 
+			if (opener.document.{FormName}.{SelectName}.options[j].value == document.uiaccountsel.participants.options[i].value)     
+	    		opener.document.{FormName}.{SelectName}.options[j]=null;                                         
+	    	    }                                                                                             
+		                                                                                            
+	    	    document.uiaccountsel.participants.options[i]=null;                                         
+	            i--;                                                                                      
+	        }                                                                                             
+	    }                                                                                                 
 	}
 
 	function copyOptions(id)
@@ -169,21 +169,19 @@
 		<td valign="top">
 			<table border="0" width="100%" cellpadding="2" cellspacing="2">
 				<tr class="th">
-					<td width="100%" class="th" align="center" colspan="4"><b>{lang_accounts}</b></td>
+					<td width="100%" class="th" align="center" colspan="3"><b>{lang_accounts}</b></td>
 				</tr>
 				<tr class="th">
-					<td align="center">{sort_lid}</td>
-					<td align="center">{sort_firstname}</td>
 					<td align="center">{sort_lastname}</td>
+					<td align="center">{sort_firstname}</td>
 					<td width="10%">&nbsp;</td>
 				</tr>
 
 <!-- BEGIN accounts_list -->
 
 	<tr class="{tr_color}">
-		<td>{lid}</td>
-		<td>{firstname}</td>
-		<td>{lastname}</td>
+		<td>{bold}{lastname}</td>
+		<td>{bold}{firstname}</td>
 		<td align="center">
 			<input type="image" src="{img}" onclick="{onclick}; return false;" title="{lang_select_user}">
 		</td>
@@ -198,11 +196,13 @@
 				<tr class="th">
 					<td align="center" colspan="2"><b>{lang_selection}</b> {remove}</td>
 				</tr>
+				<form name="uiaccountsel">
 				<tr class="row_off">
 					<td align="center">
 						{selection}
 					</td>
 				</tr>
+				</form>
 				<tr>
 					<td align="center" colspan="2">
 						<input type="button" name="close" value="{lang_close}" onClick="{close_action}">
diff --git a/preferences/templates/default/category_form.tpl b/preferences/templates/default/category_form.tpl
index 95901dbb4b..fa68454593 100644
--- a/preferences/templates/default/category_form.tpl
+++ b/preferences/templates/default/category_form.tpl
@@ -4,47 +4,50 @@
 <br>
 <center>
 {message}<br>
-<table border="0" width="80%" cellspacing="2" cellpadding="2"> 
 <form name="edit_cat" action="{actionurl}" method="POST">
+<table border="0" width="98%" cellspacing="2" cellpadding="2"> 
+
 	<tr class="th">
-		<td colspan="2">{lang_parent}</td>
-		<td><select name="new_parent"><option value="">{lang_none}</option>{category_list}</select></td>
+		<td colspan="2" align="right">{lang_parent}&nbsp;:&nbsp;</td>
+		<td align="left"><select name="new_parent"><option value="">{lang_none}</option>{category_list}</select></td>
 	</tr>
 	<tr class="row_on">
-		<td colspan="2">{lang_name}</font></td>
-		<td><input name="cat_name" size="50" value="{cat_name}"></td>
+		<td colspan="2" align="right">{lang_name}&nbsp;:&nbsp;</font></td>
+		<td align="left"><input name="cat_name" size="50" value="{cat_name}"></td>
 	</tr>
 	<tr class="row_off">
-		<td colspan="2">{lang_descr}</td>
-		<td colspan="2"><textarea name="cat_description" rows="4" cols="50" wrap="virtual">{cat_description}</textarea></td>
+		<td colspan="2" align="right">{lang_descr}&nbsp;:&nbsp;</td>
+		<td colspan="2" align="left"><textarea name="cat_description" rows="4" cols="50" wrap="virtual">{cat_description}</textarea></td>
 	</tr>
 	<tr class="row_on">
-		<td colspan="2">{lang_access}</td>
-		<td colspan="2">{access}</td>
+		<td colspan="2" align="right">{lang_access}&nbsp;:&nbsp;</td>
+		<td colspan="2" align="left">{access}</td>
 	</tr>
 	<tr class="row_off">
-		<td colspan="2">{lang_color}</td>
-		<td colspan="2">{color}</td>
+		<td colspan="2" align="right">{lang_color}&nbsp;:&nbsp;</td>
+		<td colspan="2" align="left">{color}</td>
 	</tr>
 	<tr class="row_on">
-		<td colspan="2">{lang_icon}</td>
-		<td colspan="2">{select_icon} {icon}</td>
+		<td colspan="2" align="right">{lang_icon}&nbsp;:&nbsp;</td>
+		<td colspan="2" align="left">{select_icon} {icon}</td>
 	</tr>
 <!-- BEGIN data_row -->
 	<tr class="{class}">
-		<td colspan="2">{lang_data}</td>
-		<td>{td_data}</td>
+		<td colspan="2" align="right">{lang_data}&nbsp;:&nbsp;</td>
+		<td align="left">{td_data}</td>
 	</tr>
 <!-- END data_row -->
 
 <!-- BEGIN add -->
 
 	<tr valign="bottom" height="50">
-		<td><input type="submit" name="save" value="{lang_save}"></form></td>
-		<td><form method="POST" action="{cancel_url}">
-			<input type="submit" name="cancel" value="{lang_cancel}"></form></td>
+		<td><input type="submit" name="save" value="{lang_save}"></td>
+		<td></td>
+
 	</tr>
+	
 </table>
+</form>
 </center>
 
 <!-- END add -->
@@ -54,13 +57,13 @@
 	<tr valign="bottom" height="50">
 		<td>
 			{hidden_vars}
-			<input type="submit" name="save" value="{lang_save}"></form></td>
+			<input type="submit" name="save" value="{lang_save}"></td>
 		<td>
-			<form method="POST" action="{cancel_url}">
-			<input type="submit" name="cancel" value="{lang_cancel}"></form></td>
-		<td align="right">{delete}</td>
+			<input type="button" name="cancel" onClick="javascript:history.back()" value="{lang_cancel}"></td>
+		<td>&nbsp;</td>
 	</tr>
 </table>
+</form>
 </center>
 
 <!-- END edit -->
diff --git a/preferences/templates/default/listcats.tpl b/preferences/templates/default/listcats.tpl
index 858ac8b618..97e80bde11 100644
--- a/preferences/templates/default/listcats.tpl
+++ b/preferences/templates/default/listcats.tpl
@@ -1,70 +1,68 @@
 <!-- $Id$ -->
-<br>
-<center>
-<table border="0" cellspacing="2" cellpadding="2" width="80%">
-		<tr>
-			<td colspan="3" align=left>
-				<table border="0" width="100%">
-					<tr>
-					{left}
-						<td align="center">{lang_showing}</td>
-					{right}
-					</tr>
-				</table>
-			</td>
-		</tr>
-		<tr>
-			<td>&nbsp;</td>
-			<td colspan="3" align=right>
-				<form method="post" action="{actionurl}">
-				<input type="text" name="query">&nbsp;<input type="submit" name="search" value="{lang_search}">
-				</form></td>
-		</tr>
-</table>
-<table border="0" cellspacing="2" cellpadding="2" width="80%">
-	<tr class="th">
-		<td>{sort_name}</td>
-		<td>{sort_description}</td>
-		{sort_data}
-		<td align="center">{lang_app}</td>
-		<td align=center>{lang_sub}</td>
-		<td align=center>{lang_edit}</td>
-		<td align=center>{lang_delete}</td>
-	</tr>
+
+	<center>
+		<table border="0" cellspacing="2" cellpadding="2" width="100%">
+			<tr>
+				<td colspan="8" align="left">
+					<table border="0" width="100%">
+						<tr>
+						{left}
+							<td align="center">{lang_showing}</td>
+						{right}
+						</tr>
+					</table>
+				</td>
+			</tr>
+<!-- BEGIN search -->
+			<tr>
+				<td colspan="8" align="right">
+					<form method="post" action="{action_nurl}">
+					<input type="text" name="query">&nbsp;<input type="submit" name="search" value="{lang_search}"></form></td>
+			</tr>
+<!-- END search -->
+			<tr class="th">
+
+				<td width="20%">{sort_name}</td>
+				<td width="6%">{lang_global}</td>							
+				<td width="32%">{sort_description}</td>
+				{sort_data}
+				<td width="8%">{lang_color}</td>							
+				<td width="14%" align="center">{lang_sub}</td>
+				<td width="8%" align="center">{lang_edit}</td>
+				<td width="8%" align="center">{lang_delete}</td>
+			</tr>
 
 <!-- BEGIN cat_list -->
 
-	<tr bgcolor="{tr_color}" {color}>
-		<td>{name}</td>
-		<td>{descr}</td>
-		{td_data}
-		<td align="center"><a href="{app_url}">{lang_app}</a></td>
-		<td align="center"><a href="{add_sub}">{lang_sub_entry}</a></td>
-		<td align="center"><a href="{edit}">{lang_edit_entry}</a></td>
-		<td align="center"><a href="{delete}">{lang_delete_entry}</a></td>
-	</tr>
+			<tr bgcolor="{tr_color}" {color}>
+				<td>{name}</td>
+				<td>{lang_global_entry}</td>				
+				<td>{descr}</td>
+				{td_data}
+				<td bgcolor="{td_color}"></td>							
+				<td align="center"><a href="{add_sub}">{lang_sub_entry}</a></td>
+				<td align="center"><a href="{edit}">{lang_edit_entry}</a></td>
+				<td align="center"><a href="{delete}">{lang_delete_entry}</a></td>  
+			</tr>
 
-<!-- END cat_list -->  
-
-<!-- BEGIN add   -->
-
-</table>
-<table border="0" cellspacing="2" cellpadding="2" width="80%">
-	<tr valign="bottom" height="50">
-		<td>
-			<form method="POST" action="{add_action}">
-				<input type="submit" value="{lang_add}">
-			</form>
-		</td>
-		<td>
-			<form method="POST" action="{doneurl}">
-				<input type="submit" name="done" value="{lang_cancel}">
-			</form>
-		</td>
-		<td width="80%">&nbsp;</td>
-	</tr>
-</table>
+<!-- END cat_list -->
 
+			<tr valign="bottom" height="50">			
+<!-- BEGIN add -->			
+            		    <td>
+                		<form method="POST" action="{add_action}">
+                        	<input type="submit" value="{lang_add}">
+                                </form>
+            		    </td>
+           
+			    <td>
+        			<form method="POST" action="{doneurl}">
+                    		<input type="submit" name="done" value="{lang_cancel}">
+                    		</form>
+                    	    </td>
+			
+			    <td width="80%">&nbsp;</td>
 <!-- END add -->
-
-</center>
+			</tr>
+		</table>
+	</center>