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

Merge branch 'no_overwrite_zm_conf' into multi-server

This commit is contained in:
Isaac Connor 2015-10-02 15:34:14 +00:00
parent 6ff4e333b4 fc6a6aeaa3
commit e12640ec73
4 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -704,7 +704,9 @@ else(zmconfgen_result EQUAL 0)
endif(zmconfgen_result EQUAL 0) endif(zmconfgen_result EQUAL 0)
# Install zm.conf # Install zm.conf
if(NOT EXISTS "${ZM_CONFIG_DIR}/zm.conf")
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm.conf" DESTINATION "${ZM_CONFIG_DIR}") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm.conf" DESTINATION "${ZM_CONFIG_DIR}")
endif(NOT EXISTS "${ZM_CONFIG_DIR}/zm.conf")
# Uninstall target # Uninstall target
configure_file( configure_file(

4
web/skins/classic/css/classic/views/montage.css
View File

@ -23,6 +23,10 @@
vertical-align: middle; vertical-align: middle;
} }
#monitors .imageFeed img {
border: 2px solid #ffffff;
}
#monitors .imageFeed img.idle { #monitors .imageFeed img.idle {
border: 2px solid #ffffff; border: 2px solid #ffffff;
} }

4
web/skins/classic/css/dark/views/montage.css
View File

@ -23,6 +23,10 @@
vertical-align: middle; vertical-align: middle;
} }
#monitors .imageFeed img {
border: 2px solid #999999;
}
#monitors .imageFeed img.idle { #monitors .imageFeed img.idle {
border: 2px solid #999999; border: 2px solid #999999;
} }

4
web/skins/classic/css/flat/views/montage.css
View File

@ -23,6 +23,10 @@
vertical-align: middle; vertical-align: middle;
} }
#monitors .imageFeed img {
border: 2px solid #ffffff;
}
#monitors .imageFeed img.idle { #monitors .imageFeed img.idle {
border: 2px solid #ffffff; border: 2px solid #ffffff;
} }