diff options
author | PiBa-NL <pba_2k3@yahoo.comm> | 2015-08-31 01:16:15 +0200 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2015-09-02 14:03:15 -0400 |
commit | 498404473b6db60e20e2d192ae147970000cf55d (patch) | |
tree | d1c944b93430c0fef2e5c97388964e038346d6c4 | |
parent | 0fc0ef918a8390655d70af5f75d95d4bfe324013 (diff) | |
download | pfsense-498404473b6db60e20e2d192ae147970000cf55d.zip pfsense-498404473b6db60e20e2d192ae147970000cf55d.tar.gz |
bootstrap, small fixes to unbound/dnsmasq edit pages, service icons.
+ FIXME item that prevented lots of pages from loading..
-rw-r--r-- | src/etc/inc/service-utils.inc | 1 | ||||
-rwxr-xr-x | src/usr/local/www/head.inc | 7 | ||||
-rw-r--r-- | src/usr/local/www/services_dnsmasq_edit.php | 4 | ||||
-rw-r--r-- | src/usr/local/www/services_unbound.php | 4 | ||||
-rw-r--r-- | src/usr/local/www/services_unbound_host_edit.php | 4 |
5 files changed, 13 insertions, 7 deletions
diff --git a/src/etc/inc/service-utils.inc b/src/etc/inc/service-utils.inc index 3a72295..8d0e537 100644 --- a/src/etc/inc/service-utils.inc +++ b/src/etc/inc/service-utils.inc @@ -484,6 +484,7 @@ function get_service_status_icon($service, $withtext = true, $smallicon = false) } function get_service_control_links($service, $addname = false) { + global $g; $output = ""; $stitle = ($addname) ? $service['name'] . " " : ""; diff --git a/src/usr/local/www/head.inc b/src/usr/local/www/head.inc index d3309d9..45168cd 100755 --- a/src/usr/local/www/head.inc +++ b/src/usr/local/www/head.inc @@ -335,6 +335,8 @@ if(! $g['disablehelpmenu']) { $modal_notices = new Modal('Notices', 'notices', 'large'); +/* +FIXME: addFooter does not exist $modal_notices->addFooter(new Form_Button( 'close', 'Close', @@ -346,7 +348,7 @@ if(! $g['disablehelpmenu']) { 'Mark all as read', '/?closenotice=all' ))->addClass('btn-primary')->removeClass('btn-default'); - +*/ $noticeCategories = $notice['category']; foreach($notices as $time => $notice) { if (!isset($noticeCategories[$notice['category']])) { @@ -369,7 +371,10 @@ if(! $g['disablehelpmenu']) { } $html .= '</ul>'; } +/* +FIXME: addHtml does not exist $modal_notices->addHtml($html); +*/ print $modal_notices; endif; diff --git a/src/usr/local/www/services_dnsmasq_edit.php b/src/usr/local/www/services_dnsmasq_edit.php index f9513d9..ec3e468 100644 --- a/src/usr/local/www/services_dnsmasq_edit.php +++ b/src/usr/local/www/services_dnsmasq_edit.php @@ -210,7 +210,7 @@ include("head.inc"); if ($input_errors) print_input_errors($input_errors); -require('classes/Form.class.php'); +require_once('classes/Form.class.php'); $form = new Form(); @@ -220,7 +220,7 @@ $section->addInput(new Form_Input( 'host', 'Host', 'text', - $pconfig['domain'] + $pconfig['host'] ))->setHelp('Name of the host, without the domain part' . '<br />' . 'e.g.: "myhost"'); diff --git a/src/usr/local/www/services_unbound.php b/src/usr/local/www/services_unbound.php index f1846a1..590a736 100644 --- a/src/usr/local/www/services_unbound.php +++ b/src/usr/local/www/services_unbound.php @@ -241,7 +241,7 @@ $tab_array[] = array(gettext("Advanced settings"), false, "services_unbound_adva $tab_array[] = array(gettext("Access Lists"), false, "/services_unbound_acls.php"); display_top_tabs($tab_array, true); -require('classes/Form.class.php'); +require_once('classes/Form.class.php'); $form = new Form(); @@ -436,7 +436,7 @@ foreach ($a_hosts as $hostent): <?=htmlspecialchars($hostent['descr'])?> </td> <td> - <a href="services_unbound.php?id=<?=$i?>" class="btn btn-xs btn-info"><?=gettext('Edit')?></a> + <a href="services_unbound_host_edit.php?id=<?=$i?>" class="btn btn-xs btn-info"><?=gettext('Edit')?></a> <a href="services_unbound.php?type=host&act=del&id=<?=$i?>" class="btn btn-xs btn-danger"><?=gettext('Delete')?></a> </td> </tr> diff --git a/src/usr/local/www/services_unbound_host_edit.php b/src/usr/local/www/services_unbound_host_edit.php index ed3bbb2..42ce9ae 100644 --- a/src/usr/local/www/services_unbound_host_edit.php +++ b/src/usr/local/www/services_unbound_host_edit.php @@ -209,7 +209,7 @@ $pgtitle = array(gettext("Services"),gettext("DNS Resolver"),gettext("Edit host" $shortcut_section = "resolver"; include("head.inc"); -require('classes/Form.class.php'); +require_once('classes/Form.class.php'); $form = new Form(); @@ -219,7 +219,7 @@ $section->addInput(new Form_Input( 'host', 'Host', 'text', - $pconfig['domain'] + $pconfig['host'] ))->setHelp('Name of the host, without the domain part' . '<br />' . 'e.g.: "myhost"'); |