mirror of
https://github.com/ZoneMinder/zoneminder.git
synced 2026-03-28 02:33:42 -04:00
Merge pull request #4201 from IgorA100/patch-34260
When panning, it is now possible to "grab" the image in the space between the top buttons
This commit is contained in:
@@ -1142,9 +1142,9 @@ html::-webkit-scrollbar-thumb, div::-webkit-scrollbar-thumb, nav::-webkit-scroll
|
||||
|
||||
/* +++ Control button block in the Stream image*/
|
||||
.block-button-center {
|
||||
position: absolute;
|
||||
left: 35%;
|
||||
right: 35%;
|
||||
display: inline-block;
|
||||
position: relative;
|
||||
margin: 0 20%;
|
||||
top: 2px;
|
||||
z-index: 10;
|
||||
}
|
||||
|
||||
@@ -113,11 +113,17 @@ height: 100%;
|
||||
}
|
||||
|
||||
#videoFeed {
|
||||
display: inline-block;
|
||||
/*display: inline-block;*/
|
||||
display: inline-grid;
|
||||
position: relative;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
#videoFeed .button_zoom,
|
||||
[id^="videoFeedStream"] {
|
||||
grid-area: 1/1;
|
||||
}
|
||||
|
||||
#monitorStatus {
|
||||
width: 100%;
|
||||
margin-top: 3px;
|
||||
|
||||
@@ -34,6 +34,12 @@
|
||||
.monitorStream {
|
||||
position: relative;
|
||||
#overflow: auto;
|
||||
display: grid;
|
||||
}
|
||||
|
||||
.monitorStream .button_zoom,
|
||||
.monitorStream .zoompan {
|
||||
grid-area: 1/1;
|
||||
}
|
||||
|
||||
.monitorStream, .monitor {
|
||||
|
||||
@@ -60,6 +60,12 @@
|
||||
.monitorStream {
|
||||
text-align: center;
|
||||
margin: 0 auto;
|
||||
display: grid;
|
||||
}
|
||||
|
||||
.monitorStream .button_zoom,
|
||||
.monitorStream .zoompan {
|
||||
grid-area: 1/1;
|
||||
}
|
||||
|
||||
#monitorStatus {
|
||||
|
||||
@@ -1706,12 +1706,14 @@ function initPage() {
|
||||
function() {
|
||||
//const id = stringToNumber(this.id); //Montage & Watch page
|
||||
const id = eventData.MonitorId; // Event page
|
||||
$j('#button_zoom' + id).stop(true, true).slideDown('fast');
|
||||
//$j('#button_zoom' + id).stop(true, true).slideDown('fast');
|
||||
$j('#button_zoom' + id).removeClass('hidden');
|
||||
},
|
||||
function() {
|
||||
//const id = stringToNumber(this.id); //Montage & Watch page
|
||||
const id = eventData.MonitorId; // Event page
|
||||
$j('#button_zoom' + id).stop(true, true).slideUp('fast');
|
||||
//$j('#button_zoom' + id).stop(true, true).slideUp('fast');
|
||||
$j('#button_zoom' + id).addClass('hidden');
|
||||
}
|
||||
);
|
||||
|
||||
|
||||
@@ -842,12 +842,14 @@ function streamPrepareStart(monitor=null) {
|
||||
function handleMouseEnter(event) {
|
||||
//Displaying "Scale" and other buttons at the top of the monitor image
|
||||
const id = stringToNumber(this.id);
|
||||
$j('#button_zoom' + id).stop(true, true).slideDown('fast');
|
||||
//$j('#button_zoom' + id).stop(true, true).slideDown('fast');
|
||||
$j('#button_zoom' + id).removeClass('hidden');
|
||||
}
|
||||
|
||||
function handleMouseLeave(event) {
|
||||
const id = stringToNumber(this.id);
|
||||
$j('#button_zoom' + id).stop(true, true).slideUp('fast');
|
||||
//$j('#button_zoom' + id).stop(true, true).slideUp('fast');
|
||||
$j('#button_zoom' + id).addClass('hidden');
|
||||
}
|
||||
|
||||
function streamStart(monitor = null) {
|
||||
|
||||
Reference in New Issue
Block a user