diff options
author | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-01-28 16:38:09 -0200 |
---|---|---|
committer | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-01-28 16:38:09 -0200 |
commit | 1596d9c17349f47ef06defa5c44333db0158a110 (patch) | |
tree | 4a3ee13deb4884dc67841f2b16eff691eb8c7411 /usr/local/www/guiconfig.inc | |
parent | eac181cad00c25a90432ebbc35327ac9cfbed5b0 (diff) | |
parent | 20413b72bfd31282276c8ac2a116014f92914d4e (diff) | |
download | pfsense-1596d9c17349f47ef06defa5c44333db0158a110.zip pfsense-1596d9c17349f47ef06defa5c44333db0158a110.tar.gz |
Merge remote branch 'mainline/master'
Diffstat (limited to 'usr/local/www/guiconfig.inc')
-rwxr-xr-x | usr/local/www/guiconfig.inc | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc index 1e30482..c6a58b3 100755 --- a/usr/local/www/guiconfig.inc +++ b/usr/local/www/guiconfig.inc @@ -881,7 +881,7 @@ function echo_array($array,$return_me=false){ * RESULT * null ******/ -function display_top_tabs(& $tab_array) { +function display_top_tabs(& $tab_array, $no_drop_down = false) { global $HTTP_SERVER_VARS; global $config; global $g; @@ -896,16 +896,15 @@ function display_top_tabs(& $tab_array) { */ /* empty string code */ - if ($tab_array_indent == '') - { + if ($tab_array_indent == '') { $tab_array_indent = 0; } - if ($tab_array_space == '') - { + + if ($tab_array_space == '') { $tab_array_space = 1; } - if ($tab_array_char_limit == '') - { + + if ($tab_array_char_limit == '') { $tab_array_char_limit = 82; } @@ -956,6 +955,11 @@ function display_top_tabs(& $tab_array) { foreach ($tab_array as $ta) $tabcharcount = $tabcharcount + strlen($ta[0]); + if($no_drop_down == true) { + $tabcharcount = 0; + unset($tab_array_char_limit); + } + // If the character count of the tab names is > 670 // then show a select item dropdown menubox. if($tabcharcount > $tab_array_char_limit) { @@ -975,7 +979,6 @@ function display_top_tabs(& $tab_array) { echo " function tabs_will_go(obj){ document.location = obj.value; }"; 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"; @@ -989,7 +992,6 @@ function display_top_tabs(& $tab_array) { $tabscounter++; } echo "</ul>\n</div>\n"; - ////////>>>> } } |