Merge branch 'master' of github.com:ZoneMinder/zoneminder

CMakeLists.txt

@@ -190,7 +190,7 @@ set(ZM_PERL_SEARCH_PATH "" CACHE PATH
 	where ZM_PERL_MM_PARMS has been modified such that ZoneMinder's Perl modules are 
 	installed outside Perl's default search path.")
 set(ZM_TARGET_DISTRO "" CACHE STRING
-  "Build ZoneMinder for a specific distribution.  Currently, valid names are: fc27, fc26, el7, OS13, FreeBSD")
+  "Build ZoneMinder for a specific distribution.  Currently, valid names are: fc, el, OS13, FreeBSD")
 set(ZM_DETECT_SYSTEMD "ON" CACHE BOOL
   "Set to OFF to disable detection of systemd. default: ON")
 set(ZM_SYSTEMD "OFF" CACHE BOOL

distros/redhat/CMakeLists.txt

@@ -73,9 +73,6 @@ install(FILES zoneminder.php-fpm.conf DESTINATION /etc/php-fpm.d PERMISSIONS OWN
 # Symlink the cake php temp folder to the ZoneMinder temp folder
 install(CODE "execute_process(COMMAND ln -sf ../../../../../../var/lib/zoneminder/temp \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/api/app/tmp\")")
 
-# Link to Cambozola
-install(CODE "execute_process(COMMAND ln -sf ../../java/cambozola.jar \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/cambozola.jar\")")
-
 # Install auxiliary files
 install(FILES common/redalert.wav DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/sounds PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 

distros/redhat/zoneminder.spec

@@ -23,19 +23,6 @@
 %global with_php_json 1
 %endif
 
-# el7 uses cmake3 package and macros
-%if 0%{?rhel} == 7
-%global cmake %{cmake3}
-%global cmake_build %{cmake3_build}
-%global cmake_install %{cmake3_install}
-%global cmake_pkg_name cmake3
-%else
-%global cmake_pkg_name cmake
-%endif
-
-# The default for everything but el7 these days
-%global _hardened_build 1
-
 Name: zoneminder
 Version: 1.37.30
 Release: 1%{?dist}
@@ -62,7 +49,7 @@ BuildRequires: systemd-devel
 BuildRequires: mariadb-devel
 BuildRequires: perl-podlators
 BuildRequires: polkit-devel
-BuildRequires: %{cmake_pkg_name}
+BuildRequires: cmake
 BuildRequires: gnutls-devel
 BuildRequires: bzip2-devel
 BuildRequires: pcre-devel 

web/api/app/Plugin/Crud

@@ -1 +1 @@
-Subproject commit 14292374ccf1328f2d5db20897bd06f99ba4d938
+Subproject commit 0bd63fb464957080ead342db58ca9e01532cf1ef

web/skins/classic/includes/functions.php

@@ -195,17 +195,13 @@ function getNavBarHTML() {
 // The legacy navigation bar that collapses into a pulldown menu on small screens.
 //
 function getNormalNavBarHTML($running, $user, $bandwidth_options, $view, $skin) {
-
   $status = runtimeStatus($running);
-
 ?>
 <div class="container-fluid" id="navbar-container">
   <nav class="navbar navbar-expand-md justify-content-center flex-row" id="navbar-one">
-
     <div class="navbar-brand justify-content-start align-self-start">
       <?php echo getNavBrandHTML() ?>
     </div>
-
     <!-- the Navigation Bar Hamburger Button   -->
 <!--
     <div class="nav justify-content-end flex-grow-1">
@@ -225,7 +221,6 @@ function getNormalNavBarHTML($running, $user, $bandwidth_options, $view, $skin)
 <!--
    </div>
 -->
-
     <div class="collapse navbar-collapse" id="main-header-nav">
 <?php
 
@@ -308,29 +303,22 @@ function getNormalNavBarHTML($running, $user, $bandwidth_options, $view, $skin)
 // A new, slimmer navigation bar, permanently collapsed into a dropdown
 //
 function getCollapsedNavBarHTML($running, $user, $bandwidth_options, $view, $skin) {
-
   $status = runtimeStatus($running);
-
   ?>
-  <div class="fixed-top container-fluid">
+  <div class="container-fluid" id="navbar-container">
     <nav class="navbar px-1 flex-nowrap">
-
       <div class="navbar-brand align-self-start px-0">
         <?php echo getNavBrandHTML() ?>
       </div>
-
       <nav class="navbar navbar-expand-md align-self-start px-0">
 <?php
-
   // *** Build the statistics shown on the navigation bar ***
   if ( (!ZM_OPT_USE_AUTH) or $user ) {
 ?>
         <div id="reload" class="collapse navbar-collapse px-0">
-
           <ul id="Version" class="pr-2 navbar-nav">
             <?php echo getZMVersionHTML() ?>
           </ul>
-
           <ul id="Bandwidth" class="px-2 navbar-nav">
             <?php echo getBandwidthHTML($bandwidth_options, $user) ?>
           </ul>
@@ -392,7 +380,7 @@ function getCollapsedNavBarHTML($running, $user, $bandwidth_options, $view, $ski
 
     </nav><!-- End First Navbar -->
 
-    <nav class="navbar navbar-expand-md justify-content-center">
+    <nav class="navbar navbar-expand-md justify-content-center" id="navbar-three">
       <?php echo getConsoleBannerHTML() ?>
     </nav><!-- End Second Navbar -->
   </div>