diff --git a/.github/workflows/build-native-packages-aarch64.yml b/.github/workflows/build-deb-packages-aarch64.yml similarity index 99% rename from .github/workflows/build-native-packages-aarch64.yml rename to .github/workflows/build-deb-packages-aarch64.yml index ea316714b..a778d44e7 100644 --- a/.github/workflows/build-native-packages-aarch64.yml +++ b/.github/workflows/build-deb-packages-aarch64.yml @@ -1,4 +1,4 @@ -name: build-native-packages-signed-aarch64 +name: build-deb-packages-aarch64 on: push: diff --git a/.github/workflows/build-native-packages.yml b/.github/workflows/build-deb-packages.yml similarity index 99% rename from .github/workflows/build-native-packages.yml rename to .github/workflows/build-deb-packages.yml index 4ebf5d4fa..72fdc0472 100644 --- a/.github/workflows/build-native-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -1,4 +1,4 @@ -name: build-native-packages-signed +name: build-deb-packages on: push: diff --git a/.github/workflows/ci-bookworm.yml b/.github/workflows/ci-bookworm.yml deleted file mode 100644 index 9357abb03..000000000 --- a/.github/workflows/ci-bookworm.yml +++ /dev/null @@ -1,58 +0,0 @@ -name: CI Debian Bookworm - -on: - push: - branches: - - '*' - pull_request: - branches: [ master ] - -permissions: - contents: read - -jobs: - build: - defaults: - run: - shell: bash - strategy: - matrix: - crypto_backend: [ gnutls, openssl ] - jwt_backend: [ libjwt, jwt_cpp ] - include: - - crypto_backend: gnutls - crypto_package: libgnutls28-dev - jwt_package: libjwt-gnutls-dev - - crypto_backend: openssl - crypto_package: libssl-dev - jwt_package: libjwt-dev - exclude: - - crypto_backend: gnutls - jwt_backend: jwt_cpp - runs-on: ubuntu-latest - container: debian:bookworm - - steps: - - name: Update packages - run: apt-get -qq update && apt-get -qq upgrade - - name: Install git - run: apt-get -qq install git - - uses: actions/checkout@v6 - with: - submodules: recursive - - name: Install dependencies - run: > - apt-get -qq install make cmake g++ - default-libmysqlclient-dev - libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev libavdevice-dev - libcurl4-gnutls-dev libvlc-dev libvncserver-dev - libdate-manip-perl libdbd-mysql-perl libsys-mmap-perl libwww-perl - libpolkit-gobject-1-dev - nlohmann-json3-dev - ${{ matrix.crypto_package }} ${{ matrix.jwt_package }} - - name: Prepare - run: mkdir build - - name: Configure - run: cd build && cmake --version && cmake .. -DBUILD_MAN=0 -DENABLE_WERROR=1 -DZM_CRYPTO_BACKEND=${{ matrix.crypto_backend }} -DZM_JWT_BACKEND=${{ matrix.jwt_backend }} - - name: Build - run: cd build && make -j3 | grep --line-buffered -Ev '^(cp lib\/|Installing.+\.pm)' && (exit ${PIPESTATUS[0]}) diff --git a/.github/workflows/ci-bullseye.yml b/.github/workflows/ci-bullseye.yml deleted file mode 100644 index 50201453a..000000000 --- a/.github/workflows/ci-bullseye.yml +++ /dev/null @@ -1,61 +0,0 @@ -name: CI Debian Bullseye - -on: - push: - branches: - - '*' - pull_request: - branches: [ master ] - -permissions: - contents: read - -jobs: - build: - defaults: - run: - shell: bash - strategy: - matrix: - crypto_backend: [ gnutls, openssl ] - jwt_backend: [ libjwt, jwt_cpp ] - include: - - crypto_backend: gnutls - crypto_package: libgnutls28-dev - jwt_package: libjwt-gnutls-dev - - crypto_backend: openssl - crypto_package: libssl-dev - jwt_package: libjwt-dev - exclude: - - crypto_backend: gnutls - jwt_backend: jwt_cpp - runs-on: ubuntu-latest - container: debian:bullseye - - steps: - - name: Update packages - run: apt-get -qq update && apt-get -qq upgrade - - name: Install git - run: apt-get -qq install git - - uses: actions/checkout@v6 - with: - submodules: recursive - - name: Install dependencies - run: > - apt-get -qq install make cmake g++ - default-libmysqlclient-dev - libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev libavdevice-dev - libcurl4-gnutls-dev libvlc-dev libvncserver-dev - libdate-manip-perl libdbd-mysql-perl libsys-mmap-perl libwww-perl - libpolkit-gobject-1-dev - nlohmann-json3-dev - catch2 - ${{ matrix.crypto_package }} ${{ matrix.jwt_package }} - - name: Prepare - run: mkdir build - - name: Configure - run: cd build && cmake --version && cmake .. -DBUILD_MAN=0 -DBUILD_TEST_SUITE=0 -DENABLE_WERROR=1 -DZM_CRYPTO_BACKEND=${{ matrix.crypto_backend }} -DZM_JWT_BACKEND=${{ matrix.jwt_backend }} - - name: Build - run: cd build && make -j3 | grep --line-buffered -Ev '^(cp lib\/|Installing.+\.pm)' && (exit ${PIPESTATUS[0]}) - #- name: Run tests - #run: cd build/tests && ./tests "~[notCI]" diff --git a/.github/workflows/ci-centos-8.yml b/.github/workflows/ci-centos-8.yml deleted file mode 100644 index d0bbe68aa..000000000 --- a/.github/workflows/ci-centos-8.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: CI CentOS 8 - -on: - push: - branches: - - '*' - pull_request: - branches: [ master ] - -permissions: - contents: read - -jobs: - build: - strategy: - matrix: - crypto_backend: [ gnutls, openssl ] - jwt_backend: [ libjwt, jwt_cpp ] - exclude: - - crypto_backend: gnutls - jwt_backend: jwt_cpp - - crypto_backend: gnutls - jwt_backend: libjwt - runs-on: ubuntu-latest - container: rockylinux:8 - - steps: - - name: Enable RPMFusion, EPEL and PowerTools - run: yum -y install "dnf-command(config-manager)" https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-8.noarch.rpm https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && yum config-manager --set-enabled powertools - - name: Install git - run: yum -y install git - - uses: actions/checkout@v6 - with: - submodules: recursive - - name: Install dependencies - run: yum -y update && yum -y install make cmake gcc-c++ catch-devel mariadb-devel ffmpeg-devel libcurl-devel vlc-devel libvncserver-devel libjpeg-turbo-devel "perl(Date::Manip)" "perl(DBD::mysql)" "perl(ExtUtils::MakeMaker)" "perl(Sys::Mmap)" "perl(Sys::Syslog)" "perl(LWP::UserAgent)" polkit-devel libjwt-devel - - name: Prepare - run: mkdir build - - name: Configure - run: cd build && cmake --version && cmake .. -DBUILD_MAN=0 -DBUILD_TEST_SUITE=0 -DENABLE_WERROR=1 -DZM_CRYPTO_BACKEND=${{ matrix.crypto_backend }} -DZM_JWT_BACKEND=${{ matrix.jwt_backend }} - - name: Build - run: cd build && make -j3 | grep --line-buffered -Ev '^(cp lib\/|Installing.+\.pm)' && (exit ${PIPESTATUS[0]}) - #- name: Run tests - #run: cd build/tests && ./tests "~[notCI]" diff --git a/.github/workflows/ci-focal.yml b/.github/workflows/ci-focal.yml deleted file mode 100644 index 0e3fe0205..000000000 --- a/.github/workflows/ci-focal.yml +++ /dev/null @@ -1,54 +0,0 @@ -name: CI Ubuntu Focal (20.04) - -on: - push: - branches: - - '*' - pull_request: - branches: [ master ] - -permissions: - contents: read - -jobs: - build: - defaults: - run: - shell: bash - strategy: - matrix: - crypto_backend: [ openssl ] - jwt_backend: [ libjwt, jwt_cpp ] - include: - - crypto_backend: openssl - crypto_package: libssl-dev - jwt_package: libjwt-dev - runs-on: ubuntu-latest - container: ubuntu:focal - - steps: - - name: Update packages - run: apt-get -qq update && apt-get -qq upgrade && apt-get -qq install software-properties-common - - name: Install git - run: | - apt-get -qq update - apt-get -qq install git - - uses: actions/checkout@v6 - with: - submodules: recursive - - name: Install dependencies - run: > - apt-get -qq install make cmake g++ - default-libmysqlclient-dev - libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev libavdevice-dev - libcurl4-gnutls-dev libvlc-dev libvncserver-dev - libdate-manip-perl libdbd-mysql-perl libsys-mmap-perl libwww-perl - libpolkit-gobject-1-dev - nlohmann-json3-dev - ${{ matrix.crypto_package }} ${{ matrix.jwt_package }} - - name: Prepare - run: mkdir build - - name: Configure - run: cd build && cmake --version && cmake .. -DBUILD_MAN=0 -DENABLE_WERROR=1 -DZM_CRYPTO_BACKEND=${{ matrix.crypto_backend }} -DZM_JWT_BACKEND=${{ matrix.jwt_backend }} - - name: Build - run: cd build && make -j3 | grep --line-buffered -Ev '^(cp lib\/|Installing.+\.pm)' && (exit ${PIPESTATUS[0]}) diff --git a/.github/workflows/create-packages.yml b/.github/workflows/create-packages.yml deleted file mode 100644 index b6696f9c0..000000000 --- a/.github/workflows/create-packages.yml +++ /dev/null @@ -1,72 +0,0 @@ -name: Create packages - -on: - push: - branches: [ master ] - -permissions: - contents: read # to fetch code (actions/checkout) - -jobs: - package: - if: github.repository == 'ZoneMinder/zoneminder' - strategy: - matrix: - os_dist: - - os: debian - dist: bullseye - arch: x86_64 - - os: ubuntu - dist: focal - arch: x86_64 - - os: ubuntu - dist: jammy - arch: x86_64 - - os: ubuntu - dist: noble - arch: x86_64 - - os: debian - dist: bookworm - arch: x86_64 - - os: debian - dist: bullseye - arch: aarch64 - - os: ubuntu - dist: focal - arch: aarch64 - - os: ubuntu - dist: jammy - arch: aarch64 - - os: debian - dist: bookworm - arch: aarch64 - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v6 - with: - fetch-depth: '0' - submodules: recursive - - if: matrix.os_dist.arch == 'aarch64' - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - with: - platforms: arm64 - - name: Run packpack - env: - SMPFLAGS: -j4 - OS: ${{ matrix.os_dist.os }} - DIST: ${{ matrix.os_dist.dist }} - ARCH: ${{ matrix.os_dist.arch }} - DOCKER_REPO: packpack/packpack - run: utils/packpack/startpackpack.sh - - - name: Publish - uses: easingthemes/ssh-deploy@main - env: - SSH_PRIVATE_KEY: ${{ secrets.ZMREPO_SSH_KEY }} - ARGS: "-rltgoDzvO" - SOURCE: build/ - REMOTE_HOST: ${{ secrets.ZMREPO_HOST }} - REMOTE_USER: ${{ secrets.ZMREPO_SSH_USER }} - TARGET: debian/master/mini-dinstall/incoming/ diff --git a/.github/workflows/release-packages.yml b/.github/workflows/release-packages.yml deleted file mode 100644 index ec6656ade..000000000 --- a/.github/workflows/release-packages.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: Create Debian Release Packages - -on: - release: - types: [ published ] - -permissions: - contents: read # to fetch code (actions/checkout) - -jobs: - package: - strategy: - matrix: - os_dist: - - os: debian - dist: bullseye - - os: debian - dist: bookworm - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v6 - with: - fetch-depth: '0' - submodules: recursive - - name: Run packpack - env: - SMPFLAGS: -j4 - OS: ${{ matrix.os_dist.os }} - DIST: ${{ matrix.os_dist.dist }} - DOCKER_REPO: iconzm/packpack - run: utils/packpack/startpackpack.sh - - - name: Publish - uses: easingthemes/ssh-deploy@main - env: - SSH_PRIVATE_KEY: ${{ secrets.ZMREPO_SSH_KEY }} - ARGS: "-rltgoDzvO" - SOURCE: build/ - REMOTE_HOST: ${{ secrets.ZMREPO_HOST }} - REMOTE_USER: ${{ secrets.ZMREPO_SSH_USER }} - TARGET: debian/release-1.36/mini-dinstall/incoming/ diff --git a/web/skins/classic/views/montage.php b/web/skins/classic/views/montage.php index 27a01dc6b..6bc130cfc 100644 --- a/web/skins/classic/views/montage.php +++ b/web/skins/classic/views/montage.php @@ -58,7 +58,7 @@ $monitorStatusPosition = array( 'showOnHover' => translate('Show on hover'), ); -$monitorStatusPositionSelected = 'outsideImgBottom'; +$monitorStatusPositionSelected = ZM_WEB_COMPACT_MONTAGE ? 'hidden' : 'outsideImgBottom'; if (isset($_REQUEST['monitorStatusPositionSelected'])) { $monitorStatusPositionSelected = $_REQUEST['monitorStatusPositionSelected']; } else if (isset($_COOKIE['zmMonitorStatusPositionSelected'])) { @@ -355,7 +355,7 @@ foreach ($monitors as $monitor) { $monitor->Name() ); } else { - $monitor_options['state'] = !ZM_WEB_COMPACT_MONTAGE; + $monitor_options['state'] = true; $monitor_options['zones'] = $showZones; # If we start up in a streaming mode, even paused, the content-type=mixed etc makes Chrome queue the requests for 15s. We are stuck with just getting a single image to start, then switching to streaming in js. $monitor_options['mode'] = 'single';