holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug in error log navigation.

Browse Source 
Fixes for better HTML validation.
Match navigation button layout fixes.
This commit is contained in:
shrykedude 2003-10-22 05:14:56 +00:00
parent 1096987b81
commit 9798ccf162
8 changed files with 49 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
admin/inc/class.html.inc.php
View File

@ -29,9 +29,9 @@
}
else
{
$html .= '<form method="post" action="'
. $GLOBALS['phpgw']->link('/index.php')
. '">' . "\n";
#$html .= '<form method="post" action="'
# . $GLOBALS['phpgw']->link('/index.php')
# . '">' . "\n";
$bo = CreateObject('admin.bolog',True);
if (!isset($start))
{
@ -50,10 +50,10 @@
$hits = $nextmatchs->show_hits($total_records,$start);
$html .= '<table width="98%"><tr>';
$html .= '<td align="left">' . $left . '</td>';
$html .= $left;
$html .= '<td align="right"> ' . $hits . ' </td>';
$html .= '<td align="left"> <a href=' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uilog.list_log&editable=true') .'> ' . lang('Edit Table format') . '</a></td>';
$html .= '<td align="right">' . $right . '</td>';
$html .= $right;
$html .= '</tr></table>';
}
}
@ -120,7 +120,7 @@
while(list($pc,$pcol)=each($printlist))
{
$cname = $pcol['#name'];
$cparms = $this->arr_merge($head[$cname],$pcol,array('bgcolor'=>'FFFFFF'),$rows[$rno][$cname]);
$cparms = $this->arr_merge($head[$cname],$pcol,array('bgcolor'=>'#FFFFFF'),$rows[$rno][$cname]);
$rows[$rno][$cname] = $cparms;
}
}
@ -201,7 +201,7 @@
}
}
$html .= "</table>\n";
$html .= "</form>";
#$html .= "</form>";
return $html;
}
@ -225,14 +225,16 @@
if ($pvalue != 1)
{
$html .= $comma . $pname . '="' . $pvalue . '"';
$comma = ', ';
#$comma = ', ';
$comma = ' ';
};
break;
default:
if (substr($pname,0,1) != '#')
{
$html .= $comma . $pname . '="' . $pvalue . '"';
$comma = ', ';
#$comma = ', ';
$comma = ' ';
}
}
}
@ -310,28 +312,28 @@
// Column Defintions...
$html .= "<h2>Column Definition</h2>";
$html .= "<table width=\"98%\", bgcolor=\"000000\">\n";
$html .= "<table width=\"98%\" bgcolor=\"#000000\">\n";
$f = array();
for ($fno=0;$fno<$noflds;$fno++)
{
$f[]=$fno;
}
// Column Headings
$html .= "\t<tr bgcolor=\"D3DCFF\">\n";
$html .= "\t<tr bgcolor=\"#D3DCFF\">\n";
for ($cno=0;$cno<$nocols;$cno++)
{
$html .= "\t\t<td align=center>$cno</td>\n";
$html .= "\t\t<td align=\"center\">$cno</td>\n";
}
$html .= "\t</tr >\n";
for ($rno=0;$rno<$norows;$rno++)
{
$html .= "\t<tr bgcolor=\"D3DCFF\">\n";
$html .= "\t<tr bgcolor=\"#D3DCFF\">\n";
for ($cno=0;$cno<$nocols;$cno++)
{
$c = $layout[$rno][$cno];
$tname = "layout[$rno][]";
$t = $this->DropDown($f,$tname,$c);
$html .= "\t\t<td align=center>$t</td>\n";
$html .= "\t\t<td align=\"center\">$t</td>\n";
}
$html .= "\t</tr >\n";
}
@ -347,9 +349,9 @@
$html .= "<input type=\"submit\" name=\"submit\" value=\"Update\">";
//Field Definitions
$html .= "<h2>Field Definitions</h2>";
$html .= "<table width=\"98%\", bgcolor=\"D3DCFF\">\n";
$html .= "\t\t<td width=\"2%\", align=\"center\">No</td>\n";
$html .= "\t\t<td width=\"2%\", align=\"center\">Del</td>\n";
$html .= "<table width=\"98%\" bgcolor=\"#D3DCFF\">\n";
$html .= "\t\t<td width=\"2%\" align=\"center\">No</td>\n";
$html .= "\t\t<td width=\"2%\" align=\"center\">Del</td>\n";
$html .= "\t\t<td width=\"5%\">Field</td>\n";
$html .= "\t\t<td>Value</td>\n";
$html .= "\t</tr>\n";
@ -367,11 +369,11 @@
$title = $name;
}
$html .= "\t</tr>\n";
$html .= "\t\t<td bgcolor=\"FFFFFF\">$fno</td>\n";
$html .= "\t\t<td bgcolor=\"FFFFFF\"><input type=\"checkbox\" name=\"_delcol[]\" value=\"$fno\"></td>\n";
$html .= "\t\t<td bgcolor=\"FFFFFF\">".$this->dropdown($cnam,'_cols[]',$name)."</td>\n";
$html .= "\t\t<td bgcolor=\"#FFFFFF\">$fno</td>\n";
$html .= "\t\t<td bgcolor=\"#FFFFFF\"><input type=\"checkbox\" name=\"_delcol[]\" value=\"$fno\"></td>\n";
$html .= "\t\t<td bgcolor=\"#FFFFFF\">".$this->dropdown($cnam,'_cols[]',$name)."</td>\n";
$value = $rows[0][$name]['value'];
$html .= "\t\t<td bgcolor=\"FFFFFF\">$value</td>\n";
$html .= "\t\t<td bgcolor=\"#FFFFFF\">$value</td>\n";
$html .= "\t</tr>\n";
}
$html .= "</table>\n";

5
admin/inc/class.solog.inc.php
View File

@ -77,6 +77,7 @@
function get_error_e($parms)
{
if ( false ) {
/* Fixed From */
if (!isset($parms['from']))
{
@ -87,6 +88,7 @@
$parms['from'][] = 'phpgw_accounts';
}
}
/* Fix Where */
if (!isset($parms['where']))
{
@ -94,9 +96,8 @@
}
else
{
$parms['where'][] = 'phpgw_log.log_id = phpgw_accounts.account_id';
$parms['where'][] = 'phpgw_log.log_user = phpgw_accounts.account_id';
}
/* Fix Default Fields */
if (!isset($parms['fields']))
{

24
admin/inc/class.uilog.inc.php
View File

@ -210,10 +210,10 @@
$header['_cols']= $this->fields_inc;
// Set Table formating parameters
$header['#table_parms']=array('width'=>"98%", 'bgcolor'=>"000000", 'border'=>"0");
$header['#table_parms']=array('width'=>"98%", 'bgcolor'=>"#000000", 'border'=>"0");
// Set Header formating parameters
$header['#head_parms']=array('bgcolor'=>"D3DCFF");
$header['#head_parms']=array('bgcolor'=>"#D3DCFF");
// Column Log_ID
$header['log_id']['#parms_hdr'] = array('align'=>"center");
@ -271,20 +271,20 @@
{
switch($row['log_severity']['value'])
{
case 'D': $row['log_severity']['bgcolor'] = 'D3DCFF'; break;
case 'I': $row['log_severity']['bgcolor'] = 'C0FFC0'; break;
case 'W': $row['log_severity']['bgcolor'] = 'FFFFC0'; break;
case 'E': $row['log_severity']['bgcolor'] = 'FFC0C0'; break;
case 'F': $row['log_severity']['bgcolor'] = 'FF0909'; break;
case 'D': $row['log_severity']['bgcolor'] = '#D3DCFF'; break;
case 'I': $row['log_severity']['bgcolor'] = '#C0FFC0'; break;
case 'W': $row['log_severity']['bgcolor'] = '#FFFFC0'; break;
case 'E': $row['log_severity']['bgcolor'] = '#FFC0C0'; break;
case 'F': $row['log_severity']['bgcolor'] = '#FF0909'; break;
}
switch($row['log_msg_severity']['value'])
{
case 'D': $color = 'D3DCFF'; break;
case 'I': $color = 'C0FFC0'; break;
case 'W': $color = 'FFFFC0'; break;
case 'E': $color = 'FFC0C0'; break;
case 'F': $color = 'FF0909'; break;
case 'D': $color = '#D3DCFF'; break;
case 'I': $color = '#C0FFC0'; break;
case 'W': $color = '#FFFFC0'; break;
case 'E': $color = '#FFC0C0'; break;
case 'F': $color = '#FF0909'; break;
}
reset($this->fields_inc);
while(list($cno,$fld) = each($this->fields_inc))

4
admin/templates/default/accesslog.tpl
View File

@ -18,7 +18,9 @@
<td align="right">
<table border="0">
<tr>
{nextmatchs_left}&nbsp;{nextmatchs_right}
{nextmatchs_left}
<td>&nbsp;</td>
{nextmatchs_right}
</tr>
</table>
</td>

4
admin/templates/default/accounts.tpl
View File

@ -13,9 +13,9 @@
<div align="center">
<table border="0" width="70%">
<tr>
<td align="left">{left_next_matchs}</td>
{left_next_matchs}
<td align="center">{lang_user_accounts}</td>
<td align="right">{right_next_matchs}</td>
{right_next_matchs}
</tr>
</table>
</div>

2
admin/templates/default/applications.tpl
View File

@ -2,7 +2,7 @@
<br>
<div align="center">
<table border="0" width="45%">
<tr bgcolor="{bg_color}">
<tr>
{left}
<td align="center">{lang_showing}</td>
{right}

4
admin/templates/default/currentusers.tpl
View File

@ -1,13 +1,15 @@
<!-- BEGIN list -->
<br>
<table border="0" width="95%" align="center">
<tr bgcolor="{bg_color}">
<tr>
{left_next_matchs}
<td>&nbsp;</td>
<td>&nbsp;</td>
{right_next_matchs}
</tr>
</td>
<table border="0" width="95%" align="center">
<tr bgcolor="{th_bg}">
<td>{sort_loginid}</td>
<td>{sort_ip}</td>

4
admin/templates/default/groups.tpl
View File

@ -2,9 +2,9 @@
<p>
<table border="0" width="45%" align="center">
<tr>
<td align="left">{left_next_matchs}</td>
{left_next_matchs}
<td align="center">{lang_groups}</td>
<td align="right">{right_next_matchs}</td>
{right_next_matchs}
</tr>
</table>