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

Bug 207 - Added annotation to show what auto functions filters have. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1626 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2005-11-22 16:32:40 +00:00
parent 5ab3965945
commit 5edb53e2db
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
web/zm_html_view_filter.php
View File

@ -37,8 +37,29 @@ while ( $row = mysql_fetch_assoc( $result ) )
} }
} }
$auto_str = "";
if ( isset($filter_data) ) if ( isset($filter_data) )
{ {
$auto_text = array();
if ( $filter_data['AutoArchive'] )
$auto_text[] = $zmSlangAutoArchiveAbbr;
if ( $filter_data['AutoVideo'] )
$auto_text[] = $zmSlangAutoVideoAbbr;
if ( $filter_data['AutoUpload'] )
$auto_text[] = $zmSlangAutoUploadAbbr;
if ( $filter_data['AutoEmail'] )
$auto_text[] = $zmSlangAutoEmailAbbr;
if ( $filter_data['AutoMessage'] )
$auto_text[] = $zmSlangAutoMessageAbbr;
if ( $filter_data['AutoExecute'] )
$auto_text[] = $zmSlangAutoExecuteAbbr;
if ( $filter_data['AutoDelete'] )
$auto_text[] = $zmSlangAutoDeleteAbbr;
if ( count($auto_text) )
{
$auto_str = '['.join( ',', $auto_text ).']';
}
foreach( split( '&', $filter_data['Query'] ) as $filter_parm ) foreach( split( '&', $filter_data['Query'] ) as $filter_parm )
{ {
list( $key, $value ) = split( '=', $filter_parm, 2 ); list( $key, $value ) = split( '=', $filter_parm, 2 );
@ -247,7 +268,7 @@ window.focus();
<tr> <tr>
<td valign="top"><table border="0" cellspacing="0" cellpadding="0" width="100%"> <td valign="top"><table border="0" cellspacing="0" cellpadding="0" width="100%">
<tr> <tr>
<td align="left" class="text"><?= $zmSlangUseFilter ?>:&nbsp;<?php if ( count($filter_names) > 1 ) { echo buildSelect( $select_name, $filter_names, "submitToFilter( document.filter_form, 1 );" ); } else { ?><select class="form" disabled><option><?= $zmSlangNoSavedFilters ?></option></select><?php } ?></td> <td align="left" class="text"><?= $zmSlangUseFilter ?>:&nbsp;<?php if ( count($filter_names) > 1 ) { echo buildSelect( $select_name, $filter_names, "submitToFilter( document.filter_form, 1 );" ); } else { ?><select class="form" disabled><option><?= $zmSlangNoSavedFilters ?></option></select><?php } ?>&nbsp;&nbsp;<?= $auto_str ?></td>
<?php if ( canEdit( 'Events' ) ) { ?> <?php if ( canEdit( 'Events' ) ) { ?>
<td align="right" class="text"><a href="javascript: saveFilter( document.filter_form );"><?= $zmSlangSave ?></a></td> <td align="right" class="text"><a href="javascript: saveFilter( document.filter_form );"><?= $zmSlangSave ?></a></td>
<?php } else { ?> <?php } else { ?>

7
web/zm_lang_en_gb.php
View File

@ -112,14 +112,21 @@ $zmSlangAttrTime = 'Time';
$zmSlangAttrTotalScore = 'Total Score'; $zmSlangAttrTotalScore = 'Total Score';
$zmSlangAttrWeekday = 'Weekday'; $zmSlangAttrWeekday = 'Weekday';
$zmSlangAutoArchiveEvents = 'Automatically archive all matches'; $zmSlangAutoArchiveEvents = 'Automatically archive all matches';
$zmSlangAutoArchiveAbbr = 'Archive';
$zmSlangAuto = 'Auto'; $zmSlangAuto = 'Auto';
$zmSlangAutoDeleteEvents = 'Automatically delete all matches'; $zmSlangAutoDeleteEvents = 'Automatically delete all matches';
$zmSlangAutoDeleteAbbr = 'Delete';
$zmSlangAutoEmailEvents = 'Automatically email details of all matches'; $zmSlangAutoEmailEvents = 'Automatically email details of all matches';
$zmSlangAutoEmailAbbr = 'Email';
$zmSlangAutoExecuteEvents = 'Automatically execute command on all matches'; $zmSlangAutoExecuteEvents = 'Automatically execute command on all matches';
$zmSlangAutoExecuteAbbr = 'Execute';
$zmSlangAutoMessageEvents = 'Automatically message details of all matches'; $zmSlangAutoMessageEvents = 'Automatically message details of all matches';
$zmSlangAutoMessageAbbr = 'Message';
$zmSlangAutoStopTimeout = 'Auto Stop Timeout'; $zmSlangAutoStopTimeout = 'Auto Stop Timeout';
$zmSlangAutoUploadEvents = 'Automatically upload all matches'; $zmSlangAutoUploadEvents = 'Automatically upload all matches';
$zmSlangAutoUploadAbbr = 'Upload';
$zmSlangAutoVideoEvents = 'Automatically create video for all matches'; $zmSlangAutoVideoEvents = 'Automatically create video for all matches';
$zmSlangAutoVideoAbbr = 'Video';
$zmSlangAvgBrScore = 'Avg.<br/>Score'; $zmSlangAvgBrScore = 'Avg.<br/>Score';
$zmSlangBadNameChars = 'Names may only contain alphanumeric characters plus hyphen and underscore'; $zmSlangBadNameChars = 'Names may only contain alphanumeric characters plus hyphen and underscore';
$zmSlangBandwidth = 'Bandwidth'; $zmSlangBandwidth = 'Bandwidth';