Update from Omar Boumeddane

This commit is contained in:
bgigon 2004-10-14 09:07:31 +00:00
parent e999260d52
commit cbdd197322
7 changed files with 132 additions and 126 deletions

View File

@ -5,7 +5,7 @@
<form action="{action_url}" method="post" name="app_form"> <form action="{action_url}" method="post" name="app_form">
{common_hidden} {common_hidden}
<table border="0" width="90%"> <table border="0" width="98%">
<tr> <tr>
<td colspan="2"> <td colspan="2">
<center><font size="+1"><b>{errormsg}</b></font></center> <center><font size="+1"><b>{errormsg}</b></font></center>
@ -30,8 +30,8 @@
<!-- END edit_entry --> <!-- END edit_entry -->
<!-- BEGIN list --> <!-- BEGIN list -->
<tr bgcolor="{tr_color}"> <tr bgcolor="{tr_color}">
<td valign="top" width="35%">&nbsp;<b>{field}:</b></td> <td valign="top" width="35%" align="right">&nbsp;<b>{field}&nbsp;:&nbsp;</b></td>
<td valign="top" width="65%">{data}</td> <td valign="top" width="65%" align="left">{data}</td>
</tr> </tr>
<!-- END list --> <!-- END list -->
<!-- BEGIN hr --> <!-- BEGIN hr -->

View File

@ -4,22 +4,24 @@
<!-- <!--
function removeSelectedOptions(id) function removeSelectedOptions(id)
{ {
openerSelectBox = document.getElementById(id); for(i=0; i<document.matrixform.participants.options.length;i++)
if (openerSelectBox == null)
window.close();
for (i=0; i < openerSelectBox.length; i++)
{ {
if (openerSelectBox.options[i].selected) if(document.matrixform.participants.options[i].selected==true)
{ {
openerSelectBox.removeChild(openerSelectBox[i]); document.matrixform.participants.options[i]=null;
//openerSelectBox.options[i--] = null i--;
} }
} }
} }
function selectAll(id) function selectAll(id)
{ {
for(i=0; i<document.matrixform.participants.options.length;i++)
{
document.matrixform.participants.options[i].selected = true ;
}
/*
openerSelectBox = document.getElementById(id); openerSelectBox = document.getElementById(id);
if (openerSelectBox == null) if (openerSelectBox == null)
@ -28,7 +30,7 @@ function selectAll(id)
for (i=0; i < openerSelectBox.length; i++) for (i=0; i < openerSelectBox.length; i++)
openerSelectBox.options[i].selected = 1 ; openerSelectBox.options[i].selected = 1 ;
*/
document.matrixform.submit(); document.matrixform.submit();
} }

View File

@ -1,8 +1,7 @@
<!-- $Id$ --> <!-- $Id$ -->
<!-- BEGIN view_event --> <!-- BEGIN view_event -->
<center> <table id="calendar_view_event" border="0" width="98%" align="center">
<table id="calendar_view_event" border="0" width="90%">
{row} {row}
<tr> <tr>
<td> <td>
@ -28,13 +27,12 @@
</td> </td>
</tr> </tr>
</table> </table>
</center>
<!-- END view_event --> <!-- END view_event -->
<!-- BEGIN list --> <!-- BEGIN list -->
<tr bgcolor="{tr_color}"> <tr bgcolor="{tr_color}">
<td valign="top" width="30%">&nbsp;<b>{field}:</b></td> <td valign="top" width="30%" align="right">&nbsp;<b>{field}&nbsp;:&nbsp;</b></td>
<td colspan="2" valign="top" width="70%">{data}</td> <td colspan="2" valign="top" width="70%" align="left">{data}</td>
</tr> </tr>
<!-- END list --> <!-- END list -->

View File

@ -308,11 +308,14 @@
// If the application has a header include, we now include it // If the application has a header include, we now include it
if(!@$GLOBALS['phpgw_info']['flags']['noappheader'] && @isset($_GET['menuaction'])) if(!@$GLOBALS['phpgw_info']['flags']['noappheader'] && @isset($_GET['menuaction']))
{ {
list($app,$class,$method) = explode('.',$_GET['menuaction']); list($app,$class,$method) = explode('.',$_GET['menuaction']);
if(is_array($GLOBALS[$class]->public_functions) && $GLOBALS[$class]->public_functions['header']) if(is_array($GLOBALS[$class]->public_functions) && $GLOBALS[$class]->public_functions['header'])
{ {
$GLOBALS[$class]->header(); $GLOBALS[$class]->header();
} }
} }
$GLOBALS['phpgw']->hooks->process('after_navbar'); $GLOBALS['phpgw']->hooks->process('after_navbar');
return; return;
@ -328,6 +331,7 @@
foreach($file as $text => $url) foreach($file as $text => $url)
{ {
if ($text != 'Export' && $text != 'Import' )
sidebox_menu_item($url,$text); sidebox_menu_item($url,$text);
} }
@ -335,6 +339,7 @@
} }
} }
function sidebox_menu_item($item_link='',$item_text='') function sidebox_menu_item($item_link='',$item_text='')
{ {
if($item_text === '_NewLine_' || $item_link === '_NewLine_') if($item_text === '_NewLine_' || $item_link === '_NewLine_')

View File

@ -1,5 +1,4 @@
<!-- $Id$ --> <!-- $Id$ -->
<script LANGUAGE="JavaScript"> <script LANGUAGE="JavaScript">
window.focus(); window.focus();
@ -37,19 +36,20 @@
} }
} }
function removeSelectedOptions(id) function removeSelectedOptions()
{ {
openerSelectBox = opener.document.getElementById(id); for(i=0; i<document.uiaccountsel.participants.options.length;i++)
if (openerSelectBox == null) window.close(); {
selectBox = document.getElementById('uiaccountsel_popup_selection'); if(document.uiaccountsel.participants.options[i].selected==true)
for (i=0; i < selectBox.length; i++) { {
if (selectBox.options[i].selected) { for (j = 0 ; j < opener.document.{FormName}.{SelectName}.options.length ; j++)
for (j=0; j < openerSelectBox.length; j++) { {
if (openerSelectBox[j].value == selectBox.options[i].value) { if (opener.document.{FormName}.{SelectName}.options[j].value == document.uiaccountsel.participants.options[i].value)
openerSelectBox.removeChild(openerSelectBox[j]); opener.document.{FormName}.{SelectName}.options[j]=null;
} }
}
selectBox.options[i--] = null; document.uiaccountsel.participants.options[i]=null;
i--;
} }
} }
} }
@ -169,21 +169,19 @@
<td valign="top"> <td valign="top">
<table border="0" width="100%" cellpadding="2" cellspacing="2"> <table border="0" width="100%" cellpadding="2" cellspacing="2">
<tr class="th"> <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>
<tr class="th"> <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_lastname}</td>
<td align="center">{sort_firstname}</td>
<td width="10%">&nbsp;</td> <td width="10%">&nbsp;</td>
</tr> </tr>
<!-- BEGIN accounts_list --> <!-- BEGIN accounts_list -->
<tr class="{tr_color}"> <tr class="{tr_color}">
<td>{lid}</td> <td>{bold}{lastname}</td>
<td>{firstname}</td> <td>{bold}{firstname}</td>
<td>{lastname}</td>
<td align="center"> <td align="center">
<input type="image" src="{img}" onclick="{onclick}; return false;" title="{lang_select_user}"> <input type="image" src="{img}" onclick="{onclick}; return false;" title="{lang_select_user}">
</td> </td>
@ -198,11 +196,13 @@
<tr class="th"> <tr class="th">
<td align="center" colspan="2"><b>{lang_selection}</b> {remove}</td> <td align="center" colspan="2"><b>{lang_selection}</b> {remove}</td>
</tr> </tr>
<form name="uiaccountsel">
<tr class="row_off"> <tr class="row_off">
<td align="center"> <td align="center">
{selection} {selection}
</td> </td>
</tr> </tr>
</form>
<tr> <tr>
<td align="center" colspan="2"> <td align="center" colspan="2">
<input type="button" name="close" value="{lang_close}" onClick="{close_action}"> <input type="button" name="close" value="{lang_close}" onClick="{close_action}">

View File

@ -4,47 +4,50 @@
<br> <br>
<center> <center>
{message}<br> {message}<br>
<table border="0" width="80%" cellspacing="2" cellpadding="2">
<form name="edit_cat" action="{actionurl}" method="POST"> <form name="edit_cat" action="{actionurl}" method="POST">
<table border="0" width="98%" cellspacing="2" cellpadding="2">
<tr class="th"> <tr class="th">
<td colspan="2">{lang_parent}</td> <td colspan="2" align="right">{lang_parent}&nbsp;:&nbsp;</td>
<td><select name="new_parent"><option value="">{lang_none}</option>{category_list}</select></td> <td align="left"><select name="new_parent"><option value="">{lang_none}</option>{category_list}</select></td>
</tr> </tr>
<tr class="row_on"> <tr class="row_on">
<td colspan="2">{lang_name}</font></td> <td colspan="2" align="right">{lang_name}&nbsp;:&nbsp;</font></td>
<td><input name="cat_name" size="50" value="{cat_name}"></td> <td align="left"><input name="cat_name" size="50" value="{cat_name}"></td>
</tr> </tr>
<tr class="row_off"> <tr class="row_off">
<td colspan="2">{lang_descr}</td> <td colspan="2" align="right">{lang_descr}&nbsp;:&nbsp;</td>
<td colspan="2"><textarea name="cat_description" rows="4" cols="50" wrap="virtual">{cat_description}</textarea></td> <td colspan="2" align="left"><textarea name="cat_description" rows="4" cols="50" wrap="virtual">{cat_description}</textarea></td>
</tr> </tr>
<tr class="row_on"> <tr class="row_on">
<td colspan="2">{lang_access}</td> <td colspan="2" align="right">{lang_access}&nbsp;:&nbsp;</td>
<td colspan="2">{access}</td> <td colspan="2" align="left">{access}</td>
</tr> </tr>
<tr class="row_off"> <tr class="row_off">
<td colspan="2">{lang_color}</td> <td colspan="2" align="right">{lang_color}&nbsp;:&nbsp;</td>
<td colspan="2">{color}</td> <td colspan="2" align="left">{color}</td>
</tr> </tr>
<tr class="row_on"> <tr class="row_on">
<td colspan="2">{lang_icon}</td> <td colspan="2" align="right">{lang_icon}&nbsp;:&nbsp;</td>
<td colspan="2">{select_icon} {icon}</td> <td colspan="2" align="left">{select_icon} {icon}</td>
</tr> </tr>
<!-- BEGIN data_row --> <!-- BEGIN data_row -->
<tr class="{class}"> <tr class="{class}">
<td colspan="2">{lang_data}</td> <td colspan="2" align="right">{lang_data}&nbsp;:&nbsp;</td>
<td>{td_data}</td> <td align="left">{td_data}</td>
</tr> </tr>
<!-- END data_row --> <!-- END data_row -->
<!-- BEGIN add --> <!-- BEGIN add -->
<tr valign="bottom" height="50"> <tr valign="bottom" height="50">
<td><input type="submit" name="save" value="{lang_save}"></form></td> <td><input type="submit" name="save" value="{lang_save}"></td>
<td><form method="POST" action="{cancel_url}"> <td></td>
<input type="submit" name="cancel" value="{lang_cancel}"></form></td>
</tr> </tr>
</table> </table>
</form>
</center> </center>
<!-- END add --> <!-- END add -->
@ -54,13 +57,13 @@
<tr valign="bottom" height="50"> <tr valign="bottom" height="50">
<td> <td>
{hidden_vars} {hidden_vars}
<input type="submit" name="save" value="{lang_save}"></form></td> <input type="submit" name="save" value="{lang_save}"></td>
<td> <td>
<form method="POST" action="{cancel_url}"> <input type="button" name="cancel" onClick="javascript:history.back()" value="{lang_cancel}"></td>
<input type="submit" name="cancel" value="{lang_cancel}"></form></td> <td>&nbsp;</td>
<td align="right">{delete}</td>
</tr> </tr>
</table> </table>
</form>
</center> </center>
<!-- END edit --> <!-- END edit -->

View File

@ -1,9 +1,9 @@
<!-- $Id$ --> <!-- $Id$ -->
<br>
<center> <center>
<table border="0" cellspacing="2" cellpadding="2" width="80%"> <table border="0" cellspacing="2" cellpadding="2" width="100%">
<tr> <tr>
<td colspan="3" align=left> <td colspan="8" align="left">
<table border="0" width="100%"> <table border="0" width="100%">
<tr> <tr>
{left} {left}
@ -13,32 +13,33 @@
</table> </table>
</td> </td>
</tr> </tr>
<!-- BEGIN search -->
<tr> <tr>
<td>&nbsp;</td> <td colspan="8" align="right">
<td colspan="3" align=right> <form method="post" action="{action_nurl}">
<form method="post" action="{actionurl}"> <input type="text" name="query">&nbsp;<input type="submit" name="search" value="{lang_search}"></form></td>
<input type="text" name="query">&nbsp;<input type="submit" name="search" value="{lang_search}">
</form></td>
</tr> </tr>
</table> <!-- END search -->
<table border="0" cellspacing="2" cellpadding="2" width="80%">
<tr class="th"> <tr class="th">
<td>{sort_name}</td>
<td>{sort_description}</td> <td width="20%">{sort_name}</td>
<td width="6%">{lang_global}</td>
<td width="32%">{sort_description}</td>
{sort_data} {sort_data}
<td align="center">{lang_app}</td> <td width="8%">{lang_color}</td>
<td align=center>{lang_sub}</td> <td width="14%" align="center">{lang_sub}</td>
<td align=center>{lang_edit}</td> <td width="8%" align="center">{lang_edit}</td>
<td align=center>{lang_delete}</td> <td width="8%" align="center">{lang_delete}</td>
</tr> </tr>
<!-- BEGIN cat_list --> <!-- BEGIN cat_list -->
<tr bgcolor="{tr_color}" {color}> <tr bgcolor="{tr_color}" {color}>
<td>{name}</td> <td>{name}</td>
<td>{lang_global_entry}</td>
<td>{descr}</td> <td>{descr}</td>
{td_data} {td_data}
<td align="center"><a href="{app_url}">{lang_app}</a></td> <td bgcolor="{td_color}"></td>
<td align="center"><a href="{add_sub}">{lang_sub_entry}</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="{edit}">{lang_edit_entry}</a></td>
<td align="center"><a href="{delete}">{lang_delete_entry}</a></td> <td align="center"><a href="{delete}">{lang_delete_entry}</a></td>
@ -46,25 +47,22 @@
<!-- END cat_list --> <!-- END cat_list -->
<!-- BEGIN add -->
</table>
<table border="0" cellspacing="2" cellpadding="2" width="80%">
<tr valign="bottom" height="50"> <tr valign="bottom" height="50">
<!-- BEGIN add -->
<td> <td>
<form method="POST" action="{add_action}"> <form method="POST" action="{add_action}">
<input type="submit" value="{lang_add}"> <input type="submit" value="{lang_add}">
</form> </form>
</td> </td>
<td> <td>
<form method="POST" action="{doneurl}"> <form method="POST" action="{doneurl}">
<input type="submit" name="done" value="{lang_cancel}"> <input type="submit" name="done" value="{lang_cancel}">
</form> </form>
</td> </td>
<td width="80%">&nbsp;</td> <td width="80%">&nbsp;</td>
<!-- END add -->
</tr> </tr>
</table> </table>
<!-- END add -->
</center> </center>