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

Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas

This commit is contained in:
Isaac Connor 2017-07-12 12:52:24 -04:00
parent 220588a1c9 22e957ba46
commit 84863afb6b
5 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
web/skins/classic/includes/functions.php
View File

@ -211,10 +211,10 @@ function getNavBarHTML() {
<li><?php if ( logToDatabase() > Logger::NOLOG ) { ?> <?php echo makePopupLink( '?view=log', 'zmLog', 'log', '<span class="'.logState().'">'.translate('Log').'</span>' ) ?><?php } ?></li>
<?php } ?>
<?php if ( ZM_OPT_X10 && canView( 'Devices' ) ) { ?>
<li><a href="/?view=devices">Devices</a></li>
<li><a href="?view=devices">Devices</a></li>
<?php } ?>
<li><?php echo makePopupLink( '?view=groups', 'zmGroups', 'groups', sprintf( $CLANG['MonitorCount'], count($displayMonitors), zmVlang( $VLANG['Monitor'], count($displayMonitors) ) ).($group?' ('.$group['Name'].')':''), canView( 'Groups' ) ); ?></li>
<li><a href="/?view=filter">Filters</a></li>
<li><a href="?view=filter">Filters</a></li>
<?php
$cycleGroup = isset($_COOKIE['zmGroup'])?$_COOKIE['zmGroup']:0;
@ -285,4 +285,16 @@ function getNavBarHTML() {
<?php
return( ob_get_clean() );
} // end function getNavBarHTML()
function xhtmlFooter() {
global $skin;
if ( canEdit('System') ) {
include("skins/$skin/views/state.php");
?>
<?php
}
?>
</body></html>
<?php
} // end xhtmlFooter
?>

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

@ -290,11 +290,5 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
</tfoot>
</table>
</div>
</form>
<?php
if ( canEdit('System') ) {
include("skins/$skin/views/state.php");
}
?>
</body>
</html>
</form>
<?php xhtmlFooter() ?>

3
web/skins/classic/views/filter.php
View File

@ -405,5 +405,4 @@ if ( canEdit( 'Events' ) ) {
</form>
</div>
</div>
</body>
</html>
<?php xhtmlFooter() ?>

2
web/skins/classic/views/js/montage.js
View File

@ -130,7 +130,7 @@ function selectLayout( element ) {
} else if ( streamImg.nodeName == 'APPLET' || streamImg.nodeName == 'OBJECT' ) {
// APPLET's and OBJECTS need to be re-initialized
}
streamImg.style.width = '';
streamImg.style.width = '100%';
}
var zonesSVG = $('zones'+monitor.id);
if ( zonesSVG ) {

3
web/skins/classic/views/state.php
View File

@ -40,7 +40,8 @@ if ( !canEdit( 'System' ) ) {
<label for="runState" class="col-sm-3 control-label">Change State</label>
<div class="col-sm-9">
<select id="runState" name="runState" class="form-control">
<?php if ( daemonCheck() ) { ?>
<?php
if ( $running ) { ?>
<option value="stop" selected="selected"><?php echo translate('Stop') ?></option>
<option value="restart"><?php echo translate('Restart') ?></option>
<?php } else { ?>