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

Merge branch 'storageareas_dragndrop' into storageareas

This commit is contained in:
Isaac Connor 2017-01-24 09:35:14 -05:00
parent 046e04e8df 129acb5b8e
commit fe3328a87a
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web/skins/classic/views/console.php
View File

@ -152,7 +152,9 @@ for ( $i = 0; $i < count($eventCounts); $i++ )
} }
?> ?>
<th class="colZones"><?php echo translate('Zones') ?></th> <th class="colZones"><?php echo translate('Zones') ?></th>
<?php if ( canEdit( 'Monitors' ) ) { ?>
<th class="colMark"><?php echo translate('Mark') ?></th> <th class="colMark"><?php echo translate('Mark') ?></th>
<?php } ?>
</tr> </tr>
</thead> </thead>
<tfoot> <tfoot>
@ -175,7 +177,9 @@ for ( $i = 0; $i < count($eventCounts); $i++ )
} }
?> ?>
<td class="colZones"><?php echo $zoneCount ?></td> <td class="colZones"><?php echo $zoneCount ?></td>
<?php if ( canEdit( 'Monitors' ) ) { ?>
<td> </td> <td> </td>
<?php } ?>
</tr> </tr>
</tfoot> </tfoot>
<tbody id="consoleTableBody"> <tbody id="consoleTableBody">
@ -236,24 +240,22 @@ echo $Server->Name();
<td class="colSource">&nbsp;</td> <td class="colSource">&nbsp;</td>
<?php } ?> <?php } ?>
<?php if ( $show_storage_areas ) { ?> <?php if ( $show_storage_areas ) { ?>
<td class="colStorage"><?php <td class="colStorage"><?php $Storage = new Storage( $monitor['StorageId'] ); echo $Storage->Name(); ?></td>
$Storage = new Storage( $monitor['StorageId'] );
echo $Storage->Name();
?></td>
<?php } ?> <?php } ?>
<?php <?php
for ( $i = 0; $i < count($eventCounts); $i++ ) for ( $i = 0; $i < count($eventCounts); $i++ ) {
{
?> ?>
<td class="colEvents"><?php echo makePopupLink( '?view='.$eventsView.'&amp;page=1'.$monitor['eventCounts'][$i]['filter']['query'], $eventsWindow, $eventsView, $monitor['EventCount'.$i], canView( 'Events' ) ) ?></td> <td class="colEvents"><?php echo makePopupLink( '?view='.$eventsView.'&amp;page=1'.$monitor['eventCounts'][$i]['filter']['query'], $eventsWindow, $eventsView, $monitor['EventCount'.$i], canView( 'Events' ) ) ?></td>
<?php <?php
} }
?> ?>
<td class="colZones"><?php echo makePopupLink( '?view=zones&amp;mid='.$monitor['Id'], 'zmZones', array( 'zones', $monitor['Width'], $monitor['Height'] ), $monitor['ZoneCount'], $running && canView( 'Monitors' ) ) ?></td> <td class="colZones"><?php echo makePopupLink( '?view=zones&amp;mid='.$monitor['Id'], 'zmZones', array( 'zones', $monitor['Width'], $monitor['Height'] ), $monitor['ZoneCount'], $running && canView( 'Monitors' ) ) ?></td>
<?php if ( canEdit( 'Monitors' ) ) { ?>
<td class="colMark"> <td class="colMark">
<input type="checkbox" name="markMids[]" value="<?php echo $monitor['Id'] ?>" onclick="setButtonStates( this )"<?php if ( !canEdit( 'Monitors' ) ) { ?> disabled="disabled"<?php } ?>/> <input type="checkbox" name="markMids[]" value="<?php echo $monitor['Id'] ?>" onclick="setButtonStates( this )"<?php if ( !canEdit( 'Monitors' ) ) { ?> disabled="disabled"<?php } ?>/>
<span class="glyphicon glyphicon-sort"></span> <span class="glyphicon glyphicon-sort"></span>
</td> </td>
<?php } ?>
</tr> </tr>
<?php <?php
} # end for eacho monitor } # end for eacho monitor