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

Bug 210 - Rationalised groups view. 

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1609 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
stan 2005-11-21 15:30:07 +00:00
parent 76252c4831
commit 5e58bfa8c4
3 changed files with 41 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
web/zm_actions.php
View File

@ -1257,9 +1257,9 @@ if ( isset($action) )
{ {
if ( $action == "group" ) if ( $action == "group" )
{ {
if ( count($mark_gids) ) if ( !empty($gid) )
{ {
setcookie( "cgroup", $mark_gids[0], time()+3600*24*30*12*10 ); setcookie( "cgroup", $gid, time()+3600*24*30*12*10 );
} }
else else
{ {
@ -1526,17 +1526,14 @@ if ( isset($action) )
userLogout(); userLogout();
} }
} }
if ( $mark_gids ) if ( !empty($gid) )
{ {
foreach( $mark_gids as $mark_gid ) simpleQuery( "delete from Groups where Id = '$gid'" );
if ( $gid == $cgroup )
{ {
simpleQuery( "delete from Groups where Id = '$mark_gid'" ); unset( $cgroup );
if ( $mark_gid == $cgroup ) setcookie( "cgroup", "", time()-3600*24*2 );
{ $refresh_parent = true;
unset( $cgroup );
setcookie( "cgroup", "", time()-3600*24*2 );
$refresh_parent = true;
}
} }
} }
} }

73
web/zm_html_view_groups.php
View File

@ -28,8 +28,14 @@ $result = mysql_query( "select * from Groups order by Id" );
if ( !$result ) if ( !$result )
die( mysql_error() ); die( mysql_error() );
$groups = array(); $groups = array();
$selected = false;
while ( $row = mysql_fetch_assoc( $result ) ) while ( $row = mysql_fetch_assoc( $result ) )
{ {
if ( $row['Id'] == $cgroup )
{
$row['selected'] = true;
$selected = true;
}
$groups[] = $row; $groups[] = $row;
} }
?> ?>
@ -47,40 +53,29 @@ function validateForm( form )
{ {
return( true ); return( true );
} }
function configureButtons(form,name) function configureButtons(element)
{ {
var count = 0; var form = element.form;
for (var i = 0; i < form.elements.length; i++) if ( element.checked )
{ {
if ( form.elements[i].name.indexOf(name) == 0) form.delete_btn.disabled = (element.value == 0);
{
if ( form.elements[i].checked )
{
count++;
}
}
} }
form.select_btn.disabled = (count != 1);
form.new_btn.disabled = (count > 0);
form.delete_btn.disabled = (count < 1);
} }
function monitorIds() function monitorIds()
{ {
with ( opener.document.monitor_form ) var form = opener.document.monitor_form;
var monitor_ids = new Array();
for ( var i = 0; i < form.elements.length; i++ )
{ {
var monitor_ids = new Array(); if ( form.elements[i].name.indexOf('mark_mids') == 0)
for (var i = 0; i < elements.length; i++)
{ {
if ( elements[i].name.indexOf('mark_mids') == 0) if ( form.elements[i].checked )
{ {
if ( elements[i].checked ) monitor_ids[monitor_ids.length] = form.elements[i].value;
{
monitor_ids[monitor_ids.length] = elements[i].value;
}
} }
} }
return( monitor_ids.join( ',' ) );
} }
return( monitor_ids.join( ',' ) );
} }
window.focus(); window.focus();
</script> </script>
@ -89,8 +84,13 @@ window.focus();
<form name="group_form" method="get" action="<?= $PHP_SELF ?>"> <form name="group_form" method="get" action="<?= $PHP_SELF ?>">
<input type="hidden" name="view" value="none"> <input type="hidden" name="view" value="none">
<input type="hidden" name="action" value="groups"> <input type="hidden" name="action" value="groups">
<table width="100%" border="0" cellpadding="0" cellspacing="0"> <table width="100%" border="0" cellpadding="0" cellspacing="4">
<tr><td class="smallhead"><?= $zmSlangName ?></td><td class="smallhead"><?= $zmSlangMonitorIds ?></td><td class="smallhead"><?= $zmSlangMark ?></tr> <tr><td class="smallhead"><?= $zmSlangName ?></td><td class="smallhead"><?= $zmSlangMonitorIds ?></td><td class="smallhead"><?= $zmSlangSelect ?></tr>
<tr>
<td align="left" class="text"><input class="form" value="<?= $zmSlangNoGroup ?>" size="20" disabled></td>
<td align="left" class="text"><input class="form" value="<?= $zmSlangAll ?>" size="40" disabled></td>
<td align="center"><input class="form-noborder" type="radio" name="gid" value="0"<?= !$selected?" checked":"" ?> onClick="configureButtons( this );"></td>
</tr>
<?php <?php
if ( count($groups) || $new ) if ( count($groups) || $new )
{ {
@ -98,9 +98,9 @@ if ( count($groups) || $new )
{ {
?> ?>
<tr> <tr>
<td align="left" class="text"><input class="form" name="names[<?= $group['Id'] ?>]" value="<?= $group['Name'] ?>" size="16"></td> <td align="left" class="text"><input class="form" name="names[<?= $group['Id'] ?>]" value="<?= $group['Name'] ?>" size="20"></td>
<td align="left" class="text"><input class="form" name="monitor_ids[<?= $group['Id'] ?>]" value="<?= $group['MonitorIds'] ?>" size="24"></td> <td align="left" class="text"><input class="form" name="monitor_ids[<?= $group['Id'] ?>]" value="<?= $group['MonitorIds'] ?>" size="40"></td>
<td align="center"><input class="form-noborder" type="checkbox" name="mark_gids[]" value="<?= $group['Id'] ?>" onClick="configureButtons( document.group_form, 'mark_gids' );"></td> <td align="center"><input class="form-noborder" type="radio" name="gid" value="<?= $group['Id'] ?>"<?= $group['selected']?" checked":"" ?> onClick="configureButtons( this );"></td>
</tr> </tr>
<?php <?php
} }
@ -108,31 +108,22 @@ if ( count($groups) || $new )
{ {
?> ?>
<tr> <tr>
<td align="left" class="text"><input class="form" name="new_name" value="<?= $zmSlangNewGroup ?>" size="16"></td> <td align="left" class="text"><input class="form" name="new_name" value="<?= $zmSlangNewGroup ?>" size="20"></td>
<td align="left" class="text"><input class="form" name="new_monitor_ids" value="<?= $monitor_ids ?>" size="24"></td> <td align="left" class="text"><input class="form" name="new_monitor_ids" value="<?= $monitor_ids ?>" size="40"></td>
<td align="center" class="text"><input type="checkbox" disabled></td> <td align="center"><input class="form-noborder" type="radio" name="gid" value="<?= $group['Id'] ?>" onClick="configureButtons( this );"></td>
</tr> </tr>
<?php <?php
} }
} }
else
{
?>
<tr><td colspan="3" class="text" align="center">&nbsp;</td></tr>
<tr><td colspan="3" class="text" align="center"><?= $zmSlangNoGroups ?></td></tr>
<tr><td colspan="3" class="text" align="center">&nbsp;</td></tr>
<?php
}
?> ?>
<tr> <tr>
<td align="right" colspan="3" class="text">&nbsp;</td> <td align="right" colspan="3" class="text">&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td align="right" colspan="3" class="text"> <td align="right" colspan="3" class="text">
<input type="button" name="select_btn" value="<?= $zmSlangSelect ?>" class="form" onClick="group_form.action.value='group'; group_form.submit();" disabled>&nbsp;&nbsp; <input type="button" name="select_btn" value="<?= $zmSlangApply ?>" class="form" onClick="group_form.action.value='group'; group_form.submit();">&nbsp;&nbsp;
<input type="button" name="none_btn" value="<?= $zmSlangNone ?>" class="form" onClick="group_form.action.value='group'; group_form.submit();">&nbsp;&nbsp;
<input type="button" name="new_btn" value="<?= $zmSlangNew ?>" class="form" onClick="window.location='<?= $PHP_SELF ?>?view=<?= $view ?>&monitor_ids='+monitorIds()+'&new=1'">&nbsp;&nbsp; <input type="button" name="new_btn" value="<?= $zmSlangNew ?>" class="form" onClick="window.location='<?= $PHP_SELF ?>?view=<?= $view ?>&monitor_ids='+monitorIds()+'&new=1'">&nbsp;&nbsp;
<input type="button" name="delete_btn" value="<?= $zmSlangDelete ?>" class="form" onClick="group_form.action.value='<?= $view ?>'; group_form.action.value='delete'; group_form.submit();" disabled>&nbsp;&nbsp; <input type="button" name="delete_btn" value="<?= $zmSlangDelete ?>" class="form" onClick="group_form.action.value='<?= $view ?>'; group_form.action.value='delete'; group_form.submit();"<?= $selected?"":" disabled" ?>>&nbsp;&nbsp;
<input type="button" value="<?= $zmSlangSave ?>" class="form" onClick="group_form.submit()">&nbsp;&nbsp; <input type="button" value="<?= $zmSlangSave ?>" class="form" onClick="group_form.submit()">&nbsp;&nbsp;
<input type="button" value="<?= $zmSlangCancel ?>" class="form" onClick="closeWindow();"></td> <input type="button" value="<?= $zmSlangCancel ?>" class="form" onClick="closeWindow();"></td>
</tr> </tr>

2
web/zm_lang_en_gb.php
View File

@ -396,7 +396,7 @@ $zmSlangNewState = 'New State';
$zmSlangNewUser = 'New User'; $zmSlangNewUser = 'New User';
$zmSlangNext = 'Next'; $zmSlangNext = 'Next';
$zmSlangNoFramesRecorded = 'There are no frames recorded for this event'; $zmSlangNoFramesRecorded = 'There are no frames recorded for this event';
$zmSlangNoGroups = 'No groups have been defined'; $zmSlangNoGroup = 'No Group';
$zmSlangNoneAvailable = 'None available'; $zmSlangNoneAvailable = 'None available';
$zmSlangNone = 'None'; $zmSlangNone = 'None';
$zmSlangNo = 'No'; $zmSlangNo = 'No';