diff options
-rw-r--r-- | README.md | 7 | ||||
-rwxr-xr-x | usr/local/www/gui.css | 363 | ||||
-rw-r--r-- | usr/local/www/guiconfig.inc | 32 | ||||
-rw-r--r-- | usr/local/www/widgets/widgets/interfaces.widget.php | 5 |
4 files changed, 13 insertions, 394 deletions
@@ -3,10 +3,11 @@ pfSense on bootstrap We are migrating pfSense to Bootstrap. You can help! Please respect these code-guidelines: -* use tabs (tabstop=4) for indenting (except the license-header which contains 2 lines that are indented with '\t ') +* use tabs (tabstop=4) for indenting (except the license-header which contains 3 lines that are indented with "\t ") +* no trailing whitespace * limited echoing of HTML from php, please use proper templating syntax instead (eg. foreach/endforeach) -* limited attributes on elements; *no style attributes* +* limited attributes on elements; _no style attributes_ * no inline javascript -* html attributes should be using double-quoted attribute-values. This means your php-code should use mostly single-quoted strings +* html attributes should be using double-quoted attribute-values. This means your php-code should probably use single-quoted strings If you feel adventurous you can sometimes rewrite some PHP & javascript code as well; but try to keep this to a minimum.
\ No newline at end of file diff --git a/usr/local/www/gui.css b/usr/local/www/gui.css deleted file mode 100755 index a4d6453..0000000 --- a/usr/local/www/gui.css +++ /dev/null @@ -1,363 +0,0 @@ -/* - pfSense_MODULE: base -*/ - -html,body { - font-family: Tahoma, Verdana, Arial, Helvetica, sans-serif; - font-size: 11px; -} -td,th,input,select { - font-family: Tahoma, Verdana, Arial, Helvetica, sans-serif; - font-size: 11px; -} -form { - margin: 0px; -} -.pgtitle { - font-size: 18px; - color: #777777; - font-weight: bold; -} -.tfrtitle { - font-size: 18px; - color: #ffffff; - font-weight: bold; -} -.vncell { - background-color: #DDDDDD; - padding-right: 20px; - padding-left: 8px; - border-bottom: 1px solid #999999; -} -.formfld { - -} -.formfldalias { - background-color: #990000; - color: #FFFFFF; -} -.formpre { - font-family: Courier New, Courier, monospaced; - font-size: 10px; -} -.formbtn { - font-family: Tahoma, Verdana, Arial, Helvetica, sans-serif; - font-size: 13px; - font-weight: bold; -} -.formbtns { - font-family: Tahoma, Verdana, Arial, Helvetica, sans-serif; - font-size: 10px; - font-weight: bold; -} -.vvcell { - background-color: #FFFFC6; -} -.errmsg { - font-weight: bold; - color: #CC0000; -} -.red { - color: #CC0000; -} -.gray { - color: #A0A0A0; -} -.vexpl { - font-size: 11px; -} -a { - text-decoration: none; -} -.navlnk { - color: #FFFFFF; - text-decoration: none; - font-size: 0.9em; -} -.navlnks { - color: #FFFFFF; - text-decoration: none; - font-size: 11px; -} -.tblnk { - color: #FFFFFF; - text-decoration: none; -} -.vncellreq { - background-color: #DDDDDD; - padding-right: 20px; - padding-left: 8px; - font-weight: bold; - border-bottom: 1px solid #999999; -} -.vncellt { - background-color: #DDDDDD; - padding-right: 20px; - padding-left: 8px; - padding-top: 4px; - padding-bottom: 4px; - font-weight: bold; - border-bottom: 1px solid #999999; -} -.vtable { - border-bottom: 1px solid #999999; -} -.vnsepcell { - background-color: #BBBBBB; - padding-right: 20px; - padding-left: 8px; - font-weight: bold; - border-bottom: 1px solid #999999; - font-size: 11px; -} -.cpline { - font-size: 11px; - color: #FFFFFF; -} -.hostname { - font-size: 11px; - color: #FFFFFF; -} -.vnsepcellr { - background-color: #BBBBBB; - padding-right: 20px; - padding-left: 8px; - font-weight: bold; - border-right: 1px solid #999999; - border-bottom: 1px solid #999999; - font-size: 11px; -} -.listrborder { - background-color: #FFFFFF; - border-right: 1px solid #999999; - border-bottom: 1px solid #999999; - border-left: 1px solid #999999; - font-size: 11px; - padding-right: 6px; - padding-left: 6px; - padding-top: 4px; - padding-bottom: 4px; -} -.listr { - background-color: #FFFFFF; - border-right: 1px solid #999999; - border-bottom: 1px solid #999999; - font-size: 11px; - padding-right: 6px; - padding-left: 6px; - padding-top: 4px; - padding-bottom: 4px; -} -.listrpad { - border-right: 1px solid #999999; - border-bottom: 1px solid #999999; - font-size: 11px; - padding-right: 16px; - padding-left: 10px; - padding-top: 8px; - padding-bottom: 8px; -} -.listn { - font-size: 11px; - padding-right: 16px; - padding-left: 6px; - padding-top: 4px; - padding-bottom: 4px; -} -.listbg { - border-right: 1px solid #999999; - border-bottom: 1px solid #999999; - font-size: 11px; - background-color: #990000; - padding-right: 16px; - padding-left: 6px; - padding-top: 4px; - padding-bottom: 4px; -} -.listbggrey { - border-right: 1px solid #999999; - border-bottom: 1px solid #999999; - font-size: 11px; - background-color: #999999; - padding-right: 16px; - padding-left: 6px; - padding-top: 4px; - padding-bottom: 4px; -} -.listhdr { - background-color: #BBBBBB; - padding-right: 16px; - padding-left: 6px; - font-weight: bold; - border-bottom: 1px solid #999999; - font-size: 11px; - padding-top: 5px; - padding-bottom: 5px; -} -.listhdr a { - color: #000000; -} -.listhdrr { - background-color: #BBBBBB; - padding-right: 16px; - padding-left: 6px; - font-weight: bold; - border-right: 1px solid #999999; - border-bottom: 1px solid #999999; - font-size: 11px; - padding-top: 5px; - padding-bottom: 5px; -} -.listhdrr a { - color: #000000; -} -.listlr { - background-color: #FFFFFF; - border-right: 1px solid #999999; - border-bottom: 1px solid #999999; - border-left: 1px solid #999999; - font-size: 11px; - padding-right: 6px; - padding-left: 6px; - padding-top: 4px; - padding-bottom: 4px; -} -.listlrns { - background-color: #FFFFFF; - border-right: 1px solid #999999; - border-bottom: 1px solid #999999; - border-left: 1px solid #999999; - font-size: 11px; - padding-top: 4px; - padding-bottom: 4px; -} -.list { - font-size: 11px; - padding-left: 6px; - padding-top: 2px; - padding-bottom: 2px; -} -.listt { - font-size: 11px; - padding-top: 5px; -} -.listhdrrns { - background-color: #BBBBBB; - padding-left: 6px; - padding-top: 5px; - padding-bottom: 5px; - padding-right: 6px; - font-weight: bold; - border-right: 1px solid #999999; - border-bottom: 1px solid #999999; - font-size: 11px; -} -.listbgns { - border-right: 1px solid #999999; - border-bottom: 1px solid #999999; - font-size: 11px; - background-color: #D9DEE8; - padding-left: 6px; - padding-right: 4px; - padding-top: 4px; - padding-bottom: 4px; -} -.listtopic { - border-right: 1px solid #999999; - font-size: 11px; - background-color: #990000; - padding-right: 16px; - padding-left: 6px; - color: #FFFFFF; - font-weight: bold; - padding-top: 5px; - padding-bottom: 5px; -} -.optsect_t { - border-right: 1px solid #999999; - background-color: #990000; - padding-right: 6px; - padding-left: 6px; - padding-top: 2px; - padding-bottom: 2px; -} -.optsect_s { - font-size: 11px; - color: #FFFFFF; - font-weight: bold; -} -.tabnavtbl { -} -ul#tabnav { - font-size: 11px; - font-weight: bold; - list-style-type: none; - margin: 0; - padding: 0; -} -ul#tabnav li.tabinact1 { - float: left; - background-color: #777777; - color: #FFFFFF; - padding: 0; - white-space: nowrap; -} -ul#tabnav li.tabinact { - float: left; - border-left: 1px solid #999999; - background-color: #777777; - color: #FFFFFF; - padding: 0; - white-space: nowrap; -} -ul#tabnav li.tabinact a { - float: left; - display: block; - text-decoration: none; - padding: 5px 8px 5px 8px; - color: #FFFFFF; -} -ul#tabnav li.tabinact1 a { - float: left; - display: block; - text-decoration: none; - padding: 5px 8px 5px 8px; - color: #FFFFFF; -} -ul#tabnav li.tabact { - float: left; - background-color: #EEEEEE; - color: #000000; - padding: 5px 8px 5px 8px; - white-space: nowrap; -} -.tabcont { - background-color: #EEEEEE; - padding-right: 12px; - padding-left: 12px; - padding-top: 12px; - padding-bottom: 12px; -} -.tabact { - float: left; - background-color: #EEEEEE; - color: #000000; - padding: 5px 8px 5px 8px; - white-space: nowrap; -} -.tabinact { - font-weight: bold; - float: left; - border-left: 1px solid #999999; - background-color: #777777; - color: #FFFFFF; - padding: 0; - white-space: nowrap; -} -.menu { - background-color: #000000; - white-space: nowrap; - padding: 0px 5px 0px 5px; - width: 100%; - vertical-align: top; -} diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc index 5e351f6..462dff6 100644 --- a/usr/local/www/guiconfig.inc +++ b/usr/local/www/guiconfig.inc @@ -942,14 +942,6 @@ function display_top_tabs(& $tab_array, $no_drop_down = false) { $nifty_tabs_corners = "#FFF"; $font_color = "white"; - /* if tabcontrols.php exist for a theme, allow it to be overriden */ - $themename = $config['theme']; - $filename = "/usr/local/www/themes/{$themename}/tabcontrols.php"; - if(file_exists($filename)) { - $eval_code = file_get_contents($filename); - eval($eval_code); - } - $tabcharcount = 0; foreach ($tab_array as $ta) $tabcharcount = $tabcharcount + strlen($ta[0]); @@ -961,7 +953,7 @@ function display_top_tabs(& $tab_array, $no_drop_down = false) { // If the character count of the tab names is > 670 // then show a select item dropdown menubox. - if($tabcharcount > $tab_array_char_limit) { + if($tabcharcount > $tab_array_char_limit): ?> echo gettext("Currently viewing: "); echo "<select name=\"TabSelect\" onchange=\"tabs_will_go(this)\">\n"; foreach ($tab_array as $ta) { @@ -979,21 +971,13 @@ function display_top_tabs(& $tab_array, $no_drop_down = false) { echo " function tabs_will_go(obj){ document.location = obj.value; }\n"; echo "//]]>\n"; echo "</script>"; - } else { - echo "<div class=\"newtabmenu\" style=\"margin:{$tab_array_space}px {$tab_array_indent}px; width:775px;\">\n"; - echo "<!-- Tabbed bar code-->\n"; - echo "<ul class=\"newtabmenu\">\n"; - $tabscounter = 0; - foreach ($tab_array as $ta) { - if ($ta[1] == true) { - echo " <li class=\"newtabmenu_active\"><a href=\"{$ta[2]}\"><span>{$ta[0]}</span></a></li>\n"; - } else { - echo " <li><a href=\"{$ta[2]}\"><span>{$ta[0]}</span></a></li>\n"; - } - $tabscounter++; - } - echo "</ul>\n</div>\n"; - } +<? else: ?> + <ul class="nav nav-tabs"> + <?php foreach ($tab_array as $ta): ?> + <li role="presentation"<?=($ta[1] ? ' class="active"' : '')?>><a href="<?=$ta[2]?>"><?=$ta[0]?></a></li> + <?php endforeach; ?> + </ul> +<?php endif; } function add_package_tabs($tabgroup, & $tab_array) { diff --git a/usr/local/www/widgets/widgets/interfaces.widget.php b/usr/local/www/widgets/widgets/interfaces.widget.php index d5c3507..a6b1eb9 100644 --- a/usr/local/www/widgets/widgets/interfaces.widget.php +++ b/usr/local/www/widgets/widgets/interfaces.widget.php @@ -51,10 +51,7 @@ foreach ($ifdescrs as $ifdescr => $ifname): if ($ifinfo['ppplink']) { $icon = 'headphones'; } else if (is_interface_wireless($ifdescr)) { - if($ifinfo['status'] == "associated") - $icon = 'signal'; - else - $icon = 'plane'; + $icon = 'signal'; } else $icon = 'inbox'; |