diff options
author | NewEraCracker <neweracracker@gmail.com> | 2016-07-13 08:53:21 +0100 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2016-08-03 07:43:51 -0400 |
commit | 21915c632c9d1645003fe3121cb7607d14408e7e (patch) | |
tree | 2009a95a4ce13688342fa6fbb10652c13bb391b9 | |
parent | af18691bc624764cf98dc51de6266db1611b10c6 (diff) | |
download | pfsense-21915c632c9d1645003fe3121cb7607d14408e7e.zip pfsense-21915c632c9d1645003fe3121cb7607d14408e7e.tar.gz |
Some tweaks to improve alignment in table with checkbox
1) If a checkbox does not have a description (even if it is empty), layout will be broken as checkbox won't be aligned correctly
2) UPnP checkbox looks better with description instead of help
This commit fixes the two issues
(cherry picked from commit 1a8e5f2f67fdc18080eeac47dc4ed0bdfacc66b9)
-rw-r--r-- | src/usr/local/pkg/miniupnpd.xml | 2 | ||||
-rw-r--r-- | src/usr/local/www/classes/Form/Checkbox.class.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/usr/local/pkg/miniupnpd.xml b/src/usr/local/pkg/miniupnpd.xml index a0bbd37..5c02a0d 100644 --- a/src/usr/local/pkg/miniupnpd.xml +++ b/src/usr/local/pkg/miniupnpd.xml @@ -26,7 +26,7 @@ <fieldname>enable</fieldname> <type>checkbox</type> <enablefields>enable_upnp,enable_natpmp,ext_iface,iface_array,download,upload,overridewanip,upnpqueue,logpackets,sysuptime,permdefault</enablefields> - <sethelp>Enable UPnP & NAT-PMP</sethelp> + <description>Enable UPnP & NAT-PMP</description> </field> <field> <fielddescr>UPnP Port Mapping</fielddescr> diff --git a/src/usr/local/www/classes/Form/Checkbox.class.php b/src/usr/local/www/classes/Form/Checkbox.class.php index cdd5b54..5dc32f3 100644 --- a/src/usr/local/www/classes/Form/Checkbox.class.php +++ b/src/usr/local/www/classes/Form/Checkbox.class.php @@ -89,7 +89,7 @@ class Form_Checkbox extends Form_Input $input = parent::_getInput(); if (empty($this->_description)) - return $input; + return '<label class="chkboxlbl">'. $input .'</label>'; return '<label class="chkboxlbl">'. $input .' '. htmlspecialchars(gettext($this->_description)) .'</label>'; } |