summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2016-03-17 06:41:16 -0500
committerChris Buechler <cmb@pfsense.org>2016-03-17 06:41:16 -0500
commit3e7d2c4f7de14b884d7898daa168aa2d66d7c91c (patch)
tree9f6801ffa6ac0bfa63083005109a27b9eac0bc7b
parent2fdb390396ed76526be4672f3d6870e26997b2de (diff)
parent32b52cce91efde758edc8e6d2ae18d6b41a05185 (diff)
downloadpfsense-3e7d2c4f7de14b884d7898daa168aa2d66d7c91c.zip
pfsense-3e7d2c4f7de14b884d7898daa168aa2d66d7c91c.tar.gz
Merge pull request #2756 from NewEraCracker/css-path-fix
-rw-r--r--src/etc/inc/auth.inc2
-rw-r--r--src/etc/inc/authgui.inc8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/etc/inc/auth.inc b/src/etc/inc/auth.inc
index 95c630b..dc8e437 100644
--- a/src/etc/inc/auth.inc
+++ b/src/etc/inc/auth.inc
@@ -143,7 +143,7 @@ if (function_exists("display_error_form") && !isset($config['system']['webgui'][
<!DOCTYPE html>
<html lang="en">
<head>
- <link rel="stylesheet" href="/bootstrap/css/pfSense.css" />
+ <link rel="stylesheet" href="/css/pfSense.css" />
<title><?=gettext("Redirecting..."); ?></title>
</head>
<body id="error" class="no-menu">
diff --git a/src/etc/inc/authgui.inc b/src/etc/inc/authgui.inc
index 98988ec..e1289ac 100644
--- a/src/etc/inc/authgui.inc
+++ b/src/etc/inc/authgui.inc
@@ -130,11 +130,11 @@ function display_error_form($http_code, $desc) {
return;
}
- $cssfile = "/bootstrap/css/pfSense.css";
+ $cssfile = "/css/pfSense.css";
if (isset($config['system']['webgui']['webguicss'])) {
- if (file_exists("bootstrap/css/" . $config['system']['webgui']['webguicss'])) {
- $cssfile = "/bootstrap/css/" . $config['system']['webgui']['webguicss'];
+ if (file_exists("/usr/local/www/css/" . $config['system']['webgui']['webguicss'])) {
+ $cssfile = "/css/" . $config['system']['webgui']['webguicss'];
}
}
@@ -237,7 +237,7 @@ if ($local_ip == false) {
$cssfile = "/css/pfSense.css";
if (isset($config['system']['webgui']['webguicss'])) {
- if (file_exists("css/" . $config['system']['webgui']['webguicss'])) {
+ if (file_exists("/usr/local/www/css/" . $config['system']['webgui']['webguicss'])) {
$cssfile = "/css/" . $config['system']['webgui']['webguicss'];
}
}
OpenPOWER on IntegriCloud