Bug 207 - Modified table layout on watch status to prevent wrapping.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1605 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
parent
6d7d37d709
commit
212f51d75c
|
@ -114,44 +114,44 @@ if ( !($force || $forced) )
|
||||||
if ( canEdit( 'Monitors' ) && ($disable || $disabled) )
|
if ( canEdit( 'Monitors' ) && ($disable || $disabled) )
|
||||||
{
|
{
|
||||||
?>
|
?>
|
||||||
<td width="20%" align="left" class="text"><a href="<?= $PHP_SELF ?>?view=watchstatus&mid=<?= $mid ?>&last_status=<?= $status ?>&disable=0"><?= $zmSlangEnableAlarms ?></a></td>
|
<td width="25%" align="left" class="text"><a href="<?= $PHP_SELF ?>?view=watchstatus&mid=<?= $mid ?>&last_status=<?= $status ?>&disable=0"><?= $zmSlangEnableAlarms ?></a></td>
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
elseif ( canEdit( 'Monitors' ) && zmaCheck( $mid ) )
|
elseif ( canEdit( 'Monitors' ) && zmaCheck( $mid ) )
|
||||||
{
|
{
|
||||||
?>
|
?>
|
||||||
<td width="20%" align="left" class="text"><a href="<?= $PHP_SELF ?>?view=watchstatus&mid=<?= $mid ?>&last_status=<?= $status ?>&disable=1"><?= $zmSlangDisableAlarms ?></a></td>
|
<td width="25%" align="left" class="text"><a href="<?= $PHP_SELF ?>?view=watchstatus&mid=<?= $mid ?>&last_status=<?= $status ?>&disable=1"><?= $zmSlangDisableAlarms ?></a></td>
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
?>
|
?>
|
||||||
<td width="20%" align="left" class="text"> </td>
|
<td width="25%" align="left" class="text"> </td>
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
<td width="60%" class="<?= $class ?>" align="center" valign="middle"><?= $zmSlangStatus ?>: <?= $status_string ?> - <?= $fps_string ?> fps</td>
|
<td width="50%" class="<?= $class ?>" align="center" valign="middle"><?= $zmSlangStatus ?>: <?= $status_string ?> - <?= $fps_string ?> fps</td>
|
||||||
<?php
|
<?php
|
||||||
if ( !($disable || $disabled) )
|
if ( !($disable || $disabled) )
|
||||||
{
|
{
|
||||||
if ( canEdit( 'Monitors' ) && ($force || $forced) )
|
if ( canEdit( 'Monitors' ) && ($force || $forced) )
|
||||||
{
|
{
|
||||||
?>
|
?>
|
||||||
<td width="20%" align="right" class="text"><a href="<?= $PHP_SELF ?>?view=watchstatus&mid=<?= $mid ?>&last_status=<?= $status ?>&force=0"><?= $zmSlangCancelForcedAlarm ?></a></td>
|
<td width="25%" align="right" class="text"><a href="<?= $PHP_SELF ?>?view=watchstatus&mid=<?= $mid ?>&last_status=<?= $status ?>&force=0"><?= $zmSlangCancelForcedAlarm ?></a></td>
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
elseif ( canEdit( 'Monitors' ) && zmaCheck( $mid ) )
|
elseif ( canEdit( 'Monitors' ) && zmaCheck( $mid ) )
|
||||||
{
|
{
|
||||||
?>
|
?>
|
||||||
<td width="20%" align="right" class="text"><a href="<?= $PHP_SELF ?>?view=watchstatus&mid=<?= $mid ?>&last_status=<?= $status ?>&force=1"><?= $zmSlangForceAlarm ?></a></td>
|
<td width="25%" align="right" class="text"><a href="<?= $PHP_SELF ?>?view=watchstatus&mid=<?= $mid ?>&last_status=<?= $status ?>&force=1"><?= $zmSlangForceAlarm ?></a></td>
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
?>
|
?>
|
||||||
<td width="20%" align="right" class="text"> </td>
|
<td width="25%" align="right" class="text"> </td>
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
|
Loading…
Reference in New Issue