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

Add header to watch

This commit is contained in:
digital-gnome 2017-12-01 11:29:30 -05:00
parent 11629076f6
commit 66d6e1a4a4
4 changed files with 28 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
web/skins/classic/css/classic/views/watch.css
View File

@ -1,37 +1,17 @@
@import url(../control.css); @import url(../control.css);
#menuBar { #header {
margin: 6px auto 4px; display: flex;
text-align: center; justify-content: space-between;
} }
#menuBar #monitorName { #menuControls {
float: left; display: flex;
align-items: center;
} }
#menuBar #closeControl { #menuControls div {
float: right; margin: 0 0 0 1em;
}
#menuBar #menuControls {
margin: 0 auto;
width: 60%;
}
#menuBar #menuControls #controlControl {
float: left;
}
#menuBar #menuControls #eventsControl {
float: left;
}
#menuBar #menuControls #settingsControl {
float: right;
}
#menuBar #menuControls #scaleControl {
margin: 0 auto;
} }
#imageFeed{ #imageFeed{

36
web/skins/classic/css/dark/views/watch.css
View File

@ -1,37 +1,17 @@
@import url(../control.css); @import url(../control.css);
#menuBar { #header {
margin: 6px auto 4px; display: flex;
text-align: center; justify-content: space-between;
} }
#menuBar #monitorName { #menuControls {
float: left; display: flex;
align-items: center;
} }
#menuBar #closeControl { #menuControls div {
float: right; margin: 0 0 0 1em;
}
#menuBar #menuControls {
margin: 0 auto;
width: 60%;
}
#menuBar #menuControls #controlControl {
float: left;
}
#menuBar #menuControls #eventsControl {
float: left;
}
#menuBar #menuControls #settingsControl {
float: right;
}
#menuBar #menuControls #scaleControl {
margin: 0 auto;
} }
#imageFeed{ #imageFeed{

36
web/skins/classic/css/flat/views/watch.css
View File

@ -1,37 +1,17 @@
@import url(../control.css); @import url(../control.css);
#menuBar { #header {
margin: 6px auto 4px; display: flex;
text-align: center; justify-content: space-between;
} }
#menuBar #monitorName { #menuControls {
float: left; display: flex;
align-items: center;
} }
#menuBar #closeControl { #menuControls div {
float: right; margin: 0 0 0 1em;
}
#menuBar #menuControls {
margin: 0 auto;
width: 60%;
}
#menuBar #menuControls #controlControl {
float: left;
}
#menuBar #menuControls #eventsControl {
float: left;
}
#menuBar #menuControls #settingsControl {
float: right;
}
#menuBar #menuControls #scaleControl {
margin: 0 auto;
} }
#imageFeed{ #imageFeed{

8
web/skins/classic/views/watch.php
View File

@ -62,10 +62,8 @@ xhtmlHeaders( __FILE__, $monitor->Name()." - ".translate('Feed') );
<body> <body>
<div id="page"> <div id="page">
<?php echo getNavBarHTML() ?> <?php echo getNavBarHTML() ?>
<div id="content"> <div id="header">
<div id="menuBar">
<div id="monitorName"><?php echo $monitor->Name() ?></div> <div id="monitorName"><?php echo $monitor->Name() ?></div>
<div id="closeControl"><a href="#" onclick="window.history.back()"><?php echo translate('Back') ?></a></div>
<div id="menuControls"> <div id="menuControls">
<?php <?php
if ( canView( 'Control' ) && $monitor->Type() == 'Local' ) { if ( canView( 'Control' ) && $monitor->Type() == 'Local' ) {
@ -76,7 +74,9 @@ if ( canView( 'Control' ) && $monitor->Type() == 'Local' ) {
?> ?>
<div id="scaleControl"><?php echo translate('Scale') ?>: <?php echo buildSelect( "scale", $scales, "changeScale( this );" ); ?></div> <div id="scaleControl"><?php echo translate('Scale') ?>: <?php echo buildSelect( "scale", $scales, "changeScale( this );" ); ?></div>
</div> </div>
</div> <div id="closeControl"><a href="#" onclick="window.history.back()"><?php echo translate('Back') ?></a></div>
</div>
<div id="content">
<div id="imageFeed"><?php echo getStreamHTML( $monitor, array('scale'=>$scale) ); ?></div> <div id="imageFeed"><?php echo getStreamHTML( $monitor, array('scale'=>$scale) ); ?></div>
<div id="monitorStatus"> <div id="monitorStatus">
<?php if ( canEdit( 'Monitors' ) ) { ?> <?php if ( canEdit( 'Monitors' ) ) { ?>