ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enabled alternate selections when a filter has been chosen. Improved 

styles for debug entries in log.


git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3462 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2011-06-23 21:53:45 +00:00
parent 8082f491db
commit 1ce54fb0db
5 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/ajax/log.php
View File

@ -64,12 +64,13 @@ switch ( $_REQUEST['task'] )
$options = array();
$where = array();
foreach( $filter as $field=>$value )
$where[] = "$field = '".dbEscape($value)."'";
$where[$field] = "$field = '".dbEscape($value)."'";
foreach( $filterFields as $field )
{
$sql = "select distinct $field from Logs where not isnull($field)";
if ( count($where) )
$sql.= " and ".join( " and ", $where );
$fieldWhere = array_diff_key( $where, array( $field=>true ) );
if ( count($fieldWhere) )
$sql.= " and ".join( " and ", $fieldWhere );
$sql.= " order by $field asc";
if ( $field == 'Level' )
{
@ -220,7 +221,7 @@ th, td {
tr.log-fat td {
background-color:#ffcccc;
font-weight: bold;
font-style: italics;
font-style: italic;
}
tr.log-err td {
background-color:#ffcccc;
@ -229,7 +230,8 @@ tr.log-war td {
background-color: #ffe4b5;
}
tr.log-dbg td {
font-style: italics;
color: #666666;
font-style: italic;
}
</style>
</head>

2
web/skins/classic/css/skin.css
View File

@ -313,6 +313,7 @@ div.clear {
clear: both;
}
/*
.table-th-sort {
font-style:italic;
}
@ -320,6 +321,7 @@ div.clear {
td.table-td-sort {
font-style:italic;
}
*/
th.table-th-sort {
margin-right: 12px;

4
web/skins/classic/views/css/log.css
View File

@ -19,7 +19,6 @@
tr.log-fat td {
background-color:#ffcccc;
font-weight: bold;
font-style: italics;
}
tr.log-err td {
@ -31,7 +30,8 @@ tr.log-war td {
}
tr.log-dbg td {
font-style: italics;
color: #666666;
font-style: italic;
}
#exportLog label {

2
web/skins/classic/views/js/log.js
View File

@ -261,7 +261,7 @@ function initPage()
displayLimit = initialDisplayLimit;
for ( var i = 1; i <= 9; i++ )
logCodes[''+i] = 'DB'+i;
logTable = new HtmlTable( $('contentTable'),
logTable = new HtmlTable( $('logTable'),
{
zebra: true,
sortable: true,

4
web/skins/classic/views/log.php
View File

@ -60,9 +60,9 @@ xhtmlHeaders(__FILE__, $SLANG['SystemLog'] );
Line <select id="filter[Line]" onchange="filterLog(this)"><option value="">----</option></select>
<input type="reset" value="<?= $SLANG['Reset'] ?>" onclick="resetLog()"/>
</div>
<form name="contentForm" method="post" action="<?= $_SERVER['PHP_SELF'] ?>">
<form name="logForm" method="post" action="<?= $_SERVER['PHP_SELF'] ?>">
<input type="hidden" name="view" value="<?= $view ?>"/>
<table id="contentTable" class="major" cellspacing="0">
<table id="logTable" class="major" cellspacing="0">
<thead>
<tr>
<th><?= $SLANG['DateTime'] ?></th>