diff options
| -rw-r--r-- | usr/local/www/bootstrap/css/pfSense.css | 8 | ||||
| -rwxr-xr-x | usr/local/www/head.inc | 28 | ||||
| -rw-r--r-- | usr/local/www/shortcuts.inc | 20 |
3 files changed, 33 insertions, 23 deletions
diff --git a/usr/local/www/bootstrap/css/pfSense.css b/usr/local/www/bootstrap/css/pfSense.css index c73cf2b..cec5196 100644 --- a/usr/local/www/bootstrap/css/pfSense.css +++ b/usr/local/www/bootstrap/css/pfSense.css @@ -59,12 +59,18 @@ tr.disabled { margin-top: 0; } -.header .help-icon { +.header .context-links { position: absolute; right: 0; top: 15px; } +.header .context-links li { + float: left; + display: inline; + margin-left: 10px; +} + /** Page footer */ .footer { position: absolute; diff --git a/usr/local/www/head.inc b/usr/local/www/head.inc index 15ac3fa..3692651 100755 --- a/usr/local/www/head.inc +++ b/usr/local/www/head.inc @@ -424,9 +424,10 @@ foreach($noticeCategories as $category => $catNotices):?> <div class="container"> <header class="header"> <?=genhtmltitle($pgtitle);?> + + <ul class="context-links"> <?php -/* -//FIXME + if (!$hide_service_status && !empty($shortcuts[$shortcut_section]['service'])) { $ssvc = array(); switch ($shortcut_section) { @@ -441,22 +442,25 @@ if (!$hide_service_status && !empty($shortcuts[$shortcut_section]['service'])) { } if (!empty($ssvc)) { - echo get_service_status_icon($ssvc, false); - echo get_service_control_links($ssvc, true); + echo '<li>'. get_service_status_icon($ssvc, false). '</li>'; + echo '<li>'. get_service_control_links($ssvc, false). '</li>'; } } -echo get_shortcut_main_link($shortcut_section, true); -echo get_shortcut_status_link($shortcut_section, true); -echo get_shortcut_log_link($shortcut_section, true); -*/ -?> +echo '<li>'. get_shortcut_main_link($shortcut_section, false). '</li>'; +echo '<li>'. get_shortcut_status_link($shortcut_section, false). '</li>'; +echo '<li>'. get_shortcut_log_link($shortcut_section, false). '</li>'; +?> <?php if(! $g['disablehelpicon']): ?> - <a href="<?=$helpurl?>" title="<?=gettext("Help for items on this page")?>" class="help-icon"> - <i class="icon-large icon-question-sign"></i> - </a> + <li> + <a href="<?=$helpurl?>" title="<?=gettext("Help for items on this page")?>" class="help-icon"> + <i class="icon-large icon-question-sign"></i> + </a> + </li> <?php endif; ?> + </ul> + </header> <?php diff --git a/usr/local/www/shortcuts.inc b/usr/local/www/shortcuts.inc index 1b141cf..d0f9073 100644 --- a/usr/local/www/shortcuts.inc +++ b/usr/local/www/shortcuts.inc @@ -42,14 +42,14 @@ $shortcuts = array(); /* Load and process custom shortcuts. */ function get_shortcut_files($directory) { $dir_array = array(); - if(!is_dir($directory)) + if(!is_dir($directory)) return; if ($dh = opendir($directory)) { while (($file = readdir($dh)) !== false) { $canadd = 0; - if($file == ".") + if($file == ".") $canadd = 1; - if($file == "..") + if($file == "..") $canadd = 1; if($canadd == 0) array_push($dir_array, $file); @@ -93,7 +93,7 @@ function get_shortcut_main_link($shortcut_section, $addspace = true, $service = break; } if(!empty($link) && ($_SERVER['REQUEST_URI'] != "/{$link}")) - return "{$space}<a href=\"{$link}\" title=\"" . gettext("Main page for this section") . "\"><img style=\"vertical-align:middle\" src=\"/themes/{$g['theme']}/images/icons/icon_plus.gif\" border=\"0\" alt=\"plus\" /></a>"; + return "{$space}<a href=\"{$link}\" title=\"" . gettext("Main page for this section") . "\"><i class=\"icon icon-home\"></i></a>"; } function get_shortcut_status_link($shortcut_section, $addspace = true, $service = array()) { @@ -117,26 +117,26 @@ function get_shortcut_status_link($shortcut_section, $addspace = true, $service break; } if(!empty($link)) - return "{$space}<a href=\"{$link}\" title=\"" . gettext("Status of items on this page") . "\"><img style=\"vertical-align:middle\" src=\"/themes/{$g['theme']}/images/icons/icon_service_status.gif\" border=\"0\" alt=\"status\" /></a>"; + return "{$space}<a href=\"{$link}\" title=\"" . gettext("Status of items on this page") . "\"><i class=\"icon icon-wrench\"></i></a>"; } function get_shortcut_log_link($shortcut_section, $addspace = true) { global $g, $shortcuts; $space = ($addspace) ? " " : "" ; if(!empty($shortcut_section) && !empty($shortcuts[$shortcut_section]['log'])) { - return "{$space}<a href=\"{$shortcuts[$shortcut_section]['log']}\" title=\"" . gettext("Log entries for items on this page") . "\"><img style=\"vertical-align:middle\" src=\"/themes/{$g['theme']}/images/icons/icon_logs.gif\" border=\"0\" alt=\"logs\" /></a>"; + return "{$space}<a href=\"{$shortcuts[$shortcut_section]['log']}\" title=\"" . gettext("Log entries for items on this page") . "\"><i class=\"icon icon-list-alt\"></i></a>"; } } // Load shortcuts $dir_array = get_shortcut_files("/usr/local/www/shortcuts"); -foreach ($dir_array as $file) - if (!is_dir("/usr/local/www/shortcuts/{$file}") && stristr($file,".inc")) +foreach ($dir_array as $file) + if (!is_dir("/usr/local/www/shortcuts/{$file}") && stristr($file,".inc")) include("/usr/local/www/shortcuts/{$file}"); if(is_dir("/usr/local/pkg/shortcuts")) { $dir_array = get_shortcut_files("/usr/local/pkg/shortcuts"); - foreach ($dir_array as $file) - if (!is_dir("/usr/local/pkg/shortcuts/{$file}") && stristr($file,".inc")) + foreach ($dir_array as $file) + if (!is_dir("/usr/local/pkg/shortcuts/{$file}") && stristr($file,".inc")) include("/usr/local/pkg/shortcuts/{$file}"); } |
