diff --git a/configure.ac b/configure.ac index 545106a7d..103b81833 100644 --- a/configure.ac +++ b/configure.ac @@ -443,10 +443,10 @@ if test "$prefix" != "NONE"; then PERL_SITE_LIB=`perl -V:installsitelib | sed -e "s/.*='\(.*\)';/\1/"` PERL_LIB_PATH=`echo $PERL_SITE_LIB | sed -e "s|^$PERL_SITE_PREFIX||"` EXTRA_PERL_LIB="use lib '$prefix$PERL_LIB_PATH'; # Include custom perl install path" - PERL_MM_PARMS="PREFIX=$prefix" + PERL_MM_PARMS="\"PREFIX=$prefix INSTALLDIRS=vendor\"" else EXTRA_PERL_LIB="# Include from system perl paths only" - PERL_MM_PARMS= + PERL_MM_PARMS="\"INSTALLDIRS=vendor\"" fi AC_SUBST(PERL_MM_PARMS) AC_SUBST(EXTRA_PERL_LIB) diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in index 54bd14e26..15c9e287f 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in +++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in @@ -92,6 +92,22 @@ our %types = our @options = ( + { + name => "ZM_SKIN_DEFAULT", + default => "classic", + description => "Default skin used by web interface", + help => "ZoneMinder allows the use of many different web interfaces. This option allows you to set the default skin used by the website. Users can change their skin later, this merely sets the default.", + type => $types{string}, + category => "system", + }, + { + name => "ZM_CSS_DEFAULT", + default => "classic", + description => "Default set of css files used by web interface", + help => "ZoneMinder allows the use of many different web interfaces, and some skins allow the use of different set of CSS files to control the appearance. This option allows you to set the default set of css files used by the website. Users can change their css later, this merely sets the default.", + type => $types{string}, + category => "system", + }, { name => "ZM_LANG_DEFAULT", default => "en_gb", diff --git a/web/index.php b/web/index.php index 8f79ce6c0..e4c00e2c7 100644 --- a/web/index.php +++ b/web/index.php @@ -60,6 +60,8 @@ if ( isset($_GET['skin']) ) $skin = $_GET['skin']; elseif ( isset($_COOKIE['zmSkin']) ) $skin = $_COOKIE['zmSkin']; +elseif ( ZM_SKIN_DEFAULT ) + $skin = ZM_SKIN_DEFAULT; else $skin = "classic"; @@ -67,6 +69,8 @@ if ( isset($_GET['css']) ) $css = $_GET['css']; elseif ( isset($_COOKIE['zmCSS']) ) $css = $_COOKIE['zmCSS']; +elseif (ZM_CSS_DEFAULT) + $css = ZM_CSS_DEFAULT; else $css = "classic"; diff --git a/web/skins/classic/views/options.php b/web/skins/classic/views/options.php index a2182f7c0..9f8ef86e9 100644 --- a/web/skins/classic/views/options.php +++ b/web/skins/classic/views/options.php @@ -81,6 +81,7 @@ foreach ( $tabs as $name=>$value )
window.opener.location.reload();window.location.href=\"{$_SERVER['PHP_SELF']}?view={$view}&tab={$tab}\""; @@ -110,8 +112,7 @@ if($tab == 'skins') { '.$dir.''; } ?> @@ -208,12 +208,12 @@ elseif ( $tab == "users" )