Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp =================================================================== diff -u -r27569 -r27589 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp (.../tousseImage.jsp) (revision 27569) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/tousseImage.jsp (.../tousseImage.jsp) (revision 27589) @@ -279,10 +279,21 @@ } var bodyHeight = $('body').height(); + + if(window.screen.height - bodyHeight > 100){ + $(".toussePage").show(); + $('#imageAndMaterialID').height((bodyHeight-50)+'px'); + $('#materialDIV').height((bodyHeight-93)+'px'); + $('#tousseOrMaterialImage').height((bodyHeight-43-150)+'px'); + $('#ImageID').height((bodyHeight-43-150)+'px'); + }else { + $(".toussePage").show(); + $('#imageAndMaterialID').height((bodyHeight-50)+'px'); + $('#materialDIV').height((bodyHeight-93-97)+'px'); + $('#tousseOrMaterialImage').height((bodyHeight-93-150-57)+'px'); + $('#ImageID').height((bodyHeight-93-150-57)+'px'); + } - $(".toussePage").show(); - $('#imageAndMaterialID').height((bodyHeight-50)+'px'); - if(sstsConfig.toussePicturesShow && showToussePictures){ $(".instruction-book,.packing-teach,.tousse-video,.checkbox-materialTd").show(); @@ -393,10 +404,10 @@
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r27569 -r27589 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 27569) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 27589) @@ -2058,13 +2058,13 @@ }); var windowScreenH = window.screen.height; if(windowScreenH == 1080){ - $(".mfp-iframe-scaler iframe").css({"top":"5%","height":"100%"}); + $(".mfp-iframe-scaler iframe").css({"top":"10px","height":"100%"}); $(".mfp-iframe-holder .mfp-close").css({"top":"12px"}); }else if(windowScreenH == 1050){ - $(".mfp-iframe-scaler iframe").css({"top":"5%","height":"100%"}); + $(".mfp-iframe-scaler iframe").css({"top":"10px","height":"100%"}); $(".mfp-iframe-holder .mfp-close").css({"top":"0px"}); }else{ - $(".mfp-iframe-scaler iframe").css({"top":"1%","height":"100%"}); + $(".mfp-iframe-scaler iframe").css({"top":"10px","height":"100%"}); } // error:function(XMLHttpRequest, textStatus, errorThrown){ // } Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp =================================================================== diff -u -r27569 -r27589 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 27569) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 27589) @@ -53,6 +53,9 @@