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

docs/installationguide/redhat.rst

@@ -182,7 +182,7 @@ The tarball from the previsouly installed SRPM should be there. This is the name
 
 ::
 
-    git archive --prefix=ZoneMinder-1.28.1/ -o ~/rpmbuld/SOURCES/zoneminder-1.28.1.tar.gz HEAD
+    git archive --prefix=ZoneMinder-1.28.1/ -o ~/rpmbuild/SOURCES/zoneminder-1.28.1.tar.gz HEAD
 
 Note that we are overwriting the original tarball. If you wish to keep the original tarball then create a copy prior to creating the new tarball.
 

web/index.php

@@ -105,6 +105,7 @@ if ( ! in_array( $css, $css_skins ) ) {
 }
 
 define( "ZM_BASE_PATH", dirname( $_SERVER['REQUEST_URI'] ) );
+define( "ZM_SKIN_NAME", $skin );
 define( "ZM_SKIN_PATH", "skins/$skin" );
 
 $skinBase = array(); // To allow for inheritance of skins

web/skins/classic/includes/export_functions.php

@@ -27,7 +27,7 @@ function exportHeader( $title )
   <title><?php echo $title ?></title>
   <style type="text/css">
   <!--
-<?php include( ZM_SKIN_PATH.'/css/export.css' ); ?>
+<?php include( ZM_SKIN_PATH.'/css/'.ZM_SKIN_NAME.'/export.css' ); ?>
 	
 
 ul.tabs {