diff --git a/web/ajax/log.php b/web/ajax/log.php index 030fc3cb6..068e9d547 100644 --- a/web/ajax/log.php +++ b/web/ajax/log.php @@ -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; } diff --git a/web/skins/classic/css/skin.css b/web/skins/classic/css/skin.css index e59827fc3..0ef7dd9c7 100644 --- a/web/skins/classic/css/skin.css +++ b/web/skins/classic/css/skin.css @@ -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; diff --git a/web/skins/classic/views/css/log.css b/web/skins/classic/views/css/log.css index 60361339e..38d66665c 100644 --- a/web/skins/classic/views/css/log.css +++ b/web/skins/classic/views/css/log.css @@ -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 { diff --git a/web/skins/classic/views/js/log.js b/web/skins/classic/views/js/log.js index 73f40d661..4c9b38bcf 100644 --- a/web/skins/classic/views/js/log.js +++ b/web/skins/classic/views/js/log.js @@ -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, diff --git a/web/skins/classic/views/log.php b/web/skins/classic/views/log.php index a78750067..860fc0353 100644 --- a/web/skins/classic/views/log.php +++ b/web/skins/classic/views/log.php @@ -60,9 +60,9 @@ xhtmlHeaders(__FILE__, $SLANG['SystemLog'] ); Line -
+ - +