Layout changes.

CHANGELOG.md

@@ -2,10 +2,11 @@
 
 The following is a history of the changes made to this project.
 
-## v2.7.0 *(prerelease)*
+## v2.6.2 *(prerelease)*
 
 * Option to install dump1090-fa removed on Ubuntu 17.10 or higher due to cx_freez issue.
 * Fixed so Ubunbtu 17.10 and higher properly installs PHP 7.1 and its related packages.
+* Install the package php7.1-xml if using Ubuntu 17.10 or newer.
 * ADS-B Exchange run script now uses socat instead of netcat to send data.
 * Removed Mapzen support from the scripts due to the service shutting down.
 * Now uses socat instead of netcat to feed ADS-B Exchange.

bash/portal/install.sh

@@ -286,7 +286,7 @@ if [[ "${ADVANCED}" = "true" ]] ; then
             ;;
     esac
 else
-    if [ $DISTRO_PHP_VERSION == "7.0" ]; then
+    if [ ! $DISTRO_PHP_VERSION == "5" ]; then
         CheckPackage php${DISTRO_PHP_VERSION}-xml
     fi
 fi
@@ -313,6 +313,11 @@ if [[ "${RECEIVER_PORTAL_INSTALLED}" = "true" ]] && [[ "${ADVANCED}" = "false" ]
     sudo mv ${LIGHTTPD_DOCUMENT_ROOT}/data/settings.xml ${LIGHTTPD_DOCUMENT_ROOT}/data/settings.backup.xml
 fi
 
+if [ -f ${LIGHTTPD_DOCUMENT_ROOT}/index.lighttpd.html ]; then
+    echo -e "\e[94m  Removing default Lighttpd index file from document root...\e[97m"
+    sudo rm ${LIGHTTPD_DOCUMENT_ROOT}/index.lighttpd.html
+fi
+
 echo -e "\e[94m  Placing portal files in Lighttpd's root directory...\e[97m"
 sudo cp -R ${PORTAL_BUILD_DIRECTORY}/html/* ${LIGHTTPD_DOCUMENT_ROOT}
 

build/portal/html/admin/index.php

@@ -420,6 +420,7 @@
                                     <input type="checkbox" name="hideNavbarAndFooter" value="TRUE"<?php ($hideNavbarAndFooter == 1 ? print ' checked' : ''); ?>> Enable navigation and footer auto hiding.
                                 </label>
                             </div>
+                            <br />
                             <div class="checkbox">
                                 <label>
                                     <input type="checkbox" name="enableFlights" value="TRUE"<?php ($enableFlights == 1 ? print ' checked' : ''); ?><?php ($settings::db_driver == "xml" ? print ' disabled' : ''); ?>> Enable flights link.