From cf5473836e7a503463f59649c5921a5ddc25f43f Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 2 Oct 2015 10:04:56 -0400 Subject: [PATCH 1/2] set default border on live streams so that when they alarm they don't jump around --- web/skins/classic/css/classic/views/montage.css | 4 ++++ web/skins/classic/css/dark/views/montage.css | 4 ++++ web/skins/classic/css/flat/views/montage.css | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/web/skins/classic/css/classic/views/montage.css b/web/skins/classic/css/classic/views/montage.css index 1afd402a7..f37156633 100644 --- a/web/skins/classic/css/classic/views/montage.css +++ b/web/skins/classic/css/classic/views/montage.css @@ -23,6 +23,10 @@ vertical-align: middle; } +#monitors .imageFeed img { + border: 2px solid #ffffff; +} + #monitors .imageFeed img.idle { border: 2px solid #ffffff; } diff --git a/web/skins/classic/css/dark/views/montage.css b/web/skins/classic/css/dark/views/montage.css index 2ab11e409..9eba3c569 100644 --- a/web/skins/classic/css/dark/views/montage.css +++ b/web/skins/classic/css/dark/views/montage.css @@ -23,6 +23,10 @@ vertical-align: middle; } +#monitors .imageFeed img { + border: 2px solid #999999; +} + #monitors .imageFeed img.idle { border: 2px solid #999999; } diff --git a/web/skins/classic/css/flat/views/montage.css b/web/skins/classic/css/flat/views/montage.css index 1afd402a7..f37156633 100644 --- a/web/skins/classic/css/flat/views/montage.css +++ b/web/skins/classic/css/flat/views/montage.css @@ -23,6 +23,10 @@ vertical-align: middle; } +#monitors .imageFeed img { + border: 2px solid #ffffff; +} + #monitors .imageFeed img.idle { border: 2px solid #ffffff; } From fc6a6aeaa3ae9b6b3ccc424410ef8a777c321d32 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 2 Oct 2015 11:27:35 -0400 Subject: [PATCH 2/2] Don't install zm.conf if it already exists --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index aa052ccc8..ca5cf8e05 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -704,7 +704,9 @@ else(zmconfgen_result EQUAL 0) endif(zmconfgen_result EQUAL 0) # Install zm.conf +if(NOT EXISTS "${ZM_CONFIG_DIR}/zm.conf") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm.conf" DESTINATION "${ZM_CONFIG_DIR}") +endif(NOT EXISTS "${ZM_CONFIG_DIR}/zm.conf") # Uninstall target configure_file(