mirror of
https://github.com/pfsense/pfsense.git
synced 2025-10-26 11:38:35 +00:00
Merge branch 'master' of http://gitweb.pfsense.org/pfsense/robiscool-clone into review/master
This commit is contained in:
Scott Ullrich
commit
2fd616d2bb
File diff suppressed because it is too large
Load Diff
@ -1,92 +1,93 @@
|
||||
<?php
|
||||
/*
|
||||
pfSense_MODULE: header
|
||||
*/
|
||||
|
||||
/*
|
||||
* if user has selected a custom template, use it.
|
||||
* otherwise default to pfsense tempalte
|
||||
*/
|
||||
if($config['theme'] <> "")
|
||||
$g['theme'] = $config['theme'];
|
||||
else
|
||||
$g['theme'] = "pfsense";
|
||||
|
||||
/*
|
||||
* If this device is an apple ipod/iphone
|
||||
* switch the theme to one that works with it.
|
||||
*/
|
||||
$apple_ua = array("iPhone","iPod", "iPad");
|
||||
foreach($apple_ua as $useragent)
|
||||
if(strstr($_SERVER['HTTP_USER_AGENT'], $useragent))
|
||||
$g['theme'] = "pfsense";
|
||||
|
||||
$pagetitle = gentitle( $pgtitle );
|
||||
|
||||
?>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
|
||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html>
|
||||
<head>
|
||||
<title><?php echo($config['system']['hostname'] . "." . $config['system']['domain'] . " - " . $pagetitle); ?></title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
|
||||
<link rel="apple-touch-icon" href="/themes/<?php echo $g['theme']; ?>/apple-touch-icon.png"/>
|
||||
<?php if (strpos($_SERVER["SCRIPT_FILENAME"], "wizard.php") !== false &&
|
||||
file_exists("{$g['www_path']}/themes/{$g['theme']}/wizard.css")): ?>
|
||||
<?php echo "<style type=\"text/css\" src=\"/themes/{$g['theme']}/wizard.css\"></style>"; ?>
|
||||
<?php else: ?>
|
||||
<link rel="stylesheet" href="/themes/<?php echo $g['theme']; ?>/all.css" media="all" />
|
||||
<?php endif; ?>
|
||||
<link rel="stylesheet" type="text/css" href="/niftycssCode.css">
|
||||
<link rel="stylesheet" type="text/css" href="/niftycssprintCode.css" media="print">
|
||||
<script type="text/javascript" src="/javascript/niftyjsCode.js"></script>
|
||||
<script type="text/javascript">
|
||||
var theme = "<?php echo $g['theme']; ?>";
|
||||
</script>
|
||||
<?php echo "\t<script type=\"text/javascript\" src=\"/themes/{$g['theme']}/loader.js\"></script>\n"; ?>
|
||||
<?php
|
||||
if($_GET['enablefirebuglite']) {
|
||||
echo "\t<script type=\"text/javascript\" src=\"/javascript/pi.js\"></script>\n";
|
||||
echo "\t<script type=\"text/javascript\" src=\"/javascript/firebug-lite.js\"></script>\n";
|
||||
}
|
||||
echo "\t<script type=\"text/javascript\" src=\"/javascript/scriptaculous/prototype.js\"></script>\n";
|
||||
echo "\t<script type=\"text/javascript\" src=\"/javascript/scriptaculous/scriptaculous.js\"></script>\n";
|
||||
echo "\t<script type=\"text/javascript\" src=\"/javascript/scriptaculous/effects.js\"></script>\n";
|
||||
echo "\t<script type=\"text/javascript\" src=\"/javascript/scriptaculous/dragdrop.js\"></script>\n";
|
||||
if(file_exists("{$g['www_path']}/javascript/global.js"))
|
||||
echo "\t<script type=\"text/javascript\" src=\"/javascript/global.js\"></script>\n";
|
||||
/*
|
||||
* Find all javascript files that need to be included
|
||||
* for this page ... from the arrays ... :)
|
||||
* Coded by: Erik Kristensen
|
||||
*/
|
||||
|
||||
$dir = trim(basename($_SERVER["SCRIPT_FILENAME"]), '.php');
|
||||
$path = "{$g['www_path']}/javascript/" . $dir . "/";
|
||||
if (is_dir($path)) {
|
||||
if ($dh = opendir($path)) {
|
||||
while (($file = readdir($dh)) !== false) {
|
||||
if (is_dir($file))
|
||||
continue;
|
||||
echo "\t<script type=\"text/javascript\" src=\"/javascript/{$dir}/{$file}\"></script>\n";
|
||||
}
|
||||
closedir($dh);
|
||||
}
|
||||
}
|
||||
|
||||
if (!isset($closehead))
|
||||
echo "</head>";
|
||||
|
||||
/* If this page is being remotely managed then do not allow the loading of the contents. */
|
||||
if($config['remote_managed_pages']['item']) {
|
||||
foreach($config['remote_managed_pages']['item'] as $rmp) {
|
||||
if($rmp == $_SERVER['SCRIPT_NAME']) {
|
||||
include("fbegin.inc");
|
||||
print_info_box_np("This page is currently being managed by a remote machine.");
|
||||
include("fend.inc");
|
||||
exit;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
<?php
|
||||
/*
|
||||
pfSense_MODULE: header
|
||||
*/
|
||||
|
||||
/*
|
||||
* if user has selected a custom template, use it.
|
||||
* otherwise default to pfsense tempalte
|
||||
*/
|
||||
if($config['theme'] <> "")
|
||||
$g['theme'] = $config['theme'];
|
||||
else
|
||||
$g['theme'] = "pfsense";
|
||||
|
||||
/*
|
||||
* If this device is an apple ipod/iphone
|
||||
* switch the theme to one that works with it.
|
||||
*/
|
||||
$apple_ua = array("iPhone","iPod", "iPad");
|
||||
foreach($apple_ua as $useragent)
|
||||
if(strstr($_SERVER['HTTP_USER_AGENT'], $useragent))
|
||||
$g['theme'] = "pfsense";
|
||||
|
||||
$pagetitle = gentitle( $pgtitle );
|
||||
|
||||
?>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
|
||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html>
|
||||
<head>
|
||||
<title><?php echo($config['system']['hostname'] . "." . $config['system']['domain'] . " - " . $pagetitle); ?></title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
|
||||
<link rel="apple-touch-icon" href="/themes/<?php echo $g['theme']; ?>/apple-touch-icon.png"/>
|
||||
<?php if (strpos($_SERVER["SCRIPT_FILENAME"], "wizard.php") !== false &&
|
||||
file_exists("{$g['www_path']}/themes/{$g['theme']}/wizard.css")): ?>
|
||||
<?php echo "<style type=\"text/css\" src=\"/themes/{$g['theme']}/wizard.css\"></style>"; ?>
|
||||
<?php else: ?>
|
||||
<link rel="stylesheet" href="/themes/<?php echo $g['theme']; ?>/all.css" media="all" />
|
||||
<?php endif; ?>
|
||||
<link rel="stylesheet" type="text/css" href="/niftycssCode.css">
|
||||
<link rel="stylesheet" type="text/css" href="/niftycssprintCode.css" media="print">
|
||||
<link rel="stylesheet" type="text/css" href="/new_tab_menu.css" media="all">
|
||||
<script type="text/javascript" src="/javascript/niftyjsCode.js"></script>
|
||||
<script type="text/javascript">
|
||||
var theme = "<?php echo $g['theme']; ?>";
|
||||
</script>
|
||||
<?php echo "\t<script type=\"text/javascript\" src=\"/themes/{$g['theme']}/loader.js\"></script>\n"; ?>
|
||||
<?php
|
||||
if($_GET['enablefirebuglite']) {
|
||||
echo "\t<script type=\"text/javascript\" src=\"/javascript/pi.js\"></script>\n";
|
||||
echo "\t<script type=\"text/javascript\" src=\"/javascript/firebug-lite.js\"></script>\n";
|
||||
}
|
||||
echo "\t<script type=\"text/javascript\" src=\"/javascript/scriptaculous/prototype.js\"></script>\n";
|
||||
echo "\t<script type=\"text/javascript\" src=\"/javascript/scriptaculous/scriptaculous.js\"></script>\n";
|
||||
echo "\t<script type=\"text/javascript\" src=\"/javascript/scriptaculous/effects.js\"></script>\n";
|
||||
echo "\t<script type=\"text/javascript\" src=\"/javascript/scriptaculous/dragdrop.js\"></script>\n";
|
||||
if(file_exists("{$g['www_path']}/javascript/global.js"))
|
||||
echo "\t<script type=\"text/javascript\" src=\"/javascript/global.js\"></script>\n";
|
||||
/*
|
||||
* Find all javascript files that need to be included
|
||||
* for this page ... from the arrays ... :)
|
||||
* Coded by: Erik Kristensen
|
||||
*/
|
||||
|
||||
$dir = trim(basename($_SERVER["SCRIPT_FILENAME"]), '.php');
|
||||
$path = "{$g['www_path']}/javascript/" . $dir . "/";
|
||||
if (is_dir($path)) {
|
||||
if ($dh = opendir($path)) {
|
||||
while (($file = readdir($dh)) !== false) {
|
||||
if (is_dir($file))
|
||||
continue;
|
||||
echo "\t<script type=\"text/javascript\" src=\"/javascript/{$dir}/{$file}\"></script>\n";
|
||||
}
|
||||
closedir($dh);
|
||||
}
|
||||
}
|
||||
|
||||
if (!isset($closehead))
|
||||
echo "</head>";
|
||||
|
||||
/* If this page is being remotely managed then do not allow the loading of the contents. */
|
||||
if($config['remote_managed_pages']['item']) {
|
||||
foreach($config['remote_managed_pages']['item'] as $rmp) {
|
||||
if($rmp == $_SERVER['SCRIPT_NAME']) {
|
||||
include("fbegin.inc");
|
||||
print_info_box_np("This page is currently being managed by a remote machine.");
|
||||
include("fend.inc");
|
||||
exit;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
?>
|
||||
101
usr/local/www/new_tab_menu.css
Normal file
101
usr/local/www/new_tab_menu.css
Normal file
@ -0,0 +1,101 @@
|
||||
/*
|
||||
new_tab_menu.css
|
||||
part of pfSense
|
||||
Copyright (C) 2010-2011 Robert Zelaya
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are met:
|
||||
|
||||
1. Redistributions of source code must retain the above copyright notice,
|
||||
this list of conditions and the following disclaimer.
|
||||
|
||||
2. Redistributions in binary form must reproduce the above copyright
|
||||
notice, this list of conditions and the following disclaimer in the
|
||||
documentation and/or other materials provided with the distribution.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
|
||||
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
|
||||
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
||||
AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
|
||||
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
||||
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
||||
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
||||
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
|
||||
Replace your old tab menu with the following code. To add a second tab menu line just cut and paste again.
|
||||
The following code is dependent on new_tab_menu.css and new_tab_menu.png.
|
||||
|
||||
<tr>
|
||||
<td>
|
||||
<?php
|
||||
$tab_array_indent = 0; // move to the line in px
|
||||
$tab_array_space = 1; // space betwen lines in px
|
||||
$tab_array_char_limit = 82; // number or chr before the drop down box
|
||||
$tab_array = array();
|
||||
$tab_array[] = array(gettext("Admin Access"), true, "system_advanced_admin.php");
|
||||
$tab_array[] = array(gettext("Firewall / NAT"), false, "system_advanced_firewall.php");
|
||||
$tab_array[] = array(gettext("Networking"), false, "system_advanced_network.php");
|
||||
$tab_array[] = array(gettext("Miscellaneous"), false, "system_advanced_misc.php");
|
||||
$tab_array[] = array(gettext("System Tunables"), false, "system_advanced_sysctl.php");
|
||||
$tab_array[] = array(gettext("Notifications"), false, "system_advanced_notifications.php");
|
||||
display_top_tabs($tab_array);
|
||||
?>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
*/
|
||||
|
||||
.newtabmenu ul, li{border:0; margin:0; padding:0; list-style:none;}
|
||||
|
||||
.newtabmenu li{float:left; margin-right:2px; text-align: center;}
|
||||
.newtabmenu a:link, .newtabmenu a:visited{
|
||||
background:url(/new_tab_menu.png) right 45px;
|
||||
color:#ffffff; /* noactive font */
|
||||
display:block;
|
||||
/* fix for IE6 */
|
||||
display: inline-block;
|
||||
/* END */
|
||||
font-weight:bold;
|
||||
font-size:.9em;
|
||||
height:20px;
|
||||
line-height:20px;
|
||||
text-decoration:none;
|
||||
}
|
||||
.newtabmenu a span{
|
||||
background:url(/new_tab_menu.png) left 45px;
|
||||
display:block;
|
||||
/* fix for IE6 */
|
||||
display: inline-block;
|
||||
/* END */
|
||||
height:20px;
|
||||
margin-right:7px;
|
||||
padding-left:7px;
|
||||
}
|
||||
.newtabmenu a:hover{
|
||||
background:url(/new_tab_menu.png) right 23px;
|
||||
display:block;
|
||||
/* fix for IE6 */
|
||||
display: inline-block;
|
||||
/* END */
|
||||
color:#ffffff; /* hover over font */
|
||||
}
|
||||
.newtabmenu a:hover span{
|
||||
background:url(/new_tab_menu.png) left 23px;
|
||||
display:block;
|
||||
/* fix for IE6 */
|
||||
display: inline-block;
|
||||
/* END */
|
||||
}
|
||||
|
||||
/* -------------------------------- */
|
||||
/* ACTIVE ELEMENTS */
|
||||
.newtabmenu_active a:link, .newtabmenu_active a:visited, .newtabmenu_active a:visited, .newtabmenu_active a:hover{
|
||||
color:#000000; /* active font */
|
||||
background:url(/new_tab_menu.png) right 0 no-repeat;
|
||||
}
|
||||
.newtabmenu_active a span, .newtabmenu_active a:hover span{
|
||||
background:url(/new_tab_menu.png) left 0 no-repeat;
|
||||
}
|
||||
BIN
usr/local/www/new_tab_menu.png
Normal file
BIN
usr/local/www/new_tab_menu.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.2 KiB |
Loading…
Reference in New Issue
Block a user